From 4cf40231b98df97500011257eeb0dd7abd1f8c5b Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Wed, 17 Jun 2026 20:12:19 -0400 Subject: [PATCH 001/139] Skip the latest broken org.apache.kafka:connect-runtime versions in the kafka-connect-0.11 muzzle range: 7.5.15, 7.6.12, 7.7.10, 7.8.9, 7.9.8 (both -ce and -ccs). Same as we did in #11377. (#11668) Skip the latest broken org.apache.kafka:connect-runtime versions in the kafka-connect-0.11 muzzle range: 7.5.15, 7.6.12, 7.7.10, 7.8.9, 7.9.8 (both -ce and -ccs). Same as we did in #11377. Co-authored-by: alexey.kuznetsov --- .../kafka/kafka-connect-0.11/build.gradle | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/build.gradle b/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/build.gradle index dc82a555f28..57745940c19 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/build.gradle +++ b/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/build.gradle @@ -4,7 +4,7 @@ muzzle { module = "connect-runtime" versions = "[0.11.0.0,)" javaVersion = "17" - // broken POMs: depend on non-existent org.eclipse.jetty:jetty-server:9.4.59 + // broken POMs: depend on non-existent org.eclipse.jetty:*:9.4.NN (7.x lines only; 8.x uses jetty 12) // can be fixed after https://github.com/confluentinc/kafka-connect-storage-common/issues/468 is resolved skipVersions += [ '7.4.14-ce', @@ -15,22 +15,32 @@ muzzle { '7.5.13-ccs', '7.5.14-ce', '7.5.14-ccs', + '7.5.15-ce', + '7.5.15-ccs', '7.6.10-ce', '7.6.10-ccs', '7.6.11-ce', '7.6.11-ccs', + '7.6.12-ce', + '7.6.12-ccs', '7.7.8-ce', '7.7.8-ccs', '7.7.9-ce', '7.7.9-ccs', + '7.7.10-ce', + '7.7.10-ccs', '7.8.7-ce', '7.8.7-ccs', '7.8.8-ce', '7.8.8-ccs', + '7.8.9-ce', + '7.8.9-ccs', '7.9.6-ce', '7.9.6-ccs', '7.9.7-ce', - '7.9.7-ccs' + '7.9.7-ccs', + '7.9.8-ce', + '7.9.8-ccs' ] excludeDependency "io.confluent.cloud:*" excludeDependency "io.confluent.observability:*" From 553bc3edc2ab608e402c9e0bcc48a565aa02bb9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Gonz=C3=A1lez=20Garc=C3=ADa?= Date: Thu, 18 Jun 2026 12:20:34 +0200 Subject: [PATCH 002/139] remove(appsec): delete dead DD_APPSEC_REPORTING_INBAND and DD_APPSEC_REPORT_TIMEOUT config keys (#11664) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit remove(appsec): delete dead DD_APPSEC_REPORTING_INBAND and DD_APPSEC_REPORT_TIMEOUT config keys Both config keys were introduced in 2021 (reporting inband in #1d1fc13, report timeout in #2fd53d8) but the classes that consumed them (InbandReportServiceImpl and ReportServiceImpl) were subsequently removed. The getters isAppSecReportingInband(), getAppSecReportMinTimeout() and getAppSecReportMaxTimeout() are now dead code — no caller exists in the codebase. Remove the constants, defaults, fields, assignments and getters. Refs: APPSEC-68459 remove(appsec): delete dead DD_APPSEC_REPORTING_INBAND and DD_APPSEC_REPORT_TIMEOUT from supported-configurations metadata Follow-up to the previous commit removing these keys from Config.java. The metadata/supported-configurations.json entries for DD_APPSEC_REPORTING_INBAND and DD_APPSEC_REPORT_TIMEOUT were still advertising these config keys as supported, which caused GeneratedSupportedConfigurations to include them even though Config no longer reads them. Merge branch 'master' into alejandro.gonzalez/APPSEC-68459-remove-dead-appsec-config Merge branch 'master' into alejandro.gonzalez/APPSEC-68459-remove-dead-appsec-config Co-authored-by: devflow.devflow-routing-intake --- .../datadog/trace/api/ConfigDefaults.java | 1 - .../trace/api/config/AppSecConfig.java | 2 -- .../main/java/datadog/trace/api/Config.java | 26 ------------------- metadata/supported-configurations.json | 16 ------------ 4 files changed, 45 deletions(-) diff --git a/dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java b/dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java index cb6f554f0cb..4c9142eec2e 100644 --- a/dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java +++ b/dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java @@ -140,7 +140,6 @@ public final class ConfigDefaults { static final boolean DEFAULT_APP_LOGS_COLLECTION_ENABLED = false; static final String DEFAULT_APPSEC_ENABLED = "inactive"; - static final boolean DEFAULT_APPSEC_REPORTING_INBAND = false; static final int DEFAULT_APPSEC_TRACE_RATE_LIMIT = 100; static final boolean DEFAULT_APPSEC_WAF_METRICS = true; static final int DEFAULT_APPSEC_WAF_TIMEOUT = 100000; // 0.1 s diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/AppSecConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/AppSecConfig.java index ea15519aa5a..45b25d4a81c 100644 --- a/dd-trace-api/src/main/java/datadog/trace/api/config/AppSecConfig.java +++ b/dd-trace-api/src/main/java/datadog/trace/api/config/AppSecConfig.java @@ -4,9 +4,7 @@ public final class AppSecConfig { public static final String APPSEC_ENABLED = "appsec.enabled"; - public static final String APPSEC_REPORTING_INBAND = "appsec.reporting.inband"; public static final String APPSEC_RULES_FILE = "appsec.rules"; - public static final String APPSEC_REPORT_TIMEOUT_SEC = "appsec.report.timeout"; public static final String APPSEC_IP_ADDR_HEADER = "appsec.ipheader"; public static final String APPSEC_TRACE_RATE_LIMIT = "appsec.trace.rate.limit"; public static final String APPSEC_WAF_METRICS = "appsec.waf.metrics"; diff --git a/internal-api/src/main/java/datadog/trace/api/Config.java b/internal-api/src/main/java/datadog/trace/api/Config.java index 6418bab301e..306e072d27e 100644 --- a/internal-api/src/main/java/datadog/trace/api/Config.java +++ b/internal-api/src/main/java/datadog/trace/api/Config.java @@ -16,7 +16,6 @@ import static datadog.trace.api.ConfigDefaults.DEFAULT_APPSEC_MAX_FILE_CONTENT_COUNT; import static datadog.trace.api.ConfigDefaults.DEFAULT_APPSEC_MAX_STACK_TRACES; import static datadog.trace.api.ConfigDefaults.DEFAULT_APPSEC_MAX_STACK_TRACE_DEPTH; -import static datadog.trace.api.ConfigDefaults.DEFAULT_APPSEC_REPORTING_INBAND; import static datadog.trace.api.ConfigDefaults.DEFAULT_APPSEC_SCA_MAX_TRACKED_DEPENDENCIES; import static datadog.trace.api.ConfigDefaults.DEFAULT_APPSEC_STACK_TRACE_ENABLED; import static datadog.trace.api.ConfigDefaults.DEFAULT_APPSEC_TRACE_RATE_LIMIT; @@ -233,8 +232,6 @@ import static datadog.trace.api.config.AppSecConfig.APPSEC_MAX_STACK_TRACE_DEPTH; import static datadog.trace.api.config.AppSecConfig.APPSEC_OBFUSCATION_PARAMETER_KEY_REGEXP; import static datadog.trace.api.config.AppSecConfig.APPSEC_OBFUSCATION_PARAMETER_VALUE_REGEXP; -import static datadog.trace.api.config.AppSecConfig.APPSEC_REPORTING_INBAND; -import static datadog.trace.api.config.AppSecConfig.APPSEC_REPORT_TIMEOUT_SEC; import static datadog.trace.api.config.AppSecConfig.APPSEC_RULES_FILE; import static datadog.trace.api.config.AppSecConfig.APPSEC_SCA_ENABLED; import static datadog.trace.api.config.AppSecConfig.APPSEC_SCA_MAX_TRACKED_DEPENDENCIES; @@ -1071,10 +1068,7 @@ public static String getHostName() { private final boolean clientIpEnabled; - private final boolean appSecReportingInband; private final String appSecRulesFile; - private final int appSecReportMinTimeout; - private final int appSecReportMaxTimeout; private final int appSecTraceRateLimit; private final boolean appSecWafMetrics; private final int appSecWafTimeout; @@ -2463,14 +2457,8 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment()) DEFAULT_TELEMETRY_DEPENDENCY_RESOLUTION_QUEUE_SIZE); clientIpEnabled = configProvider.getBoolean(CLIENT_IP_ENABLED, DEFAULT_CLIENT_IP_ENABLED); - appSecReportingInband = - configProvider.getBoolean(APPSEC_REPORTING_INBAND, DEFAULT_APPSEC_REPORTING_INBAND); appSecRulesFile = configProvider.getString(APPSEC_RULES_FILE, null); - // Default AppSec report timeout min=5, max=60 - appSecReportMaxTimeout = configProvider.getInteger(APPSEC_REPORT_TIMEOUT_SEC, 60); - appSecReportMinTimeout = Math.min(appSecReportMaxTimeout, 5); - appSecTraceRateLimit = configProvider.getInteger(APPSEC_TRACE_RATE_LIMIT, DEFAULT_APPSEC_TRACE_RATE_LIMIT); @@ -4098,18 +4086,6 @@ public ProductActivation getAppSecActivation() { return instrumenterConfig.getAppSecActivation(); } - public boolean isAppSecReportingInband() { - return appSecReportingInband; - } - - public int getAppSecReportMinTimeout() { - return appSecReportMinTimeout; - } - - public int getAppSecReportMaxTimeout() { - return appSecReportMaxTimeout; - } - public int getAppSecTraceRateLimit() { return appSecTraceRateLimit; } @@ -6570,8 +6546,6 @@ public String toString() { + grpcClientErrorStatuses + ", clientIpEnabled=" + clientIpEnabled - + ", appSecReportingInband=" - + appSecReportingInband + ", appSecRulesFile='" + appSecRulesFile + "'" diff --git a/metadata/supported-configurations.json b/metadata/supported-configurations.json index e2d171c3c3f..09498b2beda 100644 --- a/metadata/supported-configurations.json +++ b/metadata/supported-configurations.json @@ -361,22 +361,6 @@ "aliases": [] } ], - "DD_APPSEC_REPORTING_INBAND": [ - { - "version": "A", - "type": "boolean", - "default": "false", - "aliases": [] - } - ], - "DD_APPSEC_REPORT_TIMEOUT": [ - { - "version": "A", - "type": "int", - "default": "60", - "aliases": [] - } - ], "DD_APPSEC_RULES": [ { "version": "C", From 4e8d69f5a977f6e6b394406508c6a03e18b5359d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Vandon?= Date: Thu, 18 Jun 2026 14:58:37 +0100 Subject: [PATCH 003/139] support for vertx 5.1 in tracing (#11655) fix muzzle guard in vertx5 to not exclude 5.1 also exclude iast forked latest tests Merge branch 'master' into vandonr/vertx51 Co-authored-by: raphael.vandon --- .../vertx_4_0/server/VertxVersionMatcher.java | 2 +- .../vertx-web/vertx-web-5.0/build.gradle | 11 ++++ .../vertx-web/vertx-web-5.0/gradle.lockfile | 52 ++++++++++--------- 3 files changed, 40 insertions(+), 25 deletions(-) diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/VertxVersionMatcher.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/VertxVersionMatcher.java index 7a6447f4006..e3db3b75066 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/VertxVersionMatcher.java +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/VertxVersionMatcher.java @@ -6,5 +6,5 @@ public class VertxVersionMatcher { // added in 4.0 public static final Reference HTTP_1X_SERVER_RESPONSE = - new Reference.Builder("io.vertx.core.http.impl.Http1xServerResponse").build(); + new Reference.Builder("io.vertx.core.http.impl.headers.HeadersAdaptor").build(); } diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/build.gradle b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/build.gradle index 3470f74a725..fb61a90836b 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/build.gradle +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/build.gradle @@ -60,3 +60,14 @@ tasks.named("compileJava", JavaCompile) { configureCompiler(it, 11, JavaVersion.VERSION_1_8) } +// TEMPORARILY exclude iast tests from latest Dep at the compile level because it fails with vertx 5.1 +// (types HeadersMultiMap and Http2HeadersAdaptor were (re)moved) +// TODO for AppSec team: remove this section, run `./gradlew :dd-java-agent:instrumentation:vertx:vertx-web:vertx-web-5.0:latestDepTest`, see errors and fix them. +["compileLatestDepTestGroovy", "compileLatestDepForkedTestGroovy"].each { + tasks.named(it, GroovyCompile) { + exclude("core/MultiMapInstrumentationTest.groovy") + exclude("core/BufferInstrumentationTest.groovy") + exclude("server/Iast*.groovy") + } +} + diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/gradle.lockfile b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/gradle.lockfile index 9c72257b13d..483046cda66 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/gradle.lockfile @@ -13,9 +13,9 @@ com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compil com.datadoghq:java-dogstatsd-client:4.4.5=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-core:2.16.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.18.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.21.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson:jackson-bom:2.16.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson:jackson-bom:2.18.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.21.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc com.github.jnr:jffi:1.3.15=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-a64asm:1.0.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -52,53 +52,57 @@ commons-io:commons-io:2.20.0=spotbugs de.thetaphi:forbiddenapis:3.10=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.leangen.geantyref:geantyref:1.3.16=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath io.netty:netty-buffer:4.2.0.RC1=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-buffer:4.2.13.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-buffer:4.2.15.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-base:4.2.0.RC1=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-base:4.2.13.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-base:4.2.15.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-classes-quic:4.2.15.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-compression:4.2.0.RC1=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-compression:4.2.13.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-compression:4.2.15.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-dns:4.2.0.RC1=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-dns:4.2.13.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-dns:4.2.15.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-http2:4.2.0.RC1=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-http2:4.2.13.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-http2:4.2.15.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-http3:4.2.15.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-http:4.2.0.RC1=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-http:4.2.13.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-http:4.2.15.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-marshalling:4.2.0.RC1=compileClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec-protobuf:4.2.0.RC1=compileClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec-socks:4.2.0.RC1=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-socks:4.2.13.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-socks:4.2.15.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec:4.2.0.RC1=compileClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-common:4.2.0.RC1=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-common:4.2.13.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-common:4.2.15.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-handler-proxy:4.2.0.RC1=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-handler-proxy:4.2.13.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-handler-proxy:4.2.15.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-handler:4.2.0.RC1=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-handler:4.2.13.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-handler:4.2.15.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-resolver-dns:4.2.0.RC1=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-resolver-dns:4.2.13.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-resolver-dns:4.2.15.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-resolver:4.2.0.RC1=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-resolver:4.2.13.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-resolver:4.2.15.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-tcnative-classes:2.0.77.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport-native-unix-common:4.2.0.RC1=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-transport-native-unix-common:4.2.13.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.2.15.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport:4.2.0.RC1=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-transport:4.2.13.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport:4.2.15.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.sqreen:libsqreen:17.3.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath io.vertx:vertx-auth-common:5.0.0.CR3=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.vertx:vertx-auth-common:5.0.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-auth-common:5.1.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.vertx:vertx-bridge-common:5.0.0.CR3=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.vertx:vertx-bridge-common:5.0.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-bridge-common:5.1.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.vertx:vertx-core-logging:5.0.0.CR3=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.vertx:vertx-core-logging:5.0.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-core-logging:5.1.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.vertx:vertx-core:5.0.0.CR3=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.vertx:vertx-core:5.0.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-core:5.1.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-eventbus-bridge-common:5.1.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.vertx:vertx-uri-template:5.0.0.CR3=testCompileClasspath,testRuntimeClasspath -io.vertx:vertx-uri-template:5.0.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-uri-template:5.1.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.vertx:vertx-web-client:5.0.0.CR3=testCompileClasspath,testRuntimeClasspath -io.vertx:vertx-web-client:5.0.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-web-client:5.1.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.vertx:vertx-web-common:5.0.0.CR3=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.vertx:vertx-web-common:5.0.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-web-common:5.1.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.vertx:vertx-web:5.0.0.CR3=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.vertx:vertx-web:5.0.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-web:5.1.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.0=spotbugs junit:junit:4.13.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath From 5e04aa9db1e22a9bc45541d1c000319c1e5810a7 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Thu, 18 Jun 2026 12:30:09 -0400 Subject: [PATCH 004/139] Improved report to be more human-readable. (#11674) Improved report to be more human-readable. Co-authored-by: alexey.kuznetsov --- .github/scripts/dependency_age.py | 66 +++++++++++++++----- .github/scripts/tests/test_dependency_age.py | 58 +++++++++++++++++ 2 files changed, 107 insertions(+), 17 deletions(-) diff --git a/.github/scripts/dependency_age.py b/.github/scripts/dependency_age.py index a08a7ed8b7e..d67f1fdcffa 100644 --- a/.github/scripts/dependency_age.py +++ b/.github/scripts/dependency_age.py @@ -501,6 +501,12 @@ def is_instrumentation_path(relative_path: str) -> bool: # build summary of reverted/downgraded dependencies for PR descriptions # path_filter restricts the summary to lockfiles whose relative path matches, # so each PR (core vs instrumentation) only lists the dependencies it actually changes +# +# The summary is split into three on-screen sections, ordered by how urgently a human +# must act on them: +# 1. "Cannot verify age, reverted" — age could not be checked at all, needs manual resolution +# 2. "h cooldown, reverted" — too new and no older eligible version exists, so reverted to baseline +# 3. "h cooldown, updated to the previous version" — too new, downgraded to an older eligible version def build_validation_summary( *, violations_by_file: dict[str, list[tuple[str, str, int]]], @@ -509,34 +515,60 @@ def build_validation_summary( min_age_hours: int, path_filter: Callable[[str], bool], ) -> str: - header = ["## Dependency age policy", ""] - lines = list(header) + unverified: list[str] = [] + cooldown_reverted: list[str] = [] + cooldown_updated: list[str] = [] seen: set[str] = set() + for relative_path, replacements in replacements_by_file.items(): if not path_filter(relative_path): continue baseline_coords = baseline_lockfiles.get(relative_path, set()) for old_gav, (new_gav, hours_remaining) in replacements.items(): - if old_gav not in seen: - seen.add(old_gav) - if new_gav in baseline_coords: - lines.append(f"- `{old_gav}` is {hours_remaining}h away from meeting {min_age_hours}h cooldown, reverted") - else: - new_version = new_gav.rsplit(":", 1)[1] - lines.append(f"- `{old_gav}` is {hours_remaining}h away from meeting {min_age_hours}h cooldown, updated to `{new_version}`") + if old_gav in seen: + continue + seen.add(old_gav) + if new_gav in baseline_coords: + # the only eligible version was the baseline, so this is effectively a revert + cooldown_reverted.append(f"- `{old_gav}` is {hours_remaining}h away from meeting cooldown") + else: + new_version = new_gav.rsplit(":", 1)[1] + cooldown_updated.append(f"- `{old_gav}` is {hours_remaining}h away from meeting cooldown, updated to `{new_version}`") for relative_path, entries in violations_by_file.items(): if not path_filter(relative_path): continue for gav, kind, hours_remaining in entries: - if gav not in seen: - seen.add(gav) - if kind == "unverified": - lines.append(f"- `{gav}` — cannot verify age, reverted") - else: - lines.append(f"- `{gav}` is {hours_remaining}h away from meeting {min_age_hours}h cooldown, reverted") - if len(lines) == len(header): # nothing matched the filter + if gav in seen: + continue + seen.add(gav) + if kind == "unverified": + unverified.append(f"- `{gav}`") + else: + cooldown_reverted.append(f"- `{gav}` is {hours_remaining}h away from meeting cooldown") + + blocks: list[str] = [] + if unverified: + blocks.append( + "### :warning: Cannot verify age, reverted\n\n" + "The age of these dependencies could not be verified, so the lockfiles were reverted. " + "**This needs to be resolved manually.**\n\n" + + "\n".join(sorted(unverified)) + ) + if cooldown_reverted: + blocks.append( + f"### {min_age_hours}h cooldown, reverted\n\n" + "Too new and no older eligible version exists, so the lockfiles were reverted to the baseline.\n\n" + + "\n".join(sorted(cooldown_reverted)) + ) + if cooldown_updated: + blocks.append( + f"### {min_age_hours}h cooldown, updated to the previous version\n\n" + "Too new, so an older eligible version was used instead.\n\n" + + "\n".join(sorted(cooldown_updated)) + ) + if not blocks: # nothing matched the filter return "" - return "\n".join(lines) + return "## Dependency age policy\n\n" + "\n\n".join(blocks) # replace specific coordinates in lockfiles (for version downgrades) diff --git a/.github/scripts/tests/test_dependency_age.py b/.github/scripts/tests/test_dependency_age.py index 6cd2bd2cf7f..6813497e11a 100644 --- a/.github/scripts/tests/test_dependency_age.py +++ b/.github/scripts/tests/test_dependency_age.py @@ -424,6 +424,64 @@ def test_summary_is_empty_when_filter_matches_nothing(self) -> None: ) self.assertEqual(empty, "") + def test_summary_groups_outcomes_into_sections(self) -> None: + # one of each outcome: unverified, too-new revert, replacement-as-revert, replacement-as-update + summary = dependency_age.build_validation_summary( + violations_by_file={ + "core/gradle.lockfile": [ + ("com.example:unverified-lib:1.0.0", "unverified", 0), + ("com.example:too-new-lib:2.0.0", "too_new", 5), + ], + }, + replacements_by_file={ + "core/gradle.lockfile": { + # eligible version equals the baseline -> effectively a revert + "com.example:revert-lib:3.0.0": ("com.example:revert-lib:2.9.0", 7), + # eligible version is newer than the baseline -> an update to a previous version + "com.example:update-lib:4.0.0": ("com.example:update-lib:3.9.0", 9), + }, + }, + baseline_lockfiles={ + "core/gradle.lockfile": {"com.example:revert-lib:2.9.0"}, + }, + min_age_hours=48, + path_filter=lambda p: True, + ) + + # three section headings present, in priority order + unverified_idx = summary.index("### :warning: Cannot verify age, reverted") + reverted_idx = summary.index("### 48h cooldown, reverted") + updated_idx = summary.index("### 48h cooldown, updated to the previous version") + self.assertLess(unverified_idx, reverted_idx) + self.assertLess(reverted_idx, updated_idx) + + # unverified entry lives under the manual-resolution section + self.assertIn("**This needs to be resolved manually.**", summary) + self.assertIn("- `com.example:unverified-lib:1.0.0`", summary) + + # both the too-new violation and the revert-style replacement land in the reverted section + reverted_block = summary[reverted_idx:updated_idx] + self.assertIn("com.example:too-new-lib:2.0.0", reverted_block) + self.assertIn("com.example:revert-lib:3.0.0", reverted_block) + + # the update names the older version that was used instead + updated_block = summary[updated_idx:] + self.assertIn("com.example:update-lib:4.0.0", updated_block) + self.assertIn("updated to `3.9.0`", updated_block) + + def test_summary_omits_empty_sections(self) -> None: + # only too-new violations -> only the "reverted" section should appear + summary = dependency_age.build_validation_summary( + violations_by_file={"core/gradle.lockfile": [("com.example:core-lib:2.0.0", "too_new", 5)]}, + replacements_by_file={}, + baseline_lockfiles={}, + min_age_hours=48, + path_filter=lambda p: True, + ) + self.assertIn("### 48h cooldown, reverted", summary) + self.assertNotIn("Cannot verify age", summary) + self.assertNotIn("updated to the previous version", summary) + if __name__ == "__main__": unittest.main() From 477a0ce8394bb1e4037401531799a97113bd9223 Mon Sep 17 00:00:00 2001 From: Stuart McCulloch Date: Thu, 18 Jun 2026 18:42:54 +0100 Subject: [PATCH 005/139] Fix bug where calling 'context.with((ImplicitContextKeyed) null)' drops all other elements. (#11672) Fix bug where calling 'context.with((ImplicitContextKeyed) null)' drops all other elements. Co-authored-by: devflow.devflow-routing-intake --- .../context/src/main/java/datadog/context/Context.java | 2 +- .../context/src/test/java/datadog/context/ContextTest.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/components/context/src/main/java/datadog/context/Context.java b/components/context/src/main/java/datadog/context/Context.java index 046713291ae..967feb86fe9 100644 --- a/components/context/src/main/java/datadog/context/Context.java +++ b/components/context/src/main/java/datadog/context/Context.java @@ -155,7 +155,7 @@ default Context with( */ default Context with(@Nullable ImplicitContextKeyed value) { if (value == null) { - return root(); + return this; } return value.storeInto(this); } diff --git a/components/context/src/test/java/datadog/context/ContextTest.java b/components/context/src/test/java/datadog/context/ContextTest.java index 8bf69b645cb..b4f884166b2 100644 --- a/components/context/src/test/java/datadog/context/ContextTest.java +++ b/components/context/src/test/java/datadog/context/ContextTest.java @@ -60,8 +60,10 @@ void testWith(Context context) { // Test null value handling assertDoesNotThrow( () -> context.with(BOOLEAN_KEY, null), "Null value should not throw exception"); - // Test null implicitly keyed value handling - assertDoesNotThrow(() -> context.with(null), "Null implicitly keyed value not throw exception"); + // Test null implicitly keyed value handling - should preserve existing context, not discard it + Context withNull = context1.with((ImplicitContextKeyed) null); + assertEquals( + context1, withNull, "Null implicitly keyed value should preserve existing context"); } @ParameterizedTest From 3ac2bc4a970b43ed79196b8b9f5281d2a902bc29 Mon Sep 17 00:00:00 2001 From: Brice Dutheil Date: Thu, 18 Jun 2026 21:46:30 +0200 Subject: [PATCH 006/139] Optimize codenarc task on rerun (#11677) refactor: Apply normalization on every project perf: Insulate the BuildTimeInstrumentationPlugin from changes using a ClasspathNormalizer BuildTimeInstrumentationPlugin install a post-processing step onto normal compile tasks. Flow: 1. It creates a resolvable `buildTimeInstrumentationPlugin` configuration 2. For each main `compileJava` / `compileGroovy` / `compileScala` task, it registers that configuration as a **compile-task input** 3. Then appends a `doLast("instrumentClasses", ...)` action to post-process compiled classes. That action runs Byte Buddy plugins against the compiled class output. If any input for that task changes, the whole compile task reruns. In particular the Byte Buddy plugins are tracked via ```kotlin inputs.files(project.configurations.named(BUILD_TIME_INSTRUMENTATION_PLUGIN_CONFIGURATION)) ``` In particular instrumentation plugins rely on instrumentation plugins coming from `agent-tooling` project which also happens to have a version file ```Gradle subProj.configurations.named('buildTimeInstrumentationPlugin') { it.dependencies.add(subProj.dependencies.project( path: ':dd-java-agent:agent-tooling', configuration: 'buildTimeInstrumentationToolingPlugins' )) ``` Before the normalizer, Gradle hashed the full jar contents of the build-time instrumentation plugin classpath. And as such the jars on that configuration changed only because their generated *.version changed after a new Git commit. And as such invalidated the task output. Adding the normalizer to this input only teaches Gradle to use the normalizaton declared in the project to ignore the version file on this input. Important nuance: `ClasspathNormalizer` is better than `CompileClasspathNormalizer` here. These are Byte Buddy plugins executed at build time, so method-body/resource changes in those plugin jars can change generated bytecode. We only want to ignore the known volatile version resource. --- Before this change the compile task amounted to a significant part when only the commit version changed ``` 327.901s compile* 10.486s codenarcTest 9.576s *Jar 8.217s process*Resources 2.208s expandAgentShadowJar* 2.032s generate*Index 1.241s writeVersionNumberFile ``` After this change ``` 14.780s compile* # up-to-date checking, not recompilation 7.469s process*Resources 6.194s *Jar 5.056s codenarcTest 2.233s writeVersionNumberFile 1.847s generate*Index 0.899s expandAgentShadowJar* ``` Co-authored-by: brice.dutheil --- build.gradle.kts | 7 +++ .../BuildTimeInstrumentationPlugin.kt | 3 + .../plugin/version/WriteVersionFilePlugin.kt | 9 --- .../version/WriteVersionFilePluginTest.kt | 59 ------------------- 4 files changed, 10 insertions(+), 68 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index f09064ed883..22fca7f31a3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -66,6 +66,13 @@ val compileTask = tasks.register("compile") allprojects { group = "com.datadoghq" + normalization { + runtimeClasspath { + // Let's ignore only version files generated by dd-trace-java.version-file + ignore("**/*.version") + } + } + if (isCI.isPresent) { layout.buildDirectory = providers.provider { val newProjectCIPath = projectDir.path.replace( diff --git a/buildSrc/src/main/kotlin/datadog/gradle/plugin/instrument/BuildTimeInstrumentationPlugin.kt b/buildSrc/src/main/kotlin/datadog/gradle/plugin/instrument/BuildTimeInstrumentationPlugin.kt index eb8c0358e04..d347cfd689c 100644 --- a/buildSrc/src/main/kotlin/datadog/gradle/plugin/instrument/BuildTimeInstrumentationPlugin.kt +++ b/buildSrc/src/main/kotlin/datadog/gradle/plugin/instrument/BuildTimeInstrumentationPlugin.kt @@ -3,6 +3,7 @@ package datadog.gradle.plugin.instrument import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.api.logging.Logging +import org.gradle.api.tasks.ClasspathNormalizer import org.gradle.api.tasks.SourceSet import org.gradle.api.tasks.SourceSetContainer import org.gradle.api.tasks.compile.AbstractCompile @@ -115,6 +116,8 @@ class BuildTimeInstrumentationPlugin : Plugin { BUILD_TIME_INSTRUMENTATION_PLUGIN_CONFIGURATION ) inputs.files(project.configurations.named(BUILD_TIME_INSTRUMENTATION_PLUGIN_CONFIGURATION)) + .withPropertyName(BUILD_TIME_INSTRUMENTATION_PLUGIN_CONFIGURATION) + .withNormalizer(ClasspathNormalizer::class.java) // Compute optional Java version. val match = Regex("compileMain_(.+)Java").matchEntire(compileTaskName) diff --git a/buildSrc/src/main/kotlin/datadog/gradle/plugin/version/WriteVersionFilePlugin.kt b/buildSrc/src/main/kotlin/datadog/gradle/plugin/version/WriteVersionFilePlugin.kt index bcddf23ebf0..84b7b9a3ade 100644 --- a/buildSrc/src/main/kotlin/datadog/gradle/plugin/version/WriteVersionFilePlugin.kt +++ b/buildSrc/src/main/kotlin/datadog/gradle/plugin/version/WriteVersionFilePlugin.kt @@ -10,17 +10,8 @@ class WriteVersionFilePlugin : Plugin { override fun apply(target: Project) { target.pluginManager.apply("java") - val versionFileName = "${target.name}.version" val writeVersionFile = target.tasks.register("writeVersionNumberFile") - // Keep volatile generated version metadata from invalidating @Classpath consumers such as CodeNarc. - // https://docs.gradle.org/current/userguide/build_cache_concepts.html#runtime_classpath_normalization - target.normalization { - runtimeClasspath { - ignore(versionFileName) - } - } - target.the().sourceSets.named("main") { resources.srcDir(writeVersionFile) } diff --git a/buildSrc/src/test/kotlin/datadog/gradle/plugin/version/WriteVersionFilePluginTest.kt b/buildSrc/src/test/kotlin/datadog/gradle/plugin/version/WriteVersionFilePluginTest.kt index 3ec94f5d148..f1bb1395b16 100644 --- a/buildSrc/src/test/kotlin/datadog/gradle/plugin/version/WriteVersionFilePluginTest.kt +++ b/buildSrc/src/test/kotlin/datadog/gradle/plugin/version/WriteVersionFilePluginTest.kt @@ -125,65 +125,6 @@ class WriteVersionFilePluginTest : VersionPluginsFixture() { assertThat(versionFile).doesNotExist() } - @Test - fun `generated version file is ignored in runtime classpath normalization`() { - writeSettings( - """ - rootProject.name = "my-lib" - """ - ) - writeRootProject( - """ - import org.gradle.api.DefaultTask - import org.gradle.api.file.ConfigurableFileCollection - import org.gradle.api.file.RegularFileProperty - import org.gradle.api.tasks.Classpath - import org.gradle.api.tasks.InputFiles - import org.gradle.api.tasks.OutputFile - import org.gradle.api.tasks.TaskAction - - plugins { - id("dd-trace-java.version-file") - } - - version = "1.2.3" - - tasks.named("writeVersionNumberFile") { - gitHash.set(providers.gradleProperty("gitHash").orElse("abc12345")) - } - - abstract class ClasspathProbe : DefaultTask() { - @get:InputFiles - @get:Classpath - val classpath: ConfigurableFileCollection = project.objects.fileCollection() - - @get:OutputFile - val outputFile: RegularFileProperty = project.objects.fileProperty() - - @TaskAction - fun probe() { - outputFile.get().asFile.writeText("probed") - } - } - - tasks.register("classpathProbe") { - dependsOn("processResources") - classpath.from(sourceSets.main.get().runtimeClasspath) - outputFile.set(layout.buildDirectory.file("classpath-probe/output.txt")) - } - """ - ) - - assertThat(run("classpathProbe", "-PgitHash=abc12345").task(":classpathProbe")?.outcome) - .isEqualTo(TaskOutcome.SUCCESS) - - val result = run("classpathProbe", "-PgitHash=def67890") - - assertThat(generatedVersionFile).hasContent("1.2.3~def67890") - assertThat(result.task(":writeVersionNumberFile")?.outcome).isEqualTo(TaskOutcome.SUCCESS) - assertThat(result.task(":classpathProbe")?.outcome).isEqualTo(TaskOutcome.UP_TO_DATE) - } - private fun assertVersionFile( expectedContentRegex: String, task: String = ":writeVersionNumberFile", From 0e13e90dacf7c1270a92d01ee4a4f82e9d6230c6 Mon Sep 17 00:00:00 2001 From: Andrea Marziali Date: Fri, 19 Jun 2026 09:31:51 +0200 Subject: [PATCH 007/139] Ignore capturing connection continuation for armeria (#11657) Ignore capturing connection continuation for armeria Co-authored-by: andrea.marziali --- .../src/test/groovy/ArmeriaGrpcStreamingTest.groovy | 5 ----- .../src/test/groovy/ArmeriaGrpcTest.groovy | 5 ----- .../AsyncPropagatingDisableInstrumentation.java | 12 +++++++++++- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/ArmeriaGrpcStreamingTest.groovy b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/ArmeriaGrpcStreamingTest.groovy index 4098f3d4f62..912fa60e0ed 100644 --- a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/ArmeriaGrpcStreamingTest.groovy +++ b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/ArmeriaGrpcStreamingTest.groovy @@ -41,11 +41,6 @@ abstract class ArmeriaGrpcStreamingTest extends VersionedNamingTestBase { false } - @Override - boolean useStrictTraceWrites() { - false - } - @Override protected void configurePreAgent() { super.configurePreAgent() diff --git a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/ArmeriaGrpcTest.groovy b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/ArmeriaGrpcTest.groovy index da2fd3e2510..7f8089f9aa9 100644 --- a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/ArmeriaGrpcTest.groovy +++ b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/ArmeriaGrpcTest.groovy @@ -87,11 +87,6 @@ abstract class ArmeriaGrpcTest extends VersionedNamingTestBase { injectSysConfig(GRPC_SERVER_ERROR_STATUSES, "2-14", true) } - @Override - boolean useStrictTraceWrites() { - false - } - def setupSpec() { ig = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC) } diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/AsyncPropagatingDisableInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/AsyncPropagatingDisableInstrumentation.java index f7baa6fd6b0..94c94573032 100644 --- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/AsyncPropagatingDisableInstrumentation.java +++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/AsyncPropagatingDisableInstrumentation.java @@ -93,7 +93,9 @@ public String[] knownMatchingTypes() { "jdk.internal.net.http.HttpClientImpl", LETTUCE_HANDSHAKE_HANDLER, "io.netty.util.concurrent.GlobalEventExecutor", - "io.grpc.netty.shaded.io.netty.util.concurrent.GlobalEventExecutor" + "io.grpc.netty.shaded.io.netty.util.concurrent.GlobalEventExecutor", + "com.linecorp.armeria.client.HttpClientFactory", + "com.linecorp.armeria.client.HttpChannelPool" }; } @@ -199,6 +201,14 @@ public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice(namedOneOf("sendAsync").and(isDeclaredBy(JAVA_HTTP_CLIENT)), advice); transformer.applyAdvice( named("channelRegistered").and(isDeclaredBy(named(LETTUCE_HANDSHAKE_HANDLER))), advice); + // armeria runs its own codec/pipeline, so the active request span captured during connection + // pool creation and channel connect will have no consumers. + transformer.applyAdvice( + named("pool").and(isDeclaredBy(named("com.linecorp.armeria.client.HttpClientFactory"))), + advice); + transformer.applyAdvice( + named("connect").and(isDeclaredBy(named("com.linecorp.armeria.client.HttpChannelPool"))), + advice); } public static class DisableAsyncAdvice { From 139a1ba3c7971090664e2b1d962be4366a54fa71 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Fri, 19 Jun 2026 10:56:07 -0400 Subject: [PATCH 008/139] Fix new instrumentation lock files leaking into core dependency-update PR. (#11676) Fix new instrumentation lock files leaking into core dependency-update PR. Co-authored-by: alexey.kuznetsov --- .github/workflows/update-gradle-dependencies.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/update-gradle-dependencies.yaml b/.github/workflows/update-gradle-dependencies.yaml index f059041e16f..8ba0fc12fda 100644 --- a/.github/workflows/update-gradle-dependencies.yaml +++ b/.github/workflows/update-gradle-dependencies.yaml @@ -74,8 +74,13 @@ jobs: run: | mkdir -p /tmp/instrumentation-lockfiles find dd-smoke-tests dd-java-agent/instrumentation -name 'gradle.lockfile' -exec cp --parents {} /tmp/instrumentation-lockfiles/ \; - # Restore instrumentation dirs to original state (keep only core changes) + # Restore instrumentation dirs to original state (keep only core changes). + # git restore only reverts tracked files; brand-new lock files are untracked + # and would otherwise leak into the core PR, so delete the untracked ones too. git restore -- 'dd-smoke-tests/' 'dd-java-agent/instrumentation/' + git ls-files --others --exclude-standard -- \ + 'dd-smoke-tests/*gradle.lockfile' 'dd-java-agent/instrumentation/*gradle.lockfile' \ + | xargs -r rm -f # ==================== Core modules PR ==================== - name: Check if core changes exist From 0fdd9c262717bb03c2c871f84455be04b3c04460 Mon Sep 17 00:00:00 2001 From: Brice Dutheil Date: Fri, 19 Jun 2026 19:52:32 +0200 Subject: [PATCH 009/139] Update Gradle to 9.6.0 (#11682) chore(build): Bump Gradle to 9.6.0 fix(test): update dependencies report assertion for Gradle 9.6 project path quoting Gradle 9.6 wraps project paths in single quotes in the dependencies report output: `project ':dd-java-agent:agent-bootstrap'` instead of the previous `project :dd-java-agent:agent-bootstrap`. Drop the `project` prefix from the assertion so the check matches both formats. fix(sofarpc): force netty-all to 4.1.79 to resolve classpath conflict under Gradle 9.6 The `sofa-rpc-all:5.14.2` brings `netty-all:4.1.44.Final`, which is a fat jar, while `grpc-netty:1.53.0` brings individual `netty-*:4.1.79.Final` modules. Gradle 9.6.0 introduced a regression in the classpath ordering, as they are working on revamping the dependency traversal. The result is that the `4.1.44` fat jar classes appears earlier and its classes are loaded from it ; This produces a `NoSuchMethodError` at runtime in netty's `AbstractReferenceCountedByteBuf`. The workaround is to force `netty-all` to `4.1.79` so the fat jar and the individual modules are aligned on the same version. This should be fixed in 9.7.0 and consequently removed from the `resolutionStrategy`. See https://github.com/gradle/gradle/issues/38057 refactor(build): Migrate away from property delegate (deprecated in 9.6.0) Gradle 9.6.0 deprecates a few old API, unfortunately Kotlin property delegates are part of the bag. https://github.com/gradle/gradle/issues/37555 https://github.com/gradle/gradle/pull/37556 https://docs.gradle.org/current/userguide/upgrading_version_9.html#kotlin_dsl_delegated_properties chore(build): Bump Gradle version in GitLab CI cache config to 9.6.0 Co-authored-by: brice.dutheil --- .gitlab-ci.yml | 2 +- build-logic/smoke-test/build.gradle.kts | 2 +- buildSrc/build.gradle.kts | 6 +- .../muzzle/MuzzlePluginFunctionalTest.kt | 4 +- communication/build.gradle.kts | 78 ++-- components/context/build.gradle.kts | 4 +- components/environment/build.gradle.kts | 20 +- components/http/http-api/build.gradle.kts | 28 +- .../sofarpc/sofarpc-5.0/build.gradle | 27 +- .../sofarpc/sofarpc-5.0/gradle.lockfile | 24 +- dd-trace-api/build.gradle.kts | 118 +++-- dd-trace-ot/build.gradle.kts | 26 +- .../correlation-id-injection/build.gradle.kts | 10 +- gradle/wrapper/gradle-wrapper.properties | 4 +- internal-api/build.gradle.kts | 438 +++++++++--------- internal-api/internal-api-9/build.gradle.kts | 4 +- .../build.gradle.kts | 42 +- .../feature-flagging-lib/build.gradle.kts | 10 +- products/metrics/metrics-lib/build.gradle.kts | 14 +- .../remote-config-api/build.gradle.kts | 6 +- .../remote-config-core/build.gradle.kts | 36 +- telemetry/build.gradle.kts | 40 +- utils/config-utils/build.gradle.kts | 76 ++- .../test-agent-utils/decoder/build.gradle.kts | 10 +- utils/time-utils/build.gradle.kts | 8 +- 25 files changed, 506 insertions(+), 531 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eee9eadfc68..1e1f5102db5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -49,7 +49,7 @@ variables: BUILD_JOB_NAME: "build" DEPENDENCY_CACHE_POLICY: pull BUILD_CACHE_POLICY: pull - GRADLE_VERSION: "9.5.1" # must match gradle-wrapper.properties + GRADLE_VERSION: "9.6.0" # must match gradle-wrapper.properties MASS_READ_URL: "https://mass-read.us1.ddbuild.io" MAVEN_REPOSITORY_PROXY: "https://depot-read-api-java.us1.ddbuild.io/magicmirror/magicmirror/@current/" GRADLE_PLUGIN_PROXY: "https://depot-read-api-java.us1.ddbuild.io/magicmirror/magicmirror/@current/" diff --git a/build-logic/smoke-test/build.gradle.kts b/build-logic/smoke-test/build.gradle.kts index 2581025425e..fc57c9cf0e0 100644 --- a/build-logic/smoke-test/build.gradle.kts +++ b/build-logic/smoke-test/build.gradle.kts @@ -32,7 +32,7 @@ gradlePlugin { @Suppress("UnstableApiUsage") testing { suites { - val test by getting(JvmTestSuite::class) { + named("test") { useJUnitJupiter(libs.versions.junit5) dependencies { implementation(libs.junit.jupiter) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 0a597434a00..206731e5519 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -76,9 +76,7 @@ gradlePlugin { } } -apply { - from("$rootDir/../gradle/repositories.gradle") -} +apply(from = "$rootDir/../gradle/repositories.gradle") repositories { gradlePluginPortal() @@ -117,7 +115,7 @@ tasks.compileKotlin { testing { @Suppress("UnstableApiUsage") suites { - val test by getting(JvmTestSuite::class) { + named("test") { dependencies { implementation(libs.assertj.core) } diff --git a/buildSrc/src/test/kotlin/datadog/gradle/plugin/muzzle/MuzzlePluginFunctionalTest.kt b/buildSrc/src/test/kotlin/datadog/gradle/plugin/muzzle/MuzzlePluginFunctionalTest.kt index b09bca95c1e..ac30e3ae447 100644 --- a/buildSrc/src/test/kotlin/datadog/gradle/plugin/muzzle/MuzzlePluginFunctionalTest.kt +++ b/buildSrc/src/test/kotlin/datadog/gradle/plugin/muzzle/MuzzlePluginFunctionalTest.kt @@ -162,14 +162,14 @@ class MuzzlePluginFunctionalTest : MuzzlePluginTestFixture() { "--configuration", "muzzleBootstrap" ) - assertThat(bootstrapDependencies.output).contains("project :dd-java-agent:agent-bootstrap") + assertThat(bootstrapDependencies.output).contains(":dd-java-agent:agent-bootstrap") val toolingDependencies = run( ":dd-java-agent:instrumentation:demo:dependencies", "--configuration", "muzzleTooling" ) - assertThat(toolingDependencies.output).contains("project :dd-java-agent:agent-tooling") + assertThat(toolingDependencies.output).contains(":dd-java-agent:agent-tooling") } @Test diff --git a/communication/build.gradle.kts b/communication/build.gradle.kts index b5f31fadb68..8a4285843b0 100644 --- a/communication/build.gradle.kts +++ b/communication/build.gradle.kts @@ -36,48 +36,42 @@ dependencies { ) } -val minimumBranchCoverage by extra(0.5) -val minimumInstructionCoverage by extra(0.8) -val excludedClassesCoverage by extra( - listOf( - "datadog.communication.ddagent.ExternalAgentLauncher", - "datadog.communication.ddagent.ExternalAgentLauncher.NamedPipeHealthCheck", - "datadog.communication.ddagent.SharedCommunicationObjects.FixedConfigUrlSupplier", - "datadog.communication.ddagent.SharedCommunicationObjects.RetryConfigUrlSupplier", - "datadog.communication.http.OkHttpUtils", - "datadog.communication.http.OkHttpUtils.1", - "datadog.communication.http.OkHttpUtils.ByteBufferRequestBody", - "datadog.communication.http.OkHttpUtils.CustomListener", - "datadog.communication.http.OkHttpUtils.GZipByteBufferRequestBody", - "datadog.communication.http.OkHttpUtils.GZipRequestBodyDecorator", - "datadog.communication.http.OkHttpUtils.JsonRequestBody", - "datadog.communication.BackendApiFactory", - "datadog.communication.BackendApiFactory.Intake", - "datadog.communication.EvpProxyApi", - "datadog.communication.IntakeApi", - "datadog.communication.util.IOUtils", - "datadog.communication.util.IOUtils.1", - ) +extra["minimumBranchCoverage"] = 0.5 +extra["minimumInstructionCoverage"] = 0.8 +extra["excludedClassesCoverage"] = listOf( + "datadog.communication.ddagent.ExternalAgentLauncher", + "datadog.communication.ddagent.ExternalAgentLauncher.NamedPipeHealthCheck", + "datadog.communication.ddagent.SharedCommunicationObjects.FixedConfigUrlSupplier", + "datadog.communication.ddagent.SharedCommunicationObjects.RetryConfigUrlSupplier", + "datadog.communication.http.OkHttpUtils", + "datadog.communication.http.OkHttpUtils.1", + "datadog.communication.http.OkHttpUtils.ByteBufferRequestBody", + "datadog.communication.http.OkHttpUtils.CustomListener", + "datadog.communication.http.OkHttpUtils.GZipByteBufferRequestBody", + "datadog.communication.http.OkHttpUtils.GZipRequestBodyDecorator", + "datadog.communication.http.OkHttpUtils.JsonRequestBody", + "datadog.communication.BackendApiFactory", + "datadog.communication.BackendApiFactory.Intake", + "datadog.communication.EvpProxyApi", + "datadog.communication.IntakeApi", + "datadog.communication.util.IOUtils", + "datadog.communication.util.IOUtils.1", ) -val excludedClassesBranchCoverage by extra( - listOf( - "datadog.communication.ddagent.TracerVersion", - "datadog.communication.BackendApiFactory", - "datadog.communication.EvpProxyApi", - "datadog.communication.IntakeApi", - ) +extra["excludedClassesBranchCoverage"] = listOf( + "datadog.communication.ddagent.TracerVersion", + "datadog.communication.BackendApiFactory", + "datadog.communication.EvpProxyApi", + "datadog.communication.IntakeApi", ) -val excludedClassesInstructionCoverage by extra( - listOf( - // can't reach the error condition now - "datadog.communication.fleet.FleetServiceImpl", - "datadog.communication.ddagent.SharedCommunicationObjects", - "datadog.communication.ddagent.TracerVersion", - "datadog.communication.BackendApiFactory", - "datadog.communication.BackendApiFactory.Intake", - "datadog.communication.EvpProxyApi", - "datadog.communication.IntakeApi", - "datadog.communication.util.IOUtils", - "datadog.communication.util.IOUtils.1", - ) +extra["excludedClassesInstructionCoverage"] = listOf( + // can't reach the error condition now + "datadog.communication.fleet.FleetServiceImpl", + "datadog.communication.ddagent.SharedCommunicationObjects", + "datadog.communication.ddagent.TracerVersion", + "datadog.communication.BackendApiFactory", + "datadog.communication.BackendApiFactory.Intake", + "datadog.communication.EvpProxyApi", + "datadog.communication.IntakeApi", + "datadog.communication.util.IOUtils", + "datadog.communication.util.IOUtils.1", ) diff --git a/components/context/build.gradle.kts b/components/context/build.gradle.kts index cda16b4cb17..27992034fc2 100644 --- a/components/context/build.gradle.kts +++ b/components/context/build.gradle.kts @@ -1,5 +1,3 @@ apply(from = "$rootDir/gradle/java.gradle") -val excludedClassesInstructionCoverage by extra { - listOf("datadog.context.ContextProviders") // covered by forked test -} +extra["excludedClassesInstructionCoverage"] = listOf("datadog.context.ContextProviders") // covered by forked test diff --git a/components/environment/build.gradle.kts b/components/environment/build.gradle.kts index 82c834d5ef3..f921a6774a2 100644 --- a/components/environment/build.gradle.kts +++ b/components/environment/build.gradle.kts @@ -22,15 +22,11 @@ tasks.shadowJar { * Configure test coverage. */ extra.set("minimumInstructionCoverage", 0.7) -val excludedClassesCoverage by extra { - listOf( - "datadog.environment.JavaVirtualMachine", // depends on OS and JVM vendor - "datadog.environment.JavaVirtualMachine.JvmOptionsHolder", // depends on OS and JVM vendor - "datadog.environment.JvmOptions", // depends on OS and JVM vendor - "datadog.environment.OperatingSystem**", // depends on OS - "datadog.environment.ThreadSupport", // requires Java 21 - ) -} -val excludedClassesBranchCoverage by extra { - listOf("datadog.environment.CommandLine") // tested using forked process -} +extra["excludedClassesCoverage"] = listOf( + "datadog.environment.JavaVirtualMachine", // depends on OS and JVM vendor + "datadog.environment.JavaVirtualMachine.JvmOptionsHolder", // depends on OS and JVM vendor + "datadog.environment.JvmOptions", // depends on OS and JVM vendor + "datadog.environment.OperatingSystem**", // depends on OS + "datadog.environment.ThreadSupport", // requires Java 21 +) +extra["excludedClassesBranchCoverage"] = listOf("datadog.environment.CommandLine") // tested using forked process diff --git a/components/http/http-api/build.gradle.kts b/components/http/http-api/build.gradle.kts index 314579b64db..3175c919318 100644 --- a/components/http/http-api/build.gradle.kts +++ b/components/http/http-api/build.gradle.kts @@ -7,23 +7,21 @@ apply(from = "$rootDir/gradle/java.gradle") description = "HTTP Client API" -val minimumBranchCoverage by extra(0) // extra(0.7) -- need a library implementation -val minimumInstructionCoverage by extra(0) // extra(0.7) -- need a library implementation +extra["minimumBranchCoverage"] = 0 // extra(0.7) -- need a library implementation +extra["minimumInstructionCoverage"] = 0 // extra(0.7) -- need a library implementation // Exclude interfaces for test coverage -val excludedClassesCoverage by extra( - listOf( - "datadog.http.client.HttpClient", - "datadog.http.client.HttpClient.Builder", - "datadog.http.client.HttpRequest", - "datadog.http.client.HttpRequest.Builder", - "datadog.http.client.HttpRequestBody", - "datadog.http.client.HttpRequestBody.MultipartBuilder", - "datadog.http.client.HttpRequestListener", - "datadog.http.client.HttpResponse", - "datadog.http.client.HttpUrl", - "datadog.http.client.HttpUrl.Builder", - ) +extra["excludedClassesCoverage"] = listOf( + "datadog.http.client.HttpClient", + "datadog.http.client.HttpClient.Builder", + "datadog.http.client.HttpRequest", + "datadog.http.client.HttpRequest.Builder", + "datadog.http.client.HttpRequestBody", + "datadog.http.client.HttpRequestBody.MultipartBuilder", + "datadog.http.client.HttpRequestListener", + "datadog.http.client.HttpResponse", + "datadog.http.client.HttpUrl", + "datadog.http.client.HttpUrl.Builder", ) dependencies { diff --git a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/build.gradle b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/build.gradle index bb063fa43be..90385de3196 100644 --- a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/build.gradle +++ b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/build.gradle @@ -11,10 +11,6 @@ apply from: "$rootDir/gradle/java.gradle" addTestSuiteForDir('latestDepTest', 'test') -configurations.testRuntimeClasspath { - resolutionStrategy.force "com.google.guava:guava:32.1.3-jre" -} - dependencies { compileOnly group: "com.alipay.sofa", name: "sofa-rpc-all", version: "5.6.0" @@ -32,4 +28,27 @@ dependencies { testImplementation group: "com.google.guava", name: "guava", version: "32.1.3-jre" latestDepTestImplementation group: "com.alipay.sofa", name: "sofa-rpc-all", version: "+" + + constraints { + testImplementation("com.google.guava:guava:32.1.3-jre") { + because "sofa-rpc-all may bring an older guava version; pin to match the direct test dependency" + } + + // Regression fix for Gradle 9.6.0 (should be fixed in 9.7.0) + // + // The `sofa-rpc-all:5.14.2` brings `netty-all:4.1.44.Final`, which is a fat jar, + // while `grpc-netty:1.53.0` brings individual `netty-*:4.1.79.Final` modules. + // Gradle 9.6.0 introduced a regression in the classpath ordering, as they are + // working on revamping the dependency traversal. The result is that the `4.1.44` + // fat jar classes appear earlier and its classes are loaded from it ; this + // produces a `NoSuchMethodError` at runtime in netty's `AbstractReferenceCountedByteBuf`. + // + // The workaround is to force `netty-all` to `4.1.79` so the fat jar and the individual + // modules are aligned on the same version. This should be fixed in 9.7.0 and consequently + // removed from the constraints. + // See https://github.com/gradle/gradle/issues/38057 for more details. + testImplementation("io.netty:netty-all:4.1.79.Final") { + because "sofa-rpc-all brings netty-all:4.1.44.Final (fat jar) while grpc-netty brings individual netty-*:4.1.79.Final modules; Gradle 9.6.0 classpath ordering regression causes 4.1.44 classes to shadow 4.1.79, producing NoSuchMethodError" + } + } } diff --git a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/gradle.lockfile b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/gradle.lockfile index 33d4925bd8a..28d39a23877 100644 --- a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:sofarpc:sofarpc-5.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -76,8 +77,7 @@ com.google.guava:guava:32.1.3-jre=latestDepTestCompileClasspath,latestDepTestRun com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.http-client:google-http-client-gson:1.41.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.http-client:google-http-client:1.41.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.j2objc:j2objc-annotations:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath +com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.protobuf:protobuf-java-util:3.21.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.protobuf:protobuf-java:3.25.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.6=latestDepTestCompileClasspath,testCompileClasspath @@ -116,17 +116,35 @@ io.grpc:grpc-testing:1.53.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl io.grpc:grpc-xds:1.53.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.leangen.geantyref:geantyref:1.3.16=latestDepTestRuntimeClasspath,testRuntimeClasspath io.netty:netty-all:4.1.32.Final=compileClasspath -io.netty:netty-all:4.1.44.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-all:4.1.79.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-buffer:4.1.79.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-dns:4.1.79.Final=testRuntimeClasspath +io.netty:netty-codec-haproxy:4.1.79.Final=testRuntimeClasspath io.netty:netty-codec-http2:4.1.79.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec-http:4.1.79.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-memcache:4.1.79.Final=testRuntimeClasspath +io.netty:netty-codec-mqtt:4.1.79.Final=testRuntimeClasspath +io.netty:netty-codec-redis:4.1.79.Final=testRuntimeClasspath +io.netty:netty-codec-smtp:4.1.79.Final=testRuntimeClasspath io.netty:netty-codec-socks:4.1.79.Final=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.netty:netty-codec-stomp:4.1.79.Final=testRuntimeClasspath +io.netty:netty-codec-xml:4.1.79.Final=testRuntimeClasspath io.netty:netty-codec:4.1.79.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-common:4.1.79.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-handler-proxy:4.1.79.Final=latestDepTestRuntimeClasspath,testRuntimeClasspath io.netty:netty-handler:4.1.79.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-resolver-dns-classes-macos:4.1.79.Final=testRuntimeClasspath +io.netty:netty-resolver-dns-native-macos:4.1.79.Final=testRuntimeClasspath +io.netty:netty-resolver-dns:4.1.79.Final=testRuntimeClasspath io.netty:netty-resolver:4.1.79.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-transport-classes-epoll:4.1.79.Final=testRuntimeClasspath +io.netty:netty-transport-classes-kqueue:4.1.79.Final=testRuntimeClasspath +io.netty:netty-transport-native-epoll:4.1.79.Final=testRuntimeClasspath +io.netty:netty-transport-native-kqueue:4.1.79.Final=testRuntimeClasspath io.netty:netty-transport-native-unix-common:4.1.79.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-transport-rxtx:4.1.79.Final=testRuntimeClasspath +io.netty:netty-transport-sctp:4.1.79.Final=testRuntimeClasspath +io.netty:netty-transport-udt:4.1.79.Final=testRuntimeClasspath io.netty:netty-transport:4.1.79.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.opencensus:opencensus-api:0.28.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.opencensus:opencensus-contrib-http-util:0.28.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-trace-api/build.gradle.kts b/dd-trace-api/build.gradle.kts index bc05a8753a4..5382eeeb019 100644 --- a/dd-trace-api/build.gradle.kts +++ b/dd-trace-api/build.gradle.kts @@ -5,68 +5,66 @@ plugins { apply(from = "$rootDir/gradle/java.gradle") apply(from = "$rootDir/gradle/publish.gradle") -val minimumBranchCoverage by extra(0.8) +extra["minimumBranchCoverage"] = 0.8 // These are tested outside of this module since this module mainly just defines 'API' -val excludedClassesCoverage by extra( - listOf( - "datadog.trace.api.ConfigDefaults", - "datadog.trace.api.CorrelationIdentifier", - "datadog.trace.api.DDSpanTypes", - "datadog.trace.api.DDTags", - "datadog.trace.api.DDTraceApiInfo", - "datadog.trace.api.DDTraceId", - "datadog.trace.api.EventTracker", - "datadog.trace.api.GlobalTracer*", - "datadog.trace.api.PropagationStyle", - "datadog.trace.api.TracePropagationStyle", - "datadog.trace.api.TracePropagationBehaviorExtract", - "datadog.trace.api.SpanCorrelation*", - "datadog.trace.api.internal.TraceSegment", - "datadog.trace.api.internal.TraceSegment.NoOp", - "datadog.trace.api.aiguard.AIGuard", - "datadog.trace.api.aiguard.AIGuard.AIGuardAbortError", - "datadog.trace.api.aiguard.AIGuard.AIGuardClientError", - "datadog.trace.api.aiguard.AIGuard.Options", - "datadog.trace.api.civisibility.CIVisibility", - "datadog.trace.api.civisibility.DDTestModule", - "datadog.trace.api.civisibility.noop.NoOpDDTest", - "datadog.trace.api.civisibility.noop.NoOpDDTestModule", - "datadog.trace.api.civisibility.noop.NoOpDDTestSession", - "datadog.trace.api.civisibility.noop.NoOpDDTestSuite", - "datadog.trace.api.config.AIGuardConfig", - "datadog.trace.api.config.FeatureFlaggingConfig", - "datadog.trace.api.config.ProfilingConfig", - "datadog.trace.api.interceptor.MutableSpan", - "datadog.trace.api.profiling.Profiling", - "datadog.trace.api.profiling.Profiling.NoOp", - "datadog.trace.api.profiling.ProfilingScope", - "datadog.trace.api.profiling.ProfilingContext", - "datadog.trace.api.profiling.ProfilingContextAttribute.NoOp", - "datadog.trace.api.llmobs.LLMObs", - "datadog.trace.api.llmobs.LLMObs.LLMMessage", - "datadog.trace.api.llmobs.LLMObs.ToolCall", - "datadog.trace.api.llmobs.LLMObsSpan", - "datadog.trace.api.llmobs.noop.NoOpLLMObsSpan", - "datadog.trace.api.llmobs.noop.NoOpLLMObsSpanFactory", - "datadog.trace.api.llmobs.noop.NoOpLLMObsEvalProcessor", - "datadog.trace.api.experimental.DataStreamsCheckpointer", - "datadog.trace.api.experimental.DataStreamsCheckpointer.NoOp", - "datadog.trace.api.experimental.DataStreamsContextCarrier", - "datadog.trace.api.experimental.DataStreamsContextCarrier.NoOp", - "datadog.appsec.api.blocking.*", - "datadog.appsec.api.user.*", - "datadog.appsec.api.login.*", - // Default fallback methods to not break legacy API - "datadog.trace.context.TraceScope", - "datadog.trace.context.NoopTraceScope.NoopContinuation", - "datadog.trace.context.NoopTraceScope", - "datadog.trace.payloadtags.PayloadTagsData", - "datadog.trace.payloadtags.PayloadTagsData.PathAndValue", - "datadog.trace.api.llmobs.LLMObsTags", - "datadog.trace.api.config.OtlpConfig.Protocol", - "datadog.trace.api.config.OtlpConfig.Temporality", - ) +extra["excludedClassesCoverage"] = listOf( + "datadog.trace.api.ConfigDefaults", + "datadog.trace.api.CorrelationIdentifier", + "datadog.trace.api.DDSpanTypes", + "datadog.trace.api.DDTags", + "datadog.trace.api.DDTraceApiInfo", + "datadog.trace.api.DDTraceId", + "datadog.trace.api.EventTracker", + "datadog.trace.api.GlobalTracer*", + "datadog.trace.api.PropagationStyle", + "datadog.trace.api.TracePropagationStyle", + "datadog.trace.api.TracePropagationBehaviorExtract", + "datadog.trace.api.SpanCorrelation*", + "datadog.trace.api.internal.TraceSegment", + "datadog.trace.api.internal.TraceSegment.NoOp", + "datadog.trace.api.aiguard.AIGuard", + "datadog.trace.api.aiguard.AIGuard.AIGuardAbortError", + "datadog.trace.api.aiguard.AIGuard.AIGuardClientError", + "datadog.trace.api.aiguard.AIGuard.Options", + "datadog.trace.api.civisibility.CIVisibility", + "datadog.trace.api.civisibility.DDTestModule", + "datadog.trace.api.civisibility.noop.NoOpDDTest", + "datadog.trace.api.civisibility.noop.NoOpDDTestModule", + "datadog.trace.api.civisibility.noop.NoOpDDTestSession", + "datadog.trace.api.civisibility.noop.NoOpDDTestSuite", + "datadog.trace.api.config.AIGuardConfig", + "datadog.trace.api.config.FeatureFlaggingConfig", + "datadog.trace.api.config.ProfilingConfig", + "datadog.trace.api.interceptor.MutableSpan", + "datadog.trace.api.profiling.Profiling", + "datadog.trace.api.profiling.Profiling.NoOp", + "datadog.trace.api.profiling.ProfilingScope", + "datadog.trace.api.profiling.ProfilingContext", + "datadog.trace.api.profiling.ProfilingContextAttribute.NoOp", + "datadog.trace.api.llmobs.LLMObs", + "datadog.trace.api.llmobs.LLMObs.LLMMessage", + "datadog.trace.api.llmobs.LLMObs.ToolCall", + "datadog.trace.api.llmobs.LLMObsSpan", + "datadog.trace.api.llmobs.noop.NoOpLLMObsSpan", + "datadog.trace.api.llmobs.noop.NoOpLLMObsSpanFactory", + "datadog.trace.api.llmobs.noop.NoOpLLMObsEvalProcessor", + "datadog.trace.api.experimental.DataStreamsCheckpointer", + "datadog.trace.api.experimental.DataStreamsCheckpointer.NoOp", + "datadog.trace.api.experimental.DataStreamsContextCarrier", + "datadog.trace.api.experimental.DataStreamsContextCarrier.NoOp", + "datadog.appsec.api.blocking.*", + "datadog.appsec.api.user.*", + "datadog.appsec.api.login.*", + // Default fallback methods to not break legacy API + "datadog.trace.context.TraceScope", + "datadog.trace.context.NoopTraceScope.NoopContinuation", + "datadog.trace.context.NoopTraceScope", + "datadog.trace.payloadtags.PayloadTagsData", + "datadog.trace.payloadtags.PayloadTagsData.PathAndValue", + "datadog.trace.api.llmobs.LLMObsTags", + "datadog.trace.api.config.OtlpConfig.Protocol", + "datadog.trace.api.config.OtlpConfig.Temporality", ) description = "dd-trace-api" diff --git a/dd-trace-ot/build.gradle.kts b/dd-trace-ot/build.gradle.kts index a0f3f3a360c..e21d6100b02 100644 --- a/dd-trace-ot/build.gradle.kts +++ b/dd-trace-ot/build.gradle.kts @@ -12,20 +12,18 @@ apply(from = rootDir.resolve("gradle/java.gradle")) apply(from = rootDir.resolve("gradle/publish.gradle")) // TODO raise these when equals() and hashCode() are excluded -val minimumBranchCoverage by extra(0.5) -val minimumInstructionCoverage by extra(0.5) - -val excludedClassesCoverage by extra( - listOf( - // This is mainly equals() and hashCode() - "datadog.opentracing.OTScopeManager.OTScope", - "datadog.opentracing.OTScopeManager.FakeScope", - "datadog.opentracing.OTSpan", - "datadog.opentracing.OTSpanContext", - "datadog.opentracing.CustomScopeManagerWrapper.CustomScopeState", - // The builder is generated - "datadog.opentracing.DDTracer.DDTracerBuilder" - ) +extra["minimumBranchCoverage"] = 0.5 +extra["minimumInstructionCoverage"] = 0.5 + +extra["excludedClassesCoverage"] = listOf( + // This is mainly equals() and hashCode() + "datadog.opentracing.OTScopeManager.OTScope", + "datadog.opentracing.OTScopeManager.FakeScope", + "datadog.opentracing.OTSpan", + "datadog.opentracing.OTSpanContext", + "datadog.opentracing.CustomScopeManagerWrapper.CustomScopeState", + // The builder is generated + "datadog.opentracing.DDTracer.DDTracerBuilder" ) // Helper extensions for custom methods from Groovy DSL diff --git a/dd-trace-ot/correlation-id-injection/build.gradle.kts b/dd-trace-ot/correlation-id-injection/build.gradle.kts index a71e6cfddf7..ad70a7334f9 100644 --- a/dd-trace-ot/correlation-id-injection/build.gradle.kts +++ b/dd-trace-ot/correlation-id-injection/build.gradle.kts @@ -4,13 +4,11 @@ plugins { apply(from = "$rootDir/gradle/java.gradle") -val minimumBranchCoverage by extra(0.8) +extra["minimumBranchCoverage"] = 0.8 -val excludedClassesCoverage by extra( - listOf( - "datadog.trace.correlation.CorrelationIdInjectors", - "datadog.trace.correlation.CorrelationIdInjectors.InjectorType" - ) +extra["excludedClassesCoverage"] = listOf( + "datadog.trace.correlation.CorrelationIdInjectors", + "datadog.trace.correlation.CorrelationIdInjectors.InjectorType" ) description = "correlation-id-injection" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bd82f36babb..65d8749eabe 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=bafc141b619ad6350fd975fc903156dd5c151998cc8b058e8c1044ab5f7b031f -distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip +distributionSha256Sum=bbaeb2fef8710818cf0e261201dab964c572f92b942812df0c3620d62a529a01 +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.0-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/internal-api/build.gradle.kts b/internal-api/build.gradle.kts index fc95dd9e1f1..305dead4459 100644 --- a/internal-api/build.gradle.kts +++ b/internal-api/build.gradle.kts @@ -27,234 +27,226 @@ tasks.named("forbiddenApisMain") { failOnMissingClasses = false } -val minimumBranchCoverage by extra(0.7) -val minimumInstructionCoverage by extra(0.8) +extra["minimumBranchCoverage"] = 0.7 +extra["minimumInstructionCoverage"] = 0.8 -val excludedClassesCoverage by extra( - listOf( - "datadog.trace.api.ClassloaderConfigurationOverrides", - "datadog.trace.api.ClassloaderConfigurationOverrides.Lazy", - // Interface - "datadog.trace.api.EndpointTracker", - "datadog.trace.api.Platform", - // Noop implementation - "datadog.trace.api.TraceSegment.NoOp", - "datadog.trace.api.WithGlobalTracer.1", - "datadog.trace.api.gateway.Events.ET", - // Noop implementation - "datadog.trace.api.gateway.RequestContext.Noop", - // Enum - "datadog.trace.api.intake.TrackType", - "datadog.trace.api.naming.**", - // Enum - "datadog.trace.api.profiling.ProfilingSnapshot.Kind", - "datadog.trace.api.sampling.AdaptiveSampler", - "datadog.trace.api.sampling.ConstantSampler", - "datadog.trace.api.sampling.SamplingRule.Provenance", - "datadog.trace.api.sampling.SamplingRule.TraceSamplingRule.TargetSpan", - "datadog.trace.api.EndpointCheckpointerHolder", - "datadog.trace.api.iast.IastAdvice.Kind", - "datadog.trace.api.UserEventTrackingMode", - // These are almost fully abstract classes so nothing to test - "datadog.trace.api.profiling.RecordingData", - "datadog.trace.api.appsec.AppSecEventTracker", - // POJOs - "datadog.trace.api.appsec.HttpClientPayload", - "datadog.trace.api.appsec.HttpClientRequest", - "datadog.trace.api.appsec.HttpClientResponse", - // A plain enum - "datadog.trace.api.profiling.RecordingType", - // Data Streams Monitoring - "datadog.trace.api.datastreams.Backlog", - "datadog.trace.api.datastreams.InboxItem", - "datadog.trace.api.datastreams.NoopDataStreamsMonitoring", - "datadog.trace.api.datastreams.NoopPathwayContext", - "datadog.trace.api.datastreams.SchemaRegistryUsage", - "datadog.trace.api.datastreams.StatsPoint", - // Debugger - "datadog.trace.api.debugger.DebuggerConfigUpdate", - // Bootstrap API - "datadog.trace.bootstrap.ActiveSubsystems", - "datadog.trace.bootstrap.ContextStore.Factory", - "datadog.trace.bootstrap.instrumentation.api.java.lang.ProcessImplInstrumentationHelpers", - "datadog.trace.bootstrap.instrumentation.api.Tags", - "datadog.trace.bootstrap.instrumentation.api.CommonTagValues", - // Caused by empty 'default' interface method - "datadog.trace.bootstrap.instrumentation.api.AgentPropagation", - "datadog.trace.bootstrap.instrumentation.api.AgentPropagation.ContextVisitor", - "datadog.trace.bootstrap.instrumentation.api.AgentScope", - "datadog.trace.bootstrap.instrumentation.api.AgentScope.Continuation", - "datadog.trace.bootstrap.instrumentation.api.AgentSpan", - "datadog.trace.bootstrap.instrumentation.api.AgentSpanContext", - "datadog.trace.bootstrap.instrumentation.api.AgentTracer", - "datadog.trace.bootstrap.instrumentation.api.AgentTracer.NoopAgentHistogram", - "datadog.trace.bootstrap.instrumentation.api.AgentTracer.NoopAgentTraceCollector", - "datadog.trace.bootstrap.instrumentation.api.AgentTracer.NoopTraceConfig", - "datadog.trace.bootstrap.instrumentation.api.AgentTracer.NoopTracerAPI", - "datadog.trace.bootstrap.instrumentation.api.AgentTracer.TracerAPI", - "datadog.trace.bootstrap.instrumentation.api.BlackHoleSpan", - "datadog.trace.bootstrap.instrumentation.api.BlackHoleSpan.Context", - "datadog.trace.bootstrap.instrumentation.api.ErrorPriorities", - "datadog.trace.bootstrap.instrumentation.api.ExtractedSpan", - "datadog.trace.bootstrap.instrumentation.api.ImmutableSpan", - "datadog.trace.bootstrap.instrumentation.api.InstrumentationTags", - "datadog.trace.bootstrap.instrumentation.api.InternalContextKeys", - "datadog.trace.bootstrap.instrumentation.api.InternalSpanTypes", - "datadog.trace.bootstrap.instrumentation.api.NoopAgentScope", - "datadog.trace.bootstrap.instrumentation.api.NoopAgentSpan", - "datadog.trace.bootstrap.instrumentation.api.NoopContinuation", - "datadog.trace.bootstrap.instrumentation.api.NoopScope", - "datadog.trace.bootstrap.instrumentation.api.NoopSpan", - "datadog.trace.bootstrap.instrumentation.api.NoopSpanContext", - "datadog.trace.bootstrap.instrumentation.api.NotSampledSpanContext", - "datadog.trace.bootstrap.instrumentation.api.ResourceNamePriorities", - "datadog.trace.bootstrap.instrumentation.api.Schema", - "datadog.trace.bootstrap.instrumentation.api.ScopeSource", - "datadog.trace.bootstrap.instrumentation.api.ScopedContext", - "datadog.trace.bootstrap.instrumentation.api.ScopedContextKey", - "datadog.trace.bootstrap.instrumentation.api.SpanWrapper", - "datadog.trace.bootstrap.instrumentation.api.TagContext", - "datadog.trace.bootstrap.instrumentation.api.TagContext.HttpHeaders", - "datadog.trace.api.civisibility.config.TestIdentifier", - "datadog.trace.api.civisibility.config.TestFQN", - "datadog.trace.api.civisibility.config.TestMetadata", - "datadog.trace.api.civisibility.config.TestSourceData", - "datadog.trace.api.civisibility.config.LibraryCapability", - "datadog.trace.api.civisibility.coverage.CoveragePerTestBridge", - "datadog.trace.api.civisibility.coverage.CoveragePerTestBridge.TotalProbeCount", - "datadog.trace.api.civisibility.coverage.CoveragePercentageBridge", - "datadog.trace.api.civisibility.coverage.NoOpCoverageStore", - "datadog.trace.api.civisibility.coverage.NoOpCoverageStore.Factory", - "datadog.trace.api.civisibility.coverage.NoOpProbes", - "datadog.trace.api.civisibility.coverage.TestReport", - "datadog.trace.api.civisibility.coverage.TestReportFileEntry", - "datadog.trace.api.civisibility.domain.BuildModuleLayout", - "datadog.trace.api.civisibility.domain.BuildModuleSettings", - "datadog.trace.api.civisibility.domain.BuildSessionSettings", - "datadog.trace.api.civisibility.domain.JavaAgent", - "datadog.trace.api.civisibility.domain.Language", - "datadog.trace.api.civisibility.domain.SourceSet", - "datadog.trace.api.civisibility.domain.SourceSet.Type", - "datadog.trace.api.civisibility.events.BuildEventsHandler.ModuleInfo", - "datadog.trace.api.civisibility.events.TestDescriptor", - "datadog.trace.api.civisibility.events.TestSuiteDescriptor", - "datadog.trace.api.civisibility.execution.TestStatus", - "datadog.trace.api.civisibility.telemetry.CiVisibilityCountMetric", - "datadog.trace.api.civisibility.telemetry.CiVisibilityCountMetric.IndexHolder", - "datadog.trace.api.civisibility.telemetry.CiVisibilityDistributionMetric", - "datadog.trace.api.civisibility.telemetry.CiVisibilityMetricData", - "datadog.trace.api.civisibility.telemetry.NoOpMetricCollector", - "datadog.trace.api.civisibility.telemetry.tag.*", - "datadog.trace.api.civisibility.config.Configurations", - "datadog.trace.api.civisibility.CiVisibilityWellKnownTags", - "datadog.trace.api.civisibility.InstrumentationBridge", - "datadog.trace.api.civisibility.InstrumentationTestBridge", - // POJO - "datadog.trace.api.git.GitInfo", - "datadog.trace.api.git.GitInfoProvider", - "datadog.trace.api.git.GitInfoProvider.ShaDiscrepancy", - // POJO - "datadog.trace.api.git.PersonInfo", - // POJO - "datadog.trace.api.git.CommitInfo", - // POJO - "datadog.trace.api.git.GitUtils", - // tested indirectly by dependent modules - "datadog.trace.api.git.RawParseUtils", - // tested indirectly by dependent modules - "datadog.trace.api.Config", - "datadog.trace.api.Config.HostNameHolder", - "datadog.trace.api.Config.RuntimeIdHolder", - "datadog.trace.api.DynamicConfig", - "datadog.trace.api.DynamicConfig.Builder", - "datadog.trace.api.DynamicConfig.Snapshot", - "datadog.trace.api.InstrumenterConfig", - "datadog.trace.api.ResolverCacheConfig.*", - "datadog.trace.api.logging.intake.LogsIntake", - "datadog.trace.logging.LoggingSettingsDescription", - "datadog.trace.util.AgentProxySelector", - "datadog.trace.util.AgentTaskScheduler", - "datadog.trace.util.AgentTaskScheduler.PeriodicTask", - "datadog.trace.util.AgentTaskScheduler.ShutdownHook", - "datadog.trace.util.AgentThreadFactory", - "datadog.trace.util.AgentThreadFactory.1", - "datadog.trace.util.CollectionUtils", - "datadog.trace.util.ComparableVersion", - "datadog.trace.util.ComparableVersion.BigIntegerItem", - "datadog.trace.util.ComparableVersion.IntItem", - "datadog.trace.util.ComparableVersion.ListItem", - "datadog.trace.util.ComparableVersion.LongItem", - "datadog.trace.util.ComparableVersion.StringItem", - "datadog.trace.util.ConcurrentEnumMap", - "datadog.trace.util.JPSUtils", - "datadog.trace.util.MethodHandles", - "datadog.trace.util.PidHelper", - "datadog.trace.util.PidHelper.Fallback", - "datadog.trace.util.ProcessUtils", - "datadog.trace.util.PropagationUtils", - "datadog.trace.util.UnsafeUtils", - // can't reliably force same identity hash for different instance to cover branch - "datadog.trace.api.cache.FixedSizeCache.IdentityHash", - "datadog.trace.api.cache.FixedSizeWeakKeyCache", - // Interface with default method - "datadog.trace.api.iast.Taintable", - "datadog.trace.api.Stateful", - "datadog.trace.api.Stateful.1", - // a stub - "datadog.trace.bootstrap.instrumentation.api.ProfilingContextIntegration", - "datadog.trace.bootstrap.instrumentation.api.ProfilingContextIntegration.NoOp", - // debug - "datadog.trace.api.iast.Taintable.DebugLogger", - // POJO - "datadog.trace.api.iast.util.Cookie", - "datadog.trace.api.iast.util.Cookie.Builder", - "datadog.trace.api.telemetry.Endpoint", - "datadog.trace.api.telemetry.Endpoint.Method", - "datadog.trace.api.telemetry.LogCollector.RawLogMessage", - "datadog.trace.api.telemetry.MetricCollector.DistributionSeriesPoint", - "datadog.trace.api.telemetry.MetricCollector", - // Enum - "datadog.trace.api.telemetry.WafTruncatedType", - // stubs - "datadog.trace.api.profiling.Timing.NoOp", - "datadog.trace.api.profiling.Timer.NoOp", - "datadog.trace.api.profiling.Timer.TimerType", - // tested in agent-logging - "datadog.trace.logging.LogLevel", - "datadog.trace.logging.GlobalLogLevelSwitcher", - // POJO - "datadog.trace.util.stacktrace.StackTraceBatch", - "datadog.trace.util.stacktrace.StackTraceEvent", - "datadog.trace.util.stacktrace.StackTraceFrame", - "datadog.trace.api.iast.VulnerabilityMarks", - "datadog.trace.api.iast.securitycontrol.SecurityControlHelper", - "datadog.trace.api.iast.securitycontrol.SecurityControl", - // Trivial holder and no-op - "datadog.trace.bootstrap.instrumentation.api.SpanPostProcessor.Holder", - "datadog.trace.bootstrap.instrumentation.api.SpanPostProcessor.NoOpSpanPostProcessor", - "datadog.trace.util.TempLocationManager", - "datadog.trace.util.TempLocationManager.*", - ) +extra["excludedClassesCoverage"] = listOf( + "datadog.trace.api.ClassloaderConfigurationOverrides", + "datadog.trace.api.ClassloaderConfigurationOverrides.Lazy", + // Interface + "datadog.trace.api.EndpointTracker", + "datadog.trace.api.Platform", + // Noop implementation + "datadog.trace.api.TraceSegment.NoOp", + "datadog.trace.api.WithGlobalTracer.1", + "datadog.trace.api.gateway.Events.ET", + // Noop implementation + "datadog.trace.api.gateway.RequestContext.Noop", + // Enum + "datadog.trace.api.intake.TrackType", + "datadog.trace.api.naming.**", + // Enum + "datadog.trace.api.profiling.ProfilingSnapshot.Kind", + "datadog.trace.api.sampling.AdaptiveSampler", + "datadog.trace.api.sampling.ConstantSampler", + "datadog.trace.api.sampling.SamplingRule.Provenance", + "datadog.trace.api.sampling.SamplingRule.TraceSamplingRule.TargetSpan", + "datadog.trace.api.EndpointCheckpointerHolder", + "datadog.trace.api.iast.IastAdvice.Kind", + "datadog.trace.api.UserEventTrackingMode", + // These are almost fully abstract classes so nothing to test + "datadog.trace.api.profiling.RecordingData", + "datadog.trace.api.appsec.AppSecEventTracker", + // POJOs + "datadog.trace.api.appsec.HttpClientPayload", + "datadog.trace.api.appsec.HttpClientRequest", + "datadog.trace.api.appsec.HttpClientResponse", + // A plain enum + "datadog.trace.api.profiling.RecordingType", + // Data Streams Monitoring + "datadog.trace.api.datastreams.Backlog", + "datadog.trace.api.datastreams.InboxItem", + "datadog.trace.api.datastreams.NoopDataStreamsMonitoring", + "datadog.trace.api.datastreams.NoopPathwayContext", + "datadog.trace.api.datastreams.SchemaRegistryUsage", + "datadog.trace.api.datastreams.StatsPoint", + // Debugger + "datadog.trace.api.debugger.DebuggerConfigUpdate", + // Bootstrap API + "datadog.trace.bootstrap.ActiveSubsystems", + "datadog.trace.bootstrap.ContextStore.Factory", + "datadog.trace.bootstrap.instrumentation.api.java.lang.ProcessImplInstrumentationHelpers", + "datadog.trace.bootstrap.instrumentation.api.Tags", + "datadog.trace.bootstrap.instrumentation.api.CommonTagValues", + // Caused by empty 'default' interface method + "datadog.trace.bootstrap.instrumentation.api.AgentPropagation", + "datadog.trace.bootstrap.instrumentation.api.AgentPropagation.ContextVisitor", + "datadog.trace.bootstrap.instrumentation.api.AgentScope", + "datadog.trace.bootstrap.instrumentation.api.AgentScope.Continuation", + "datadog.trace.bootstrap.instrumentation.api.AgentSpan", + "datadog.trace.bootstrap.instrumentation.api.AgentSpanContext", + "datadog.trace.bootstrap.instrumentation.api.AgentTracer", + "datadog.trace.bootstrap.instrumentation.api.AgentTracer.NoopAgentHistogram", + "datadog.trace.bootstrap.instrumentation.api.AgentTracer.NoopAgentTraceCollector", + "datadog.trace.bootstrap.instrumentation.api.AgentTracer.NoopTraceConfig", + "datadog.trace.bootstrap.instrumentation.api.AgentTracer.NoopTracerAPI", + "datadog.trace.bootstrap.instrumentation.api.AgentTracer.TracerAPI", + "datadog.trace.bootstrap.instrumentation.api.BlackHoleSpan", + "datadog.trace.bootstrap.instrumentation.api.BlackHoleSpan.Context", + "datadog.trace.bootstrap.instrumentation.api.ErrorPriorities", + "datadog.trace.bootstrap.instrumentation.api.ExtractedSpan", + "datadog.trace.bootstrap.instrumentation.api.ImmutableSpan", + "datadog.trace.bootstrap.instrumentation.api.InstrumentationTags", + "datadog.trace.bootstrap.instrumentation.api.InternalContextKeys", + "datadog.trace.bootstrap.instrumentation.api.InternalSpanTypes", + "datadog.trace.bootstrap.instrumentation.api.NoopAgentScope", + "datadog.trace.bootstrap.instrumentation.api.NoopAgentSpan", + "datadog.trace.bootstrap.instrumentation.api.NoopContinuation", + "datadog.trace.bootstrap.instrumentation.api.NoopScope", + "datadog.trace.bootstrap.instrumentation.api.NoopSpan", + "datadog.trace.bootstrap.instrumentation.api.NoopSpanContext", + "datadog.trace.bootstrap.instrumentation.api.NotSampledSpanContext", + "datadog.trace.bootstrap.instrumentation.api.ResourceNamePriorities", + "datadog.trace.bootstrap.instrumentation.api.Schema", + "datadog.trace.bootstrap.instrumentation.api.ScopeSource", + "datadog.trace.bootstrap.instrumentation.api.ScopedContext", + "datadog.trace.bootstrap.instrumentation.api.ScopedContextKey", + "datadog.trace.bootstrap.instrumentation.api.SpanWrapper", + "datadog.trace.bootstrap.instrumentation.api.TagContext", + "datadog.trace.bootstrap.instrumentation.api.TagContext.HttpHeaders", + "datadog.trace.api.civisibility.config.TestIdentifier", + "datadog.trace.api.civisibility.config.TestFQN", + "datadog.trace.api.civisibility.config.TestMetadata", + "datadog.trace.api.civisibility.config.TestSourceData", + "datadog.trace.api.civisibility.config.LibraryCapability", + "datadog.trace.api.civisibility.coverage.CoveragePerTestBridge", + "datadog.trace.api.civisibility.coverage.CoveragePerTestBridge.TotalProbeCount", + "datadog.trace.api.civisibility.coverage.CoveragePercentageBridge", + "datadog.trace.api.civisibility.coverage.NoOpCoverageStore", + "datadog.trace.api.civisibility.coverage.NoOpCoverageStore.Factory", + "datadog.trace.api.civisibility.coverage.NoOpProbes", + "datadog.trace.api.civisibility.coverage.TestReport", + "datadog.trace.api.civisibility.coverage.TestReportFileEntry", + "datadog.trace.api.civisibility.domain.BuildModuleLayout", + "datadog.trace.api.civisibility.domain.BuildModuleSettings", + "datadog.trace.api.civisibility.domain.BuildSessionSettings", + "datadog.trace.api.civisibility.domain.JavaAgent", + "datadog.trace.api.civisibility.domain.Language", + "datadog.trace.api.civisibility.domain.SourceSet", + "datadog.trace.api.civisibility.domain.SourceSet.Type", + "datadog.trace.api.civisibility.events.BuildEventsHandler.ModuleInfo", + "datadog.trace.api.civisibility.events.TestDescriptor", + "datadog.trace.api.civisibility.events.TestSuiteDescriptor", + "datadog.trace.api.civisibility.execution.TestStatus", + "datadog.trace.api.civisibility.telemetry.CiVisibilityCountMetric", + "datadog.trace.api.civisibility.telemetry.CiVisibilityCountMetric.IndexHolder", + "datadog.trace.api.civisibility.telemetry.CiVisibilityDistributionMetric", + "datadog.trace.api.civisibility.telemetry.CiVisibilityMetricData", + "datadog.trace.api.civisibility.telemetry.NoOpMetricCollector", + "datadog.trace.api.civisibility.telemetry.tag.*", + "datadog.trace.api.civisibility.config.Configurations", + "datadog.trace.api.civisibility.CiVisibilityWellKnownTags", + "datadog.trace.api.civisibility.InstrumentationBridge", + "datadog.trace.api.civisibility.InstrumentationTestBridge", + // POJO + "datadog.trace.api.git.GitInfo", + "datadog.trace.api.git.GitInfoProvider", + "datadog.trace.api.git.GitInfoProvider.ShaDiscrepancy", + // POJO + "datadog.trace.api.git.PersonInfo", + // POJO + "datadog.trace.api.git.CommitInfo", + // POJO + "datadog.trace.api.git.GitUtils", + // tested indirectly by dependent modules + "datadog.trace.api.git.RawParseUtils", + // tested indirectly by dependent modules + "datadog.trace.api.Config", + "datadog.trace.api.Config.HostNameHolder", + "datadog.trace.api.Config.RuntimeIdHolder", + "datadog.trace.api.DynamicConfig", + "datadog.trace.api.DynamicConfig.Builder", + "datadog.trace.api.DynamicConfig.Snapshot", + "datadog.trace.api.InstrumenterConfig", + "datadog.trace.api.ResolverCacheConfig.*", + "datadog.trace.api.logging.intake.LogsIntake", + "datadog.trace.logging.LoggingSettingsDescription", + "datadog.trace.util.AgentProxySelector", + "datadog.trace.util.AgentTaskScheduler", + "datadog.trace.util.AgentTaskScheduler.PeriodicTask", + "datadog.trace.util.AgentTaskScheduler.ShutdownHook", + "datadog.trace.util.AgentThreadFactory", + "datadog.trace.util.AgentThreadFactory.1", + "datadog.trace.util.CollectionUtils", + "datadog.trace.util.ComparableVersion", + "datadog.trace.util.ComparableVersion.BigIntegerItem", + "datadog.trace.util.ComparableVersion.IntItem", + "datadog.trace.util.ComparableVersion.ListItem", + "datadog.trace.util.ComparableVersion.LongItem", + "datadog.trace.util.ComparableVersion.StringItem", + "datadog.trace.util.ConcurrentEnumMap", + "datadog.trace.util.JPSUtils", + "datadog.trace.util.MethodHandles", + "datadog.trace.util.PidHelper", + "datadog.trace.util.PidHelper.Fallback", + "datadog.trace.util.ProcessUtils", + "datadog.trace.util.PropagationUtils", + "datadog.trace.util.UnsafeUtils", + // can't reliably force same identity hash for different instance to cover branch + "datadog.trace.api.cache.FixedSizeCache.IdentityHash", + "datadog.trace.api.cache.FixedSizeWeakKeyCache", + // Interface with default method + "datadog.trace.api.iast.Taintable", + "datadog.trace.api.Stateful", + "datadog.trace.api.Stateful.1", + // a stub + "datadog.trace.bootstrap.instrumentation.api.ProfilingContextIntegration", + "datadog.trace.bootstrap.instrumentation.api.ProfilingContextIntegration.NoOp", + // debug + "datadog.trace.api.iast.Taintable.DebugLogger", + // POJO + "datadog.trace.api.iast.util.Cookie", + "datadog.trace.api.iast.util.Cookie.Builder", + "datadog.trace.api.telemetry.Endpoint", + "datadog.trace.api.telemetry.Endpoint.Method", + "datadog.trace.api.telemetry.LogCollector.RawLogMessage", + "datadog.trace.api.telemetry.MetricCollector.DistributionSeriesPoint", + "datadog.trace.api.telemetry.MetricCollector", + // Enum + "datadog.trace.api.telemetry.WafTruncatedType", + // stubs + "datadog.trace.api.profiling.Timing.NoOp", + "datadog.trace.api.profiling.Timer.NoOp", + "datadog.trace.api.profiling.Timer.TimerType", + // tested in agent-logging + "datadog.trace.logging.LogLevel", + "datadog.trace.logging.GlobalLogLevelSwitcher", + // POJO + "datadog.trace.util.stacktrace.StackTraceBatch", + "datadog.trace.util.stacktrace.StackTraceEvent", + "datadog.trace.util.stacktrace.StackTraceFrame", + "datadog.trace.api.iast.VulnerabilityMarks", + "datadog.trace.api.iast.securitycontrol.SecurityControlHelper", + "datadog.trace.api.iast.securitycontrol.SecurityControl", + // Trivial holder and no-op + "datadog.trace.bootstrap.instrumentation.api.SpanPostProcessor.Holder", + "datadog.trace.bootstrap.instrumentation.api.SpanPostProcessor.NoOpSpanPostProcessor", + "datadog.trace.util.TempLocationManager", + "datadog.trace.util.TempLocationManager.*", ) -val excludedClassesBranchCoverage by extra( - listOf( - "datadog.trace.api.ProductActivationConfig", - "datadog.trace.api.ClassloaderConfigurationOverrides.Lazy", - "datadog.trace.util.stacktrace.HotSpotStackWalker", - "datadog.trace.util.stacktrace.StackWalkerFactory", - "datadog.trace.util.TempLocationManager", - "datadog.trace.util.TempLocationManager.*", - // Branches depend on RUM injector state that cannot be reliably controlled in unit tests - "datadog.trace.api.rum.RumInjectorMetrics", - ) +extra["excludedClassesBranchCoverage"] = listOf( + "datadog.trace.api.ProductActivationConfig", + "datadog.trace.api.ClassloaderConfigurationOverrides.Lazy", + "datadog.trace.util.stacktrace.HotSpotStackWalker", + "datadog.trace.util.stacktrace.StackWalkerFactory", + "datadog.trace.util.TempLocationManager", + "datadog.trace.util.TempLocationManager.*", + // Branches depend on RUM injector state that cannot be reliably controlled in unit tests + "datadog.trace.api.rum.RumInjectorMetrics", ) -val excludedClassesInstructionCoverage by extra( - listOf( - "datadog.trace.util.stacktrace.StackWalkerFactory" - ) -) +extra["excludedClassesInstructionCoverage"] = listOf("datadog.trace.util.stacktrace.StackWalkerFactory") dependencies { // references TraceScope and Continuation from public api diff --git a/internal-api/internal-api-9/build.gradle.kts b/internal-api/internal-api-9/build.gradle.kts index b4abf186096..07683371538 100644 --- a/internal-api/internal-api-9/build.gradle.kts +++ b/internal-api/internal-api-9/build.gradle.kts @@ -34,8 +34,8 @@ listOf(JavaCompile::class.java, GroovyCompile::class.java).forEach { compileTask } } -val minimumBranchCoverage by extra(0.8) -val minimumInstructionCoverage by extra(0.8) +extra["minimumBranchCoverage"] = 0.8 +extra["minimumInstructionCoverage"] = 0.8 dependencies { api(project(":internal-api")) diff --git a/products/feature-flagging/feature-flagging-bootstrap/build.gradle.kts b/products/feature-flagging/feature-flagging-bootstrap/build.gradle.kts index 7d3266eb01f..d2d68b59ddf 100644 --- a/products/feature-flagging/feature-flagging-bootstrap/build.gradle.kts +++ b/products/feature-flagging/feature-flagging-bootstrap/build.gradle.kts @@ -7,28 +7,26 @@ apply(from = "$rootDir/gradle/java.gradle") description = "Feature flagging remote common module (bootstrap classloader)" -val excludedClassesCoverage by extra( - listOf( - // Feature lags POJOs - "datadog.trace.api.featureflag.exposure.Allocation", - "datadog.trace.api.featureflag.exposure.ExposureEvent", - "datadog.trace.api.featureflag.exposure.ExposuresRequest", - "datadog.trace.api.featureflag.exposure.Flag", - "datadog.trace.api.featureflag.exposure.Subject", - "datadog.trace.api.featureflag.exposure.Variant", - "datadog.trace.api.featureflag.ufc.v1.Allocation", - "datadog.trace.api.featureflag.ufc.v1.ConditionConfiguration", - "datadog.trace.api.featureflag.ufc.v1.ConditionOperator", - "datadog.trace.api.featureflag.ufc.v1.Environment", - "datadog.trace.api.featureflag.ufc.v1.Flag", - "datadog.trace.api.featureflag.ufc.v1.Rule", - "datadog.trace.api.featureflag.ufc.v1.ServerConfiguration", - "datadog.trace.api.featureflag.ufc.v1.Shard", - "datadog.trace.api.featureflag.ufc.v1.ShardRange", - "datadog.trace.api.featureflag.ufc.v1.Split", - "datadog.trace.api.featureflag.ufc.v1.ValueType", - "datadog.trace.api.featureflag.ufc.v1.Variant", - ) +extra["excludedClassesCoverage"] = listOf( + // Feature lags POJOs + "datadog.trace.api.featureflag.exposure.Allocation", + "datadog.trace.api.featureflag.exposure.ExposureEvent", + "datadog.trace.api.featureflag.exposure.ExposuresRequest", + "datadog.trace.api.featureflag.exposure.Flag", + "datadog.trace.api.featureflag.exposure.Subject", + "datadog.trace.api.featureflag.exposure.Variant", + "datadog.trace.api.featureflag.ufc.v1.Allocation", + "datadog.trace.api.featureflag.ufc.v1.ConditionConfiguration", + "datadog.trace.api.featureflag.ufc.v1.ConditionOperator", + "datadog.trace.api.featureflag.ufc.v1.Environment", + "datadog.trace.api.featureflag.ufc.v1.Flag", + "datadog.trace.api.featureflag.ufc.v1.Rule", + "datadog.trace.api.featureflag.ufc.v1.ServerConfiguration", + "datadog.trace.api.featureflag.ufc.v1.Shard", + "datadog.trace.api.featureflag.ufc.v1.ShardRange", + "datadog.trace.api.featureflag.ufc.v1.Split", + "datadog.trace.api.featureflag.ufc.v1.ValueType", + "datadog.trace.api.featureflag.ufc.v1.Variant", ) dependencies { diff --git a/products/feature-flagging/feature-flagging-lib/build.gradle.kts b/products/feature-flagging/feature-flagging-lib/build.gradle.kts index 2888ba1b25c..3291e239d40 100644 --- a/products/feature-flagging/feature-flagging-lib/build.gradle.kts +++ b/products/feature-flagging/feature-flagging-lib/build.gradle.kts @@ -7,12 +7,10 @@ apply(from = "$rootDir/gradle/java.gradle") description = "Feature flagging remote config and exposure handling" -val excludedClassesCoverage by extra( - listOf( - // POJOs - "com.datadog.featureflag.ExposureCache.Key", - "com.datadog.featureflag.ExposureCache.Value" - ) +extra["excludedClassesCoverage"] = listOf( + // POJOs + "com.datadog.featureflag.ExposureCache.Key", + "com.datadog.featureflag.ExposureCache.Value" ) dependencies { diff --git a/products/metrics/metrics-lib/build.gradle.kts b/products/metrics/metrics-lib/build.gradle.kts index 18deab80914..ae38432669a 100644 --- a/products/metrics/metrics-lib/build.gradle.kts +++ b/products/metrics/metrics-lib/build.gradle.kts @@ -33,14 +33,12 @@ tasks.named("shadowJar") { } } -val minimumBranchCoverage by extra(0.5) -val minimumInstructionCoverage by extra(0.8) -val excludedClassesCoverage by extra( - listOf( - "datadog.communication.monitor.DDAgentStatsDConnection", - "datadog.communication.monitor.DDAgentStatsDConnection.*", - "datadog.communication.monitor.LoggingStatsDClient", - ) +extra["minimumBranchCoverage"] = 0.5 +extra["minimumInstructionCoverage"] = 0.8 +extra["excludedClassesCoverage"] = listOf( + "datadog.communication.monitor.DDAgentStatsDConnection", + "datadog.communication.monitor.DDAgentStatsDConnection.*", + "datadog.communication.monitor.LoggingStatsDClient", ) // val excludedClassesBranchCoverage by extra( // listOf( diff --git a/remote-config/remote-config-api/build.gradle.kts b/remote-config/remote-config-api/build.gradle.kts index 212bbb3ab44..5a5a77442b3 100644 --- a/remote-config/remote-config-api/build.gradle.kts +++ b/remote-config/remote-config-api/build.gradle.kts @@ -1,7 +1,3 @@ apply(from = "$rootDir/gradle/java.gradle") -val excludedClassesBranchCoverage by extra( - listOf( - "datadog.remoteconfig.ConfigurationChangesListener.PollingHinterNoop" - ) -) +extra["excludedClassesBranchCoverage"] = listOf("datadog.remoteconfig.ConfigurationChangesListener.PollingHinterNoop") diff --git a/remote-config/remote-config-core/build.gradle.kts b/remote-config/remote-config-core/build.gradle.kts index 4d9704d1578..f55284f2085 100644 --- a/remote-config/remote-config-core/build.gradle.kts +++ b/remote-config/remote-config-core/build.gradle.kts @@ -4,30 +4,22 @@ plugins { apply(from = "$rootDir/gradle/java.gradle") -val minimumBranchCoverage by extra(0.6) -val minimumInstructionCoverage by extra(0.8) -val excludedClassesCoverage by extra( - listOf( - // not used yet - "datadog.remoteconfig.tuf.RemoteConfigRequest.ClientInfo.AgentInfo", - // only half the adapter interface used - "datadog.remoteconfig.tuf.InstantJsonAdapter", - // idem - "datadog.remoteconfig.tuf.RawJsonAdapter", - "datadog.remoteconfig.ExceptionHelper", - ) +extra["minimumBranchCoverage"] = 0.6 +extra["minimumInstructionCoverage"] = 0.8 +extra["excludedClassesCoverage"] = listOf( + // not used yet + "datadog.remoteconfig.tuf.RemoteConfigRequest.ClientInfo.AgentInfo", + // only half the adapter interface used + "datadog.remoteconfig.tuf.InstantJsonAdapter", + // idem + "datadog.remoteconfig.tuf.RawJsonAdapter", + "datadog.remoteconfig.ExceptionHelper", ) -val excludedClassesBranchCoverage by extra( - listOf( - "datadog.remoteconfig.tuf.FeaturesConfig", - "datadog.remoteconfig.PollerRequestFactory", - ) -) -val excludedClassesInstructionCoverage by extra( - listOf( - "datadog.remoteconfig.ConfigurationChangesListener.PollingHinterNoop", - ) +extra["excludedClassesBranchCoverage"] = listOf( + "datadog.remoteconfig.tuf.FeaturesConfig", + "datadog.remoteconfig.PollerRequestFactory", ) +extra["excludedClassesInstructionCoverage"] = listOf("datadog.remoteconfig.ConfigurationChangesListener.PollingHinterNoop",) dependencies { api(project(":remote-config:remote-config-api")) diff --git a/telemetry/build.gradle.kts b/telemetry/build.gradle.kts index 17578a55877..9484dedc0a1 100644 --- a/telemetry/build.gradle.kts +++ b/telemetry/build.gradle.kts @@ -5,30 +5,26 @@ plugins { apply(from = "$rootDir/gradle/java.gradle") -val minimumBranchCoverage by extra(0.6) -val minimumInstructionCoverage by extra(0.8) -val excludedClassesCoverage by extra( - listOf( - "datadog.telemetry.TelemetryRunnable.ThreadSleeperImpl", - "datadog.telemetry.HostInfo", - "datadog.telemetry.HostInfo.Os", - "datadog.telemetry.dependency.LocationsCollectingTransformer", - "datadog.telemetry.dependency.JbossVirtualFileHelper", - "datadog.telemetry.RequestBuilder.NumberJsonAdapter", - "datadog.telemetry.RequestBuilderSupplier", - "datadog.telemetry.TelemetrySystem", - "datadog.telemetry.api.*", - "datadog.telemetry.metric.CiVisibilityMetricPeriodicAction" - ) +extra["minimumBranchCoverage"] = 0.6 +extra["minimumInstructionCoverage"] = 0.8 +extra["excludedClassesCoverage"] = listOf( + "datadog.telemetry.TelemetryRunnable.ThreadSleeperImpl", + "datadog.telemetry.HostInfo", + "datadog.telemetry.HostInfo.Os", + "datadog.telemetry.dependency.LocationsCollectingTransformer", + "datadog.telemetry.dependency.JbossVirtualFileHelper", + "datadog.telemetry.RequestBuilder.NumberJsonAdapter", + "datadog.telemetry.RequestBuilderSupplier", + "datadog.telemetry.TelemetrySystem", + "datadog.telemetry.api.*", + "datadog.telemetry.metric.CiVisibilityMetricPeriodicAction" ) -val excludedClassesBranchCoverage by extra( - listOf( - "datadog.telemetry.PolymorphicAdapterFactory.1", - "datadog.telemetry.HostInfo", - "datadog.telemetry.HostInfo.Os" - ) +extra["excludedClassesBranchCoverage"] = listOf( + "datadog.telemetry.PolymorphicAdapterFactory.1", + "datadog.telemetry.HostInfo", + "datadog.telemetry.HostInfo.Os" ) -val excludedClassesInstructionCoverage by extra(emptyList()) +extra["excludedClassesInstructionCoverage"] = emptyList() dependencies { implementation(libs.slf4j) diff --git a/utils/config-utils/build.gradle.kts b/utils/config-utils/build.gradle.kts index b1bb146231e..2891dc3845b 100644 --- a/utils/config-utils/build.gradle.kts +++ b/utils/config-utils/build.gradle.kts @@ -6,52 +6,46 @@ plugins { apply(from = "$rootDir/gradle/java.gradle") -val minimumBranchCoverage by extra(0.7) -val minimumInstructionCoverage by extra(0.7) +extra["minimumBranchCoverage"] = 0.7 +extra["minimumInstructionCoverage"] = 0.7 -val excludedClassesCoverage by extra( - listOf( - "datadog.trace.api.ConfigCollector", - "datadog.trace.api.env.CapturedEnvironment", - "datadog.trace.api.env.CapturedEnvironment.ProcessInfo", - // tested in internal-api - "datadog.trace.api.telemetry.OtelEnvMetricCollectorProvider", - "datadog.trace.api.telemetry.ConfigInversionMetricCollectorProvider", - "datadog.trace.bootstrap.config.provider.civisibility.CiEnvironmentVariables", - "datadog.trace.bootstrap.config.provider.CapturedEnvironmentConfigSource", - "datadog.trace.bootstrap.config.provider.ConfigConverter.ValueOfLookup", - // tested in internal-api - "datadog.trace.bootstrap.config.provider.ConfigProvider", - "datadog.trace.bootstrap.config.provider.ConfigProvider.ConfigMergeResolver", - "datadog.trace.bootstrap.config.provider.ConfigProvider.ConfigValueResolver", - "datadog.trace.bootstrap.config.provider.ConfigProvider.Singleton", - "datadog.trace.bootstrap.config.provider.ConfigProvider.Source", - "datadog.trace.bootstrap.config.provider.EnvironmentConfigSource", - "datadog.trace.bootstrap.config.provider.MapConfigSource", - // tested in internal-api - "datadog.trace.bootstrap.config.provider.OtelEnvironmentConfigSource", - "datadog.trace.bootstrap.config.provider.stableconfig.Selector", - // tested in internal-api - "datadog.trace.bootstrap.config.provider.StableConfigParser", - "datadog.trace.bootstrap.config.provider.SystemPropertiesConfigSource" - ) +extra["excludedClassesCoverage"] = listOf( + "datadog.trace.api.ConfigCollector", + "datadog.trace.api.env.CapturedEnvironment", + "datadog.trace.api.env.CapturedEnvironment.ProcessInfo", + // tested in internal-api + "datadog.trace.api.telemetry.OtelEnvMetricCollectorProvider", + "datadog.trace.api.telemetry.ConfigInversionMetricCollectorProvider", + "datadog.trace.bootstrap.config.provider.civisibility.CiEnvironmentVariables", + "datadog.trace.bootstrap.config.provider.CapturedEnvironmentConfigSource", + "datadog.trace.bootstrap.config.provider.ConfigConverter.ValueOfLookup", + // tested in internal-api + "datadog.trace.bootstrap.config.provider.ConfigProvider", + "datadog.trace.bootstrap.config.provider.ConfigProvider.ConfigMergeResolver", + "datadog.trace.bootstrap.config.provider.ConfigProvider.ConfigValueResolver", + "datadog.trace.bootstrap.config.provider.ConfigProvider.Singleton", + "datadog.trace.bootstrap.config.provider.ConfigProvider.Source", + "datadog.trace.bootstrap.config.provider.EnvironmentConfigSource", + "datadog.trace.bootstrap.config.provider.MapConfigSource", + // tested in internal-api + "datadog.trace.bootstrap.config.provider.OtelEnvironmentConfigSource", + "datadog.trace.bootstrap.config.provider.stableconfig.Selector", + // tested in internal-api + "datadog.trace.bootstrap.config.provider.StableConfigParser", + "datadog.trace.bootstrap.config.provider.SystemPropertiesConfigSource" ) -val excludedClassesBranchCoverage by extra( - listOf( - "datadog.trace.bootstrap.config.provider.AgentArgsInjector", - // Enum - "datadog.trace.config.inversion.ConfigHelper.StrictnessPolicy", - "datadog.trace.util.ConfigStrings" - ) +extra["excludedClassesBranchCoverage"] = listOf( + "datadog.trace.bootstrap.config.provider.AgentArgsInjector", + // Enum + "datadog.trace.config.inversion.ConfigHelper.StrictnessPolicy", + "datadog.trace.util.ConfigStrings" ) -val excludedClassesInstructionCoverage by extra( - listOf( - "datadog.trace.api.telemetry.NoOpConfigInversionMetricCollector", - "datadog.trace.config.inversion.GeneratedSupportedConfigurations", - "datadog.trace.config.inversion.SupportedConfigurationSource" - ) +extra["excludedClassesInstructionCoverage"] = listOf( + "datadog.trace.api.telemetry.NoOpConfigInversionMetricCollector", + "datadog.trace.config.inversion.GeneratedSupportedConfigurations", + "datadog.trace.config.inversion.SupportedConfigurationSource" ) dependencies { diff --git a/utils/test-agent-utils/decoder/build.gradle.kts b/utils/test-agent-utils/decoder/build.gradle.kts index 853fc6516f5..be1d8f5df49 100644 --- a/utils/test-agent-utils/decoder/build.gradle.kts +++ b/utils/test-agent-utils/decoder/build.gradle.kts @@ -4,12 +4,10 @@ plugins { apply(from = "$rootDir/gradle/java.gradle") -val minimumInstructionCoverage by extra(0.8) -val excludedClassesCoverage by extra( - listOf( - "datadog.trace.test.agent.decoder.v04.raw.*", - "datadog.trace.test.agent.decoder.v05.raw.*", - ) +extra["minimumInstructionCoverage"] = 0.8 +extra["excludedClassesCoverage"] = listOf( + "datadog.trace.test.agent.decoder.v04.raw.*", + "datadog.trace.test.agent.decoder.v05.raw.*", ) dependencies { diff --git a/utils/time-utils/build.gradle.kts b/utils/time-utils/build.gradle.kts index e89a0f94e2c..842cf61170f 100644 --- a/utils/time-utils/build.gradle.kts +++ b/utils/time-utils/build.gradle.kts @@ -4,11 +4,9 @@ plugins { apply(from = "$rootDir/gradle/java.gradle") -val excludedClassesCoverage by extra( - listOf( - "datadog.trace.api.time.ControllableTimeSource:", - "datadog.trace.api.time.SystemTimeSource" - ) +extra["excludedClassesCoverage"] = listOf( + "datadog.trace.api.time.ControllableTimeSource:", + "datadog.trace.api.time.SystemTimeSource" ) dependencies { From b9422d052516ad6ad8b6c40b4749058a79e64465 Mon Sep 17 00:00:00 2001 From: "dd-octo-sts[bot]" <200755185+dd-octo-sts[bot]@users.noreply.github.com> Date: Mon, 22 Jun 2026 08:15:39 +0000 Subject: [PATCH 010/139] chore: Update Gradle dependencies (#11686) chore: Update Gradle dependencies Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: bruce.bujon --- communication/gradle.lockfile | 1 + components/annotations/gradle.lockfile | 1 + components/context/gradle.lockfile | 1 + components/environment/gradle.lockfile | 1 + components/http/http-api/gradle.lockfile | 1 + components/json/gradle.lockfile | 1 + components/native-loader/gradle.lockfile | 1 + dd-java-agent/agent-aiguard/gradle.lockfile | 1 + dd-java-agent/agent-bootstrap/gradle.lockfile | 1 + .../civisibility-instrumentation-test-fixtures/gradle.lockfile | 1 + .../civisibility-test-fixtures/gradle.lockfile | 1 + dd-java-agent/agent-ci-visibility/gradle.lockfile | 1 + dd-java-agent/agent-crashtracking/gradle.lockfile | 1 + dd-java-agent/agent-debugger/debugger-bootstrap/gradle.lockfile | 1 + dd-java-agent/agent-debugger/debugger-el/gradle.lockfile | 1 + dd-java-agent/agent-debugger/debugger-test-scala/gradle.lockfile | 1 + dd-java-agent/agent-debugger/gradle.lockfile | 1 + dd-java-agent/agent-iast/gradle.lockfile | 1 + dd-java-agent/agent-iast/iast-test-fixtures/gradle.lockfile | 1 + dd-java-agent/agent-installer/gradle.lockfile | 1 + dd-java-agent/agent-jmxfetch/gradle.lockfile | 1 + dd-java-agent/agent-llmobs/gradle.lockfile | 1 + dd-java-agent/agent-logging/gradle.lockfile | 1 + dd-java-agent/agent-logs-intake/gradle.lockfile | 1 + dd-java-agent/agent-otel/otel-bootstrap/gradle.lockfile | 1 + dd-java-agent/agent-otel/otel-shim/gradle.lockfile | 1 + dd-java-agent/agent-otel/otel-tooling/gradle.lockfile | 1 + dd-java-agent/agent-profiling/gradle.lockfile | 1 + .../agent-profiling/profiling-controller-ddprof/gradle.lockfile | 1 + .../agent-profiling/profiling-controller-jfr/gradle.lockfile | 1 + .../profiling-controller-jfr/implementation/gradle.lockfile | 1 + .../agent-profiling/profiling-controller-openjdk/gradle.lockfile | 1 + .../agent-profiling/profiling-controller-oracle/gradle.lockfile | 1 + .../agent-profiling/profiling-controller/gradle.lockfile | 1 + dd-java-agent/agent-profiling/profiling-ddprof/gradle.lockfile | 1 + dd-java-agent/agent-profiling/profiling-scrubber/gradle.lockfile | 1 + dd-java-agent/agent-profiling/profiling-testing/gradle.lockfile | 1 + dd-java-agent/agent-profiling/profiling-uploader/gradle.lockfile | 1 + dd-java-agent/agent-profiling/profiling-utils/gradle.lockfile | 1 + dd-java-agent/agent-tooling/gradle.lockfile | 1 + dd-java-agent/appsec/appsec-test-fixtures/gradle.lockfile | 1 + dd-java-agent/appsec/gradle.lockfile | 1 + dd-java-agent/benchmark-integration/gradle.lockfile | 1 + .../benchmark-integration/jetty-perftest/gradle.lockfile | 1 + .../benchmark-integration/play-perftest/gradle.lockfile | 1 + dd-java-agent/benchmark/gradle.lockfile | 1 + dd-java-agent/cws-tls/gradle.lockfile | 1 + dd-java-agent/ddprof-lib/gradle.lockfile | 1 + dd-java-agent/gradle.lockfile | 1 + .../instrumentation-annotation-processor/gradle.lockfile | 1 + dd-java-agent/instrumentation-testing/gradle.lockfile | 1 + dd-java-agent/load-generator/gradle.lockfile | 1 + dd-java-agent/testing/gradle.lockfile | 1 + dd-trace-api/gradle.lockfile | 1 + dd-trace-core/gradle.lockfile | 1 + dd-trace-ot/correlation-id-injection/gradle.lockfile | 1 + dd-trace-ot/gradle.lockfile | 1 + gradle.lockfile | 1 + internal-api/gradle.lockfile | 1 + internal-api/internal-api-9/gradle.lockfile | 1 + products/feature-flagging/feature-flagging-agent/gradle.lockfile | 1 + products/feature-flagging/feature-flagging-api/gradle.lockfile | 1 + .../feature-flagging/feature-flagging-bootstrap/gradle.lockfile | 1 + products/feature-flagging/feature-flagging-lib/gradle.lockfile | 1 + products/metrics/metrics-agent/gradle.lockfile | 1 + products/metrics/metrics-api/gradle.lockfile | 1 + products/metrics/metrics-lib/gradle.lockfile | 1 + remote-config/remote-config-api/gradle.lockfile | 1 + remote-config/remote-config-core/gradle.lockfile | 1 + settings-gradle.lockfile | 1 + telemetry/gradle.lockfile | 1 + utils/config-utils/gradle.lockfile | 1 + utils/container-utils/gradle.lockfile | 1 + utils/filesystem-utils/gradle.lockfile | 1 + utils/flare-utils/gradle.lockfile | 1 + utils/junit-utils/gradle.lockfile | 1 + utils/logging-utils/gradle.lockfile | 1 + utils/queue-utils/gradle.lockfile | 1 + utils/socket-utils/gradle.lockfile | 1 + utils/test-agent-utils/decoder/gradle.lockfile | 1 + utils/test-utils/gradle.lockfile | 1 + utils/time-utils/gradle.lockfile | 1 + utils/version-utils/gradle.lockfile | 1 + 83 files changed, 83 insertions(+) diff --git a/communication/gradle.lockfile b/communication/gradle.lockfile index 516e9493486..64b9b6b1a18 100644 --- a/communication/gradle.lockfile +++ b/communication/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :communication:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=runtimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=runtimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath diff --git a/components/annotations/gradle.lockfile b/components/annotations/gradle.lockfile index e7ab997a313..47e34465f79 100644 --- a/components/annotations/gradle.lockfile +++ b/components/annotations/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :components:annotations:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc diff --git a/components/context/gradle.lockfile b/components/context/gradle.lockfile index e7ab997a313..67b6dd9f3ec 100644 --- a/components/context/gradle.lockfile +++ b/components/context/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :components:context:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc diff --git a/components/environment/gradle.lockfile b/components/environment/gradle.lockfile index ec6c88c69ae..f74f8055295 100644 --- a/components/environment/gradle.lockfile +++ b/components/environment/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :components:environment:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc diff --git a/components/http/http-api/gradle.lockfile b/components/http/http-api/gradle.lockfile index 3a2aadfa4d8..0f42cb6bf96 100644 --- a/components/http/http-api/gradle.lockfile +++ b/components/http/http-api/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :components:http:http-api:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc diff --git a/components/json/gradle.lockfile b/components/json/gradle.lockfile index 7e798424d36..e3e7cb9e6fe 100644 --- a/components/json/gradle.lockfile +++ b/components/json/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :components:json:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc diff --git a/components/native-loader/gradle.lockfile b/components/native-loader/gradle.lockfile index e7ab997a313..477873ca604 100644 --- a/components/native-loader/gradle.lockfile +++ b/components/native-loader/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :components:native-loader:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc diff --git a/dd-java-agent/agent-aiguard/gradle.lockfile b/dd-java-agent/agent-aiguard/gradle.lockfile index 6a021218c85..fa826f751fc 100644 --- a/dd-java-agent/agent-aiguard/gradle.lockfile +++ b/dd-java-agent/agent-aiguard/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:agent-aiguard:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=runtimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=runtimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-bootstrap/gradle.lockfile b/dd-java-agent/agent-bootstrap/gradle.lockfile index 2cae3e6e963..328fb2adbf0 100644 --- a/dd-java-agent/agent-bootstrap/gradle.lockfile +++ b/dd-java-agent/agent-bootstrap/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:agent-bootstrap:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=jmhRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=jmhRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-ci-visibility/civisibility-instrumentation-test-fixtures/gradle.lockfile b/dd-java-agent/agent-ci-visibility/civisibility-instrumentation-test-fixtures/gradle.lockfile index 5570856483c..7cdf3994600 100644 --- a/dd-java-agent/agent-ci-visibility/civisibility-instrumentation-test-fixtures/gradle.lockfile +++ b/dd-java-agent/agent-ci-visibility/civisibility-instrumentation-test-fixtures/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:agent-ci-visibility:civisibility-instrumentation-test-fixtures:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=runtimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=runtimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/gradle.lockfile b/dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/gradle.lockfile index 84b0bc0acad..f99e0207d20 100644 --- a/dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/gradle.lockfile +++ b/dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:agent-ci-visibility:civisibility-test-fixtures:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=runtimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=runtimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-ci-visibility/gradle.lockfile b/dd-java-agent/agent-ci-visibility/gradle.lockfile index 122e971165a..9aba82e434e 100644 --- a/dd-java-agent/agent-ci-visibility/gradle.lockfile +++ b/dd-java-agent/agent-ci-visibility/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:agent-ci-visibility:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=runtimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=runtimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath diff --git a/dd-java-agent/agent-crashtracking/gradle.lockfile b/dd-java-agent/agent-crashtracking/gradle.lockfile index 6c23b9f655c..943233e7e46 100644 --- a/dd-java-agent/agent-crashtracking/gradle.lockfile +++ b/dd-java-agent/agent-crashtracking/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:agent-crashtracking:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=runtimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=runtimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/gradle.lockfile b/dd-java-agent/agent-debugger/debugger-bootstrap/gradle.lockfile index e56444a6788..2b9eda4e3bd 100644 --- a/dd-java-agent/agent-debugger/debugger-bootstrap/gradle.lockfile +++ b/dd-java-agent/agent-debugger/debugger-bootstrap/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:agent-debugger:debugger-bootstrap:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-instrument-java:0.0.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-debugger/debugger-el/gradle.lockfile b/dd-java-agent/agent-debugger/debugger-el/gradle.lockfile index 0110dfaddb9..740c9a13b5e 100644 --- a/dd-java-agent/agent-debugger/debugger-el/gradle.lockfile +++ b/dd-java-agent/agent-debugger/debugger-el/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:agent-debugger:debugger-el:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-instrument-java:0.0.4=runtimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-debugger/debugger-test-scala/gradle.lockfile b/dd-java-agent/agent-debugger/debugger-test-scala/gradle.lockfile index d4e8e3cdcef..5fbcc387009 100644 --- a/dd-java-agent/agent-debugger/debugger-test-scala/gradle.lockfile +++ b/dd-java-agent/agent-debugger/debugger-test-scala/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:agent-debugger:debugger-test-scala:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.eed3si9n:shaded-jawn-parser_2.13:1.3.2=zinc diff --git a/dd-java-agent/agent-debugger/gradle.lockfile b/dd-java-agent/agent-debugger/gradle.lockfile index 8ff7ae29375..748ed4881e7 100644 --- a/dd-java-agent/agent-debugger/gradle.lockfile +++ b/dd-java-agent/agent-debugger/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:agent-debugger:dependencies --write-locks antlr:antlr:2.7.7=testRuntimeClasspath cafe.cryptography:curve25519-elisabeth:0.1.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-iast/gradle.lockfile b/dd-java-agent/agent-iast/gradle.lockfile index 428555ed816..22e51988ba7 100644 --- a/dd-java-agent/agent-iast/gradle.lockfile +++ b/dd-java-agent/agent-iast/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:agent-iast:dependencies --write-locks aopalliance:aopalliance:1.0=annotationProcessor,errorprone,jmhAnnotationProcessor,testAnnotationProcessor cafe.cryptography:curve25519-elisabeth:0.1.0=jmh,jmhCompileProtoPath,jmhRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=jmh,jmhCompileProtoPath,jmhRuntimeClasspath diff --git a/dd-java-agent/agent-iast/iast-test-fixtures/gradle.lockfile b/dd-java-agent/agent-iast/iast-test-fixtures/gradle.lockfile index 4e89b52b8f7..5fb1e702088 100644 --- a/dd-java-agent/agent-iast/iast-test-fixtures/gradle.lockfile +++ b/dd-java-agent/agent-iast/iast-test-fixtures/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:agent-iast:iast-test-fixtures:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=runtimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=runtimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-installer/gradle.lockfile b/dd-java-agent/agent-installer/gradle.lockfile index 7b418d066fc..0651c00ce81 100644 --- a/dd-java-agent/agent-installer/gradle.lockfile +++ b/dd-java-agent/agent-installer/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:agent-installer:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-jmxfetch/gradle.lockfile b/dd-java-agent/agent-jmxfetch/gradle.lockfile index ea25e169f66..b9a9cf7830d 100644 --- a/dd-java-agent/agent-jmxfetch/gradle.lockfile +++ b/dd-java-agent/agent-jmxfetch/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:agent-jmxfetch:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-instrument-java:0.0.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-llmobs/gradle.lockfile b/dd-java-agent/agent-llmobs/gradle.lockfile index ca0fa3a8c46..32f5abf928e 100644 --- a/dd-java-agent/agent-llmobs/gradle.lockfile +++ b/dd-java-agent/agent-llmobs/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:agent-llmobs:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=runtimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=runtimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-logging/gradle.lockfile b/dd-java-agent/agent-logging/gradle.lockfile index 10134996f5d..01a72888840 100644 --- a/dd-java-agent/agent-logging/gradle.lockfile +++ b/dd-java-agent/agent-logging/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:agent-logging:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-logs-intake/gradle.lockfile b/dd-java-agent/agent-logs-intake/gradle.lockfile index 0226f7dec5e..c4b8355e292 100644 --- a/dd-java-agent/agent-logs-intake/gradle.lockfile +++ b/dd-java-agent/agent-logs-intake/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:agent-logs-intake:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=runtimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=runtimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-otel/otel-bootstrap/gradle.lockfile b/dd-java-agent/agent-otel/otel-bootstrap/gradle.lockfile index 94d0f894aea..686151f9366 100644 --- a/dd-java-agent/agent-otel/otel-bootstrap/gradle.lockfile +++ b/dd-java-agent/agent-otel/otel-bootstrap/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:agent-otel:otel-bootstrap:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-instrument-java:0.0.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-otel/otel-shim/gradle.lockfile b/dd-java-agent/agent-otel/otel-shim/gradle.lockfile index 044c7c14d0a..12dbfd3e081 100644 --- a/dd-java-agent/agent-otel/otel-shim/gradle.lockfile +++ b/dd-java-agent/agent-otel/otel-shim/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:agent-otel:otel-shim:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-otel/otel-tooling/gradle.lockfile b/dd-java-agent/agent-otel/otel-tooling/gradle.lockfile index c7ad54ae027..13735d4e8e6 100644 --- a/dd-java-agent/agent-otel/otel-tooling/gradle.lockfile +++ b/dd-java-agent/agent-otel/otel-tooling/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:agent-otel:otel-tooling:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath diff --git a/dd-java-agent/agent-profiling/gradle.lockfile b/dd-java-agent/agent-profiling/gradle.lockfile index ebe9136cf90..21e46fb4664 100644 --- a/dd-java-agent/agent-profiling/gradle.lockfile +++ b/dd-java-agent/agent-profiling/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:agent-profiling:dependencies --write-locks at.yawk.lz4:lz4-java:1.11.0=runtimeClasspath,testRuntimeClasspath cafe.cryptography:curve25519-elisabeth:0.1.0=runtimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=runtimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-profiling/profiling-controller-ddprof/gradle.lockfile b/dd-java-agent/agent-profiling/profiling-controller-ddprof/gradle.lockfile index 4196da300f4..c0acb610dbd 100644 --- a/dd-java-agent/agent-profiling/profiling-controller-ddprof/gradle.lockfile +++ b/dd-java-agent/agent-profiling/profiling-controller-ddprof/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:agent-profiling:profiling-controller-ddprof:dependencies --write-locks at.yawk.lz4:lz4-java:1.11.0=testRuntimeClasspath cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath diff --git a/dd-java-agent/agent-profiling/profiling-controller-jfr/gradle.lockfile b/dd-java-agent/agent-profiling/profiling-controller-jfr/gradle.lockfile index da9440a4e8d..c88ea99f8f7 100644 --- a/dd-java-agent/agent-profiling/profiling-controller-jfr/gradle.lockfile +++ b/dd-java-agent/agent-profiling/profiling-controller-jfr/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:agent-profiling:profiling-controller-jfr:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-profiling/profiling-controller-jfr/implementation/gradle.lockfile b/dd-java-agent/agent-profiling/profiling-controller-jfr/implementation/gradle.lockfile index a8f7dc31681..acd60878348 100644 --- a/dd-java-agent/agent-profiling/profiling-controller-jfr/implementation/gradle.lockfile +++ b/dd-java-agent/agent-profiling/profiling-controller-jfr/implementation/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:agent-profiling:profiling-controller-jfr:implementation:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/gradle.lockfile b/dd-java-agent/agent-profiling/profiling-controller-openjdk/gradle.lockfile index 0ed8af195bb..55a35cd8877 100644 --- a/dd-java-agent/agent-profiling/profiling-controller-openjdk/gradle.lockfile +++ b/dd-java-agent/agent-profiling/profiling-controller-openjdk/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:agent-profiling:profiling-controller-openjdk:dependencies --write-locks at.yawk.lz4:lz4-java:1.11.0=testRuntimeClasspath cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath diff --git a/dd-java-agent/agent-profiling/profiling-controller-oracle/gradle.lockfile b/dd-java-agent/agent-profiling/profiling-controller-oracle/gradle.lockfile index 148157569bd..848d3ed7daf 100644 --- a/dd-java-agent/agent-profiling/profiling-controller-oracle/gradle.lockfile +++ b/dd-java-agent/agent-profiling/profiling-controller-oracle/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:agent-profiling:profiling-controller-oracle:dependencies --write-locks at.yawk.lz4:lz4-java:1.11.0=testRuntimeClasspath cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath diff --git a/dd-java-agent/agent-profiling/profiling-controller/gradle.lockfile b/dd-java-agent/agent-profiling/profiling-controller/gradle.lockfile index 5240e53fffd..1c7a07c4ace 100644 --- a/dd-java-agent/agent-profiling/profiling-controller/gradle.lockfile +++ b/dd-java-agent/agent-profiling/profiling-controller/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:agent-profiling:profiling-controller:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-profiling/profiling-ddprof/gradle.lockfile b/dd-java-agent/agent-profiling/profiling-ddprof/gradle.lockfile index 29786782947..f266eaa6de0 100644 --- a/dd-java-agent/agent-profiling/profiling-ddprof/gradle.lockfile +++ b/dd-java-agent/agent-profiling/profiling-ddprof/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:agent-profiling:profiling-ddprof:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-profiling/profiling-scrubber/gradle.lockfile b/dd-java-agent/agent-profiling/profiling-scrubber/gradle.lockfile index 05633454e10..fed5f24a026 100644 --- a/dd-java-agent/agent-profiling/profiling-scrubber/gradle.lockfile +++ b/dd-java-agent/agent-profiling/profiling-scrubber/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:agent-profiling:profiling-scrubber:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc diff --git a/dd-java-agent/agent-profiling/profiling-testing/gradle.lockfile b/dd-java-agent/agent-profiling/profiling-testing/gradle.lockfile index 3b18266c411..8ab4ab0755d 100644 --- a/dd-java-agent/agent-profiling/profiling-testing/gradle.lockfile +++ b/dd-java-agent/agent-profiling/profiling-testing/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:agent-profiling:profiling-testing:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-profiling/profiling-uploader/gradle.lockfile b/dd-java-agent/agent-profiling/profiling-uploader/gradle.lockfile index 0868891f52e..51f00a0a61c 100644 --- a/dd-java-agent/agent-profiling/profiling-uploader/gradle.lockfile +++ b/dd-java-agent/agent-profiling/profiling-uploader/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:agent-profiling:profiling-uploader:dependencies --write-locks at.yawk.lz4:lz4-java:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath cafe.cryptography:curve25519-elisabeth:0.1.0=runtimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=runtimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-profiling/profiling-utils/gradle.lockfile b/dd-java-agent/agent-profiling/profiling-utils/gradle.lockfile index c74a5a69f65..6d25a529b03 100644 --- a/dd-java-agent/agent-profiling/profiling-utils/gradle.lockfile +++ b/dd-java-agent/agent-profiling/profiling-utils/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:agent-profiling:profiling-utils:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc diff --git a/dd-java-agent/agent-tooling/gradle.lockfile b/dd-java-agent/agent-tooling/gradle.lockfile index dd0748949de..490b318224e 100644 --- a/dd-java-agent/agent-tooling/gradle.lockfile +++ b/dd-java-agent/agent-tooling/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:agent-tooling:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=jmhRuntimeClasspath,testRuntimeClasspath,test_java11RuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=jmhRuntimeClasspath,testRuntimeClasspath,test_java11RuntimeClasspath ch.qos.logback:logback-classic:1.2.13=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_java11CompileClasspath,test_java11RuntimeClasspath diff --git a/dd-java-agent/appsec/appsec-test-fixtures/gradle.lockfile b/dd-java-agent/appsec/appsec-test-fixtures/gradle.lockfile index 48a37eccad9..e2bb6b32f09 100644 --- a/dd-java-agent/appsec/appsec-test-fixtures/gradle.lockfile +++ b/dd-java-agent/appsec/appsec-test-fixtures/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:appsec:appsec-test-fixtures:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=runtimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=runtimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/appsec/gradle.lockfile b/dd-java-agent/appsec/gradle.lockfile index b53f937ea2a..cd7332a0981 100644 --- a/dd-java-agent/appsec/gradle.lockfile +++ b/dd-java-agent/appsec/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:appsec:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=jmhRuntimeClasspath,runtimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=jmhRuntimeClasspath,runtimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/benchmark-integration/gradle.lockfile b/dd-java-agent/benchmark-integration/gradle.lockfile index afda810c8e2..ead9d1bd2e8 100644 --- a/dd-java-agent/benchmark-integration/gradle.lockfile +++ b/dd-java-agent/benchmark-integration/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:benchmark-integration:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc diff --git a/dd-java-agent/benchmark-integration/jetty-perftest/gradle.lockfile b/dd-java-agent/benchmark-integration/jetty-perftest/gradle.lockfile index 0010dc4347e..2d5a659cdfc 100644 --- a/dd-java-agent/benchmark-integration/jetty-perftest/gradle.lockfile +++ b/dd-java-agent/benchmark-integration/jetty-perftest/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:benchmark-integration:jetty-perftest:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc diff --git a/dd-java-agent/benchmark-integration/play-perftest/gradle.lockfile b/dd-java-agent/benchmark-integration/play-perftest/gradle.lockfile index cb80831f8ef..85d08caf86c 100644 --- a/dd-java-agent/benchmark-integration/play-perftest/gradle.lockfile +++ b/dd-java-agent/benchmark-integration/play-perftest/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:benchmark-integration:play-perftest:dependencies --write-locks aopalliance:aopalliance:1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath args4j:args4j:2.0.26=javaScriptCompiler cglib:cglib-nodep:3.2.4=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/benchmark/gradle.lockfile b/dd-java-agent/benchmark/gradle.lockfile index 243a367b19e..5b10be285d9 100644 --- a/dd-java-agent/benchmark/gradle.lockfile +++ b/dd-java-agent/benchmark/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:benchmark:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc diff --git a/dd-java-agent/cws-tls/gradle.lockfile b/dd-java-agent/cws-tls/gradle.lockfile index c151b0e78da..c474a327ff5 100644 --- a/dd-java-agent/cws-tls/gradle.lockfile +++ b/dd-java-agent/cws-tls/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:cws-tls:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/ddprof-lib/gradle.lockfile b/dd-java-agent/ddprof-lib/gradle.lockfile index 8597f74d477..c67c0fd23c4 100644 --- a/dd-java-agent/ddprof-lib/gradle.lockfile +++ b/dd-java-agent/ddprof-lib/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:ddprof-lib:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/gradle.lockfile b/dd-java-agent/gradle.lockfile index 6c19099a5eb..1751c0efb10 100644 --- a/dd-java-agent/gradle.lockfile +++ b/dd-java-agent/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:dependencies --write-locks at.yawk.lz4:lz4-java:1.11.0=sharedShadowInclude cafe.cryptography:curve25519-elisabeth:0.1.0=sharedShadowInclude,testRuntimeClasspath,traceShadowInclude cafe.cryptography:ed25519-elisabeth:0.1.0=sharedShadowInclude,testRuntimeClasspath,traceShadowInclude diff --git a/dd-java-agent/instrumentation-annotation-processor/gradle.lockfile b/dd-java-agent/instrumentation-annotation-processor/gradle.lockfile index afda810c8e2..37f8662a629 100644 --- a/dd-java-agent/instrumentation-annotation-processor/gradle.lockfile +++ b/dd-java-agent/instrumentation-annotation-processor/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation-annotation-processor:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc diff --git a/dd-java-agent/instrumentation-testing/gradle.lockfile b/dd-java-agent/instrumentation-testing/gradle.lockfile index da933767daa..331721adb1b 100644 --- a/dd-java-agent/instrumentation-testing/gradle.lockfile +++ b/dd-java-agent/instrumentation-testing/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation-testing:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=runtimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=runtimeClasspath,testRuntimeClasspath cglib:cglib:3.2.5=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/load-generator/gradle.lockfile b/dd-java-agent/load-generator/gradle.lockfile index 0b773acb724..433b3d40aa3 100644 --- a/dd-java-agent/load-generator/gradle.lockfile +++ b/dd-java-agent/load-generator/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:load-generator:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=runtimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/testing/gradle.lockfile b/dd-java-agent/testing/gradle.lockfile index 52f1674c1c7..e18c611afda 100644 --- a/dd-java-agent/testing/gradle.lockfile +++ b/dd-java-agent/testing/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:testing:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=runtimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=runtimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-trace-api/gradle.lockfile b/dd-trace-api/gradle.lockfile index 1b15afdcffc..999c11c1784 100644 --- a/dd-trace-api/gradle.lockfile +++ b/dd-trace-api/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-trace-api:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=testRuntimeClasspath diff --git a/dd-trace-core/gradle.lockfile b/dd-trace-core/gradle.lockfile index e9e6183e120..0542424dc9d 100644 --- a/dd-trace-core/gradle.lockfile +++ b/dd-trace-core/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-trace-core:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=jmhRuntimeClasspath,runtimeClasspath,testRuntimeClasspath,traceAgentTestRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=jmhRuntimeClasspath,runtimeClasspath,testRuntimeClasspath,traceAgentTestRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,traceAgentTestCompileClasspath,traceAgentTestRuntimeClasspath diff --git a/dd-trace-ot/correlation-id-injection/gradle.lockfile b/dd-trace-ot/correlation-id-injection/gradle.lockfile index 29405be76b0..ebdc3ed8b81 100644 --- a/dd-trace-ot/correlation-id-injection/gradle.lockfile +++ b/dd-trace-ot/correlation-id-injection/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-trace-ot:correlation-id-injection:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath diff --git a/dd-trace-ot/gradle.lockfile b/dd-trace-ot/gradle.lockfile index 882788a2da3..6be7828557a 100644 --- a/dd-trace-ot/gradle.lockfile +++ b/dd-trace-ot/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-trace-ot:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=jmhRuntimeClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=jmhRuntimeClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=jmhRuntimeClasspath,ot31CompatibilityTestCompileClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestCompileClasspath,ot33CompatibilityTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/gradle.lockfile b/gradle.lockfile index df1298cd4ec..09ba2813628 100644 --- a/gradle.lockfile +++ b/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dependencies --write-locks com.github.spotbugs:spotbugs-annotations:4.9.8=spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs diff --git a/internal-api/gradle.lockfile b/internal-api/gradle.lockfile index 238f705cd0d..95f8cf138a4 100644 --- a/internal-api/gradle.lockfile +++ b/internal-api/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :internal-api:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/internal-api/internal-api-9/gradle.lockfile b/internal-api/internal-api-9/gradle.lockfile index 9a7d553cc39..0df1005beda 100644 --- a/internal-api/internal-api-9/gradle.lockfile +++ b/internal-api/internal-api-9/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :internal-api:internal-api-9:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=jmhRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=jmhRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/products/feature-flagging/feature-flagging-agent/gradle.lockfile b/products/feature-flagging/feature-flagging-agent/gradle.lockfile index bb56ab36525..9c36a7152de 100644 --- a/products/feature-flagging/feature-flagging-agent/gradle.lockfile +++ b/products/feature-flagging/feature-flagging-agent/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :products:feature-flagging:feature-flagging-agent:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=runtimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=runtimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath diff --git a/products/feature-flagging/feature-flagging-api/gradle.lockfile b/products/feature-flagging/feature-flagging-api/gradle.lockfile index 3304400fa70..bc7d1c414cf 100644 --- a/products/feature-flagging/feature-flagging-api/gradle.lockfile +++ b/products/feature-flagging/feature-flagging-api/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :products:feature-flagging:feature-flagging-api:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc diff --git a/products/feature-flagging/feature-flagging-bootstrap/gradle.lockfile b/products/feature-flagging/feature-flagging-bootstrap/gradle.lockfile index b4d5221986c..b0aa3f3429a 100644 --- a/products/feature-flagging/feature-flagging-bootstrap/gradle.lockfile +++ b/products/feature-flagging/feature-flagging-bootstrap/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :products:feature-flagging:feature-flagging-bootstrap:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=testRuntimeClasspath diff --git a/products/feature-flagging/feature-flagging-lib/gradle.lockfile b/products/feature-flagging/feature-flagging-lib/gradle.lockfile index 89e7e49d3f3..068665cecf8 100644 --- a/products/feature-flagging/feature-flagging-lib/gradle.lockfile +++ b/products/feature-flagging/feature-flagging-lib/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :products:feature-flagging:feature-flagging-lib:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=runtimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=runtimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath diff --git a/products/metrics/metrics-agent/gradle.lockfile b/products/metrics/metrics-agent/gradle.lockfile index c86a210c798..28873caa75e 100644 --- a/products/metrics/metrics-agent/gradle.lockfile +++ b/products/metrics/metrics-agent/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :products:metrics:metrics-agent:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc diff --git a/products/metrics/metrics-api/gradle.lockfile b/products/metrics/metrics-api/gradle.lockfile index 62b097024f2..fa0d53578c2 100644 --- a/products/metrics/metrics-api/gradle.lockfile +++ b/products/metrics/metrics-api/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :products:metrics:metrics-api:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc diff --git a/products/metrics/metrics-lib/gradle.lockfile b/products/metrics/metrics-lib/gradle.lockfile index 6bf638824f7..4047dce96a5 100644 --- a/products/metrics/metrics-lib/gradle.lockfile +++ b/products/metrics/metrics-lib/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :products:metrics:metrics-lib:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/remote-config/remote-config-api/gradle.lockfile b/remote-config/remote-config-api/gradle.lockfile index e7ab997a313..f1f2385d732 100644 --- a/remote-config/remote-config-api/gradle.lockfile +++ b/remote-config/remote-config-api/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :remote-config:remote-config-api:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc diff --git a/remote-config/remote-config-core/gradle.lockfile b/remote-config/remote-config-core/gradle.lockfile index e4e11ef9e29..ef1fcf425ba 100644 --- a/remote-config/remote-config-core/gradle.lockfile +++ b/remote-config/remote-config-core/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :remote-config:remote-config-core:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath diff --git a/settings-gradle.lockfile b/settings-gradle.lockfile index 709a43f74f8..1aa2035e270 100644 --- a/settings-gradle.lockfile +++ b/settings-gradle.lockfile @@ -1,4 +1,5 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew dependencies --write-locks empty=incomingCatalogForLibs0 diff --git a/telemetry/gradle.lockfile b/telemetry/gradle.lockfile index c2314e2bc27..3ece54b0495 100644 --- a/telemetry/gradle.lockfile +++ b/telemetry/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :telemetry:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=jmhRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=jmhRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/utils/config-utils/gradle.lockfile b/utils/config-utils/gradle.lockfile index d4c31e4ae41..0c2277b2de6 100644 --- a/utils/config-utils/gradle.lockfile +++ b/utils/config-utils/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :utils:config-utils:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=testRuntimeClasspath diff --git a/utils/container-utils/gradle.lockfile b/utils/container-utils/gradle.lockfile index cabf9d90642..6e4d2588813 100644 --- a/utils/container-utils/gradle.lockfile +++ b/utils/container-utils/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :utils:container-utils:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=testRuntimeClasspath diff --git a/utils/filesystem-utils/gradle.lockfile b/utils/filesystem-utils/gradle.lockfile index b4d5221986c..cb80c2c4d90 100644 --- a/utils/filesystem-utils/gradle.lockfile +++ b/utils/filesystem-utils/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :utils:filesystem-utils:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=testRuntimeClasspath diff --git a/utils/flare-utils/gradle.lockfile b/utils/flare-utils/gradle.lockfile index 0b3dfddaabd..4c6457098ab 100644 --- a/utils/flare-utils/gradle.lockfile +++ b/utils/flare-utils/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :utils:flare-utils:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/utils/junit-utils/gradle.lockfile b/utils/junit-utils/gradle.lockfile index 2884e456123..3475f628c0c 100644 --- a/utils/junit-utils/gradle.lockfile +++ b/utils/junit-utils/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :utils:junit-utils:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/utils/logging-utils/gradle.lockfile b/utils/logging-utils/gradle.lockfile index db07c8d34b1..f417c5b0b88 100644 --- a/utils/logging-utils/gradle.lockfile +++ b/utils/logging-utils/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :utils:logging-utils:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/utils/queue-utils/gradle.lockfile b/utils/queue-utils/gradle.lockfile index 3bb81fed8b9..7e41dd1fd6d 100644 --- a/utils/queue-utils/gradle.lockfile +++ b/utils/queue-utils/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :utils:queue-utils:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/utils/socket-utils/gradle.lockfile b/utils/socket-utils/gradle.lockfile index 7d8da4a8a6d..d2ce0d5b044 100644 --- a/utils/socket-utils/gradle.lockfile +++ b/utils/socket-utils/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :utils:socket-utils:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=runtimeClasspath,testRuntimeClasspath diff --git a/utils/test-agent-utils/decoder/gradle.lockfile b/utils/test-agent-utils/decoder/gradle.lockfile index 0c63ecd6a03..410c5129240 100644 --- a/utils/test-agent-utils/decoder/gradle.lockfile +++ b/utils/test-agent-utils/decoder/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :utils:test-agent-utils:decoder:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=testRuntimeClasspath diff --git a/utils/test-utils/gradle.lockfile b/utils/test-utils/gradle.lockfile index e5a3c215c81..7f3026e0149 100644 --- a/utils/test-utils/gradle.lockfile +++ b/utils/test-utils/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :utils:test-utils:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=compileClasspath,testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=compileClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=runtimeClasspath,testRuntimeClasspath diff --git a/utils/time-utils/gradle.lockfile b/utils/time-utils/gradle.lockfile index b4d5221986c..c9ca589593a 100644 --- a/utils/time-utils/gradle.lockfile +++ b/utils/time-utils/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :utils:time-utils:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=testRuntimeClasspath diff --git a/utils/version-utils/gradle.lockfile b/utils/version-utils/gradle.lockfile index 62b097024f2..e37a5924494 100644 --- a/utils/version-utils/gradle.lockfile +++ b/utils/version-utils/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :utils:version-utils:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc From fa230dd3ada48f5b548c345b709d374f8a0c2e71 Mon Sep 17 00:00:00 2001 From: Bruce Bujon Date: Mon, 22 Jun 2026 10:19:42 +0200 Subject: [PATCH 011/139] feat(core): Improve http codec extractor tests (#11640) feat(core): Improve http codec extractor tests Extract the ContextInterpreter tests related to AppSec to remove duplication. Handle extractor initialization in a new parent test class Deduplicate constants and values into the new parent test class Co-authored-by: bruce.bujon --- .../AbstractHttpExtractorTest.java | 60 ++++ .../AppSecClientInterpreterClientIpTest.java | 270 ++++++++++++++++++ .../core/propagation/B3HttpExtractorTest.java | 134 +-------- .../propagation/DatadogHttpExtractorTest.java | 185 +----------- .../HaystackHttpExtractorTest.java | 147 +--------- .../propagation/NoneHttpExtractorTest.java | 184 +----------- .../propagation/W3CHttpExtractorTest.java | 191 +------------ .../propagation/XRayHttpExtractorTest.java | 141 +-------- 8 files changed, 374 insertions(+), 938 deletions(-) create mode 100644 dd-trace-core/src/test/java/datadog/trace/core/propagation/AbstractHttpExtractorTest.java create mode 100644 dd-trace-core/src/test/java/datadog/trace/core/propagation/AppSecClientInterpreterClientIpTest.java diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/AbstractHttpExtractorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/AbstractHttpExtractorTest.java new file mode 100644 index 00000000000..ca9facbba41 --- /dev/null +++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/AbstractHttpExtractorTest.java @@ -0,0 +1,60 @@ +package datadog.trace.core.propagation; + +import static datadog.trace.api.config.TracerConfig.PROPAGATION_EXTRACT_LOG_HEADER_NAMES_ENABLED; +import static java.util.Collections.singletonMap; + +import datadog.trace.api.Config; +import datadog.trace.api.DynamicConfig; +import datadog.trace.api.TraceConfig; +import datadog.trace.junit.utils.config.WithConfig; +import datadog.trace.test.util.DDJavaSpecification; +import java.util.HashMap; +import java.util.Map; +import java.util.function.BiFunction; +import java.util.function.Supplier; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; + +/** This class is a base test class for the {@link HttpCodec.Extractor} tests. */ +@WithConfig(key = PROPAGATION_EXTRACT_LOG_HEADER_NAMES_ENABLED, value = "true") +abstract class AbstractHttpExtractorTest extends DDJavaSpecification { + protected static final String SOME_HEADER = "SOME_HEADER"; + protected static final String SOME_TAG = "some-tag"; + protected static final String SOME_CUSTOM_BAGGAGE_HEADER = "SOME_CUSTOM_BAGGAGE_HEADER"; + protected static final String SOME_CUSTOM_BAGGAGE_HEADER_2 = "SOME_CUSTOM_BAGGAGE_HEADER_2"; + protected static final String SOME_BAGGAGE = "some-baggage"; + protected static final String SOME_CASE_SENSITIVE_BAGGAGE = "some-CaseSensitive-baggage"; + protected static final String SOME_ARBITRARY_HEADER = "SOME_ARBITRARY_HEADER"; + + protected HttpCodec.Extractor extractor; + + /** Creates the extractor for the propagation style under test. */ + protected abstract HttpCodec.Extractor newExtractor( + Config config, Supplier traceConfigSupplier); + + @BeforeEach + void setupExtractor() { + this.extractor = buildExtractor(this::newExtractor); + } + + @AfterEach + void cleanupExtractor() { + if (this.extractor != null) { + this.extractor.cleanup(); + } + } + + /** Builds an extractor with a test trace config (a basic baggage mapping and header tags). */ + static HttpCodec.Extractor buildExtractor( + BiFunction, HttpCodec.Extractor> factory) { + Map baggageMapping = new HashMap<>(); + baggageMapping.put(SOME_CUSTOM_BAGGAGE_HEADER, SOME_BAGGAGE); + baggageMapping.put(SOME_CUSTOM_BAGGAGE_HEADER_2, SOME_CASE_SENSITIVE_BAGGAGE); + DynamicConfig dynamicConfig = + DynamicConfig.create() + .setHeaderTags(singletonMap(SOME_HEADER, SOME_TAG)) + .setBaggageMapping(baggageMapping) + .apply(); + return factory.apply(Config.get(), dynamicConfig::captureTraceConfig); + } +} diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/AppSecClientInterpreterClientIpTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/AppSecClientInterpreterClientIpTest.java new file mode 100644 index 00000000000..b57c22d432f --- /dev/null +++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/AppSecClientInterpreterClientIpTest.java @@ -0,0 +1,270 @@ +package datadog.trace.core.propagation; + +import static datadog.trace.api.config.TracerConfig.PROPAGATION_EXTRACT_LOG_HEADER_NAMES_ENABLED; +import static datadog.trace.api.config.TracerConfig.TRACE_CLIENT_IP_HEADER; +import static datadog.trace.api.config.TracerConfig.TRACE_CLIENT_IP_RESOLVER_ENABLED; +import static datadog.trace.bootstrap.ActiveSubsystems.APPSEC_ACTIVE; +import static datadog.trace.bootstrap.instrumentation.api.ContextVisitors.stringValuesMap; +import static datadog.trace.core.propagation.AbstractHttpExtractorTest.buildExtractor; +import static datadog.trace.core.propagation.HttpCodecTestHelper.headers; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.params.provider.Arguments.arguments; + +import datadog.trace.api.Config; +import datadog.trace.api.DDSpanId; +import datadog.trace.api.DDTraceId; +import datadog.trace.api.TraceConfig; +import datadog.trace.bootstrap.instrumentation.api.TagContext; +import datadog.trace.junit.utils.config.WithConfig; +import datadog.trace.test.util.DDJavaSpecification; +import java.util.HashMap; +import java.util.Map; +import java.util.function.BiFunction; +import java.util.function.Supplier; +import java.util.stream.Stream; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + +/** + * Verifies client-IP AppSec HTTP header collection. This behavior is implemented in the {@link + * ContextInterpreter} and should work with every propagation style. + */ +@WithConfig(key = PROPAGATION_EXTRACT_LOG_HEADER_NAMES_ENABLED, value = "true") +class AppSecClientInterpreterClientIpTest extends DDJavaSpecification { + private boolean origAppSecActive; + private HttpCodec.Extractor extractor; + + @BeforeEach + void enableAppSec() { + this.origAppSecActive = APPSEC_ACTIVE; + APPSEC_ACTIVE = true; + } + + @AfterEach + void restoreAppSec() { + if (this.extractor != null) { + this.extractor.cleanup(); + } + APPSEC_ACTIVE = this.origAppSecActive; + } + + static Stream styles() { + return Stream.of( + arguments( + new Style( + "Datadog", + DatadogHttpCodec::newExtractor, + headers(DatadogHttpCodec.TRACE_ID_KEY, "1", DatadogHttpCodec.SPAN_ID_KEY, "2"), + true)), + arguments( + new Style( + "B3", + B3HttpCodec::newExtractor, + headers(B3HttpCodec.TRACE_ID_KEY, "1", B3HttpCodec.SPAN_ID_KEY, "2"), + true)), + arguments( + new Style( + "W3C", + W3CHttpCodec::newExtractor, + headers( + W3CHttpCodec.TRACE_PARENT_KEY, + "00-00000000000000000000000000000001-0000000000000002-01"), + true)), + arguments( + new Style( + "Haystack", + HaystackHttpCodec::newExtractor, + headers(HaystackHttpCodec.TRACE_ID_KEY, "1", HaystackHttpCodec.SPAN_ID_KEY, "2"), + true)), + arguments( + new Style( + "XRay", + XRayHttpCodec::newExtractor, + headers( + XRayHttpCodec.X_AMZN_TRACE_ID, + "Root=1-00000000-000000000000000000000001;Parent=0000000000000002"), + true)), + arguments( + new Style( + "None", + NoneCodec::newExtractor, + headers(DatadogHttpCodec.TRACE_ID_KEY, "1", DatadogHttpCodec.SPAN_ID_KEY, "2"), + false))); + } + + @ParameterizedTest(name = "{0}") + @MethodSource("styles") + void extractCommonHttpHeaders(Style style) { + this.extractor = buildExtractor(style.factory); + // spotless:off + Map headers = headers( + HttpCodec.USER_AGENT_KEY, "some-user-agent", + HttpCodec.X_CLUSTER_CLIENT_IP_KEY, "1.1.1.1", + HttpCodec.X_REAL_IP_KEY, "2.2.2.2", + HttpCodec.X_CLIENT_IP_KEY, "3.3.3.3", + HttpCodec.TRUE_CLIENT_IP_KEY, "4.4.4.4", + HttpCodec.FORWARDED_FOR_KEY, "5.5.5.5", + HttpCodec.FORWARDED_KEY, "6.6.6.6", + HttpCodec.FASTLY_CLIENT_IP_KEY, "7.7.7.7", + HttpCodec.CF_CONNECTING_IP_KEY, "8.8.8.8", + HttpCodec.CF_CONNECTING_IP_V6_KEY, "9.9.9.9"); + // spotless:on + + TagContext context = this.extractor.extract(headers, stringValuesMap()); + + assertEquals("some-user-agent", context.getUserAgent()); + assertEquals("1.1.1.1", context.getXClusterClientIp()); + assertEquals("2.2.2.2", context.getXRealIp()); + assertEquals("3.3.3.3", context.getXClientIp()); + assertEquals("4.4.4.4", context.getTrueClientIp()); + assertEquals("5.5.5.5", context.getForwardedFor()); + assertEquals("6.6.6.6", context.getForwarded()); + assertEquals("7.7.7.7", context.getFastlyClientIp()); + assertEquals("8.8.8.8", context.getCfConnectingIp()); + assertEquals("9.9.9.9", context.getCfConnectingIpv6()); + } + + @ParameterizedTest(name = "{0}") + @MethodSource("styles") + void extractEmptyHeadersReturnsNull(Style style) { + this.extractor = buildExtractor(style.factory); + assertNull( + this.extractor.extract(headers("ignored-header", "ignored-value"), stringValuesMap())); + } + + @ParameterizedTest(name = "{0}") + @MethodSource("styles") + void extractHeadersWithForwarding(Style style) { + this.extractor = buildExtractor(style.factory); + String forwarded = "for=1.2.3.4:1234"; + + TagContext tagOnly = this.extractor.extract(headers("Forwarded", forwarded), stringValuesMap()); + + assertNotNull(tagOnly); + assertFalse(tagOnly instanceof ExtractedContext); + assertEquals(forwarded, tagOnly.getForwarded()); + + Map fullHeaders = new HashMap<>(style.minimalTraceHeaders); + fullHeaders.putAll(headers("Forwarded", forwarded)); + + TagContext full = this.extractor.extract(fullHeaders, stringValuesMap()); + + assertExpectedTraceContext(full, style); + assertEquals(forwarded, full.getForwarded()); + } + + @ParameterizedTest(name = "{0}") + @MethodSource("styles") + void extractHeadersWithXForwarding(Style style) { + this.extractor = buildExtractor(style.factory); + String forwardedIp = "1.2.3.4"; + String forwardedPort = "1234"; + + TagContext tagOnly = + this.extractor.extract( + headers("X-Forwarded-For", forwardedIp, "X-Forwarded-Port", forwardedPort), + stringValuesMap()); + + assertNotNull(tagOnly); + assertFalse(tagOnly instanceof ExtractedContext); + assertEquals(forwardedIp, tagOnly.getXForwardedFor()); + assertEquals(forwardedPort, tagOnly.getXForwardedPort()); + + Map fullHeaders = new HashMap<>(style.minimalTraceHeaders); + fullHeaders.putAll(headers("X-Forwarded-For", forwardedIp, "X-Forwarded-Port", forwardedPort)); + + TagContext full = this.extractor.extract(fullHeaders, stringValuesMap()); + + assertExpectedTraceContext(full, style); + assertEquals(forwardedIp, full.getXForwardedFor()); + assertEquals(forwardedPort, full.getXForwardedPort()); + } + + @ParameterizedTest(name = "{0}") + @MethodSource("styles") + @WithConfig(key = TRACE_CLIENT_IP_RESOLVER_ENABLED, value = "false") + void extractHeadersWithIpResolutionDisabled(Style style) { + // The extractor must be built after @WithConfig is applied: ContextInterpreter reads the + // client-IP resolution flag in its constructor. + this.extractor = buildExtractor(style.factory); + Map headers = headers("X-Forwarded-For", "::1", "User-agent", "foo/bar"); + + TagContext context = this.extractor.extract(headers, stringValuesMap()); + + assertNotNull(context); + assertNull(context.getXForwardedFor()); + assertEquals("foo/bar", context.getUserAgent()); + } + + @ParameterizedTest(name = "{0}") + @MethodSource("styles") + void extractHeadersWithIpResolutionDisabledAppsecDisabled(Style style) { + this.extractor = buildExtractor(style.factory); + // collectIpHeaders is recomputed per extract in ContextInterpreter.reset(), so toggling + // APPSEC_ACTIVE after building the extractor still takes effect. + APPSEC_ACTIVE = false; + Map headers = headers("X-Forwarded-For", "::1", "User-agent", "foo/bar"); + + TagContext context = this.extractor.extract(headers, stringValuesMap()); + + assertNotNull(context); + assertNull(context.getXForwardedFor()); + } + + @ParameterizedTest(name = "{0}") + @MethodSource("styles") + @WithConfig(key = TRACE_CLIENT_IP_HEADER, value = "my-header") + void customIpHeaderCollectionDoesNotDisableStandardIpHeaderCollection(Style style) { + this.extractor = buildExtractor(style.factory); + Map headers = headers("X-Forwarded-For", "::1", "My-Header", "8.8.8.8"); + + TagContext context = this.extractor.extract(headers, stringValuesMap()); + + assertNotNull(context); + assertEquals("::1", context.getXForwardedFor()); + assertEquals("8.8.8.8", context.getCustomIpHeader()); + } + + private static void assertExpectedTraceContext(TagContext context, Style style) { + if (style.buildsExtractedContext) { + ExtractedContext extracted = assertInstanceOf(ExtractedContext.class, context); + assertEquals(1L, extracted.getTraceId().toLong()); + assertEquals(2L, extracted.getSpanId()); + } else { + assertFalse(context instanceof ExtractedContext); + assertEquals(DDTraceId.ZERO, context.getTraceId()); + assertEquals(DDSpanId.ZERO, context.getSpanId()); + } + } + + /** A propagation style under test: its extractor factory and minimal valid trace headers. */ + static final class Style { + final String name; + final BiFunction, HttpCodec.Extractor> factory; + final Map minimalTraceHeaders; + final boolean buildsExtractedContext; + + Style( + String name, + BiFunction, HttpCodec.Extractor> factory, + Map minimalTraceHeaders, + boolean buildsExtractedContext) { + this.name = name; + this.factory = factory; + this.minimalTraceHeaders = minimalTraceHeaders; + this.buildsExtractedContext = buildsExtractedContext; + } + + @Override + public String toString() { + return this.name; + } + } +} diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/B3HttpExtractorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/B3HttpExtractorTest.java index 2baf8ac06fe..62a5dd044b2 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/B3HttpExtractorTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/B3HttpExtractorTest.java @@ -1,7 +1,5 @@ package datadog.trace.core.propagation; -import static datadog.trace.api.config.TracerConfig.PROPAGATION_EXTRACT_LOG_HEADER_NAMES_ENABLED; -import static datadog.trace.bootstrap.ActiveSubsystems.APPSEC_ACTIVE; import static datadog.trace.bootstrap.instrumentation.api.ContextVisitors.stringValuesMap; import static datadog.trace.core.propagation.B3HttpCodec.B3_KEY; import static datadog.trace.core.propagation.B3HttpCodec.B3_SPAN_ID; @@ -16,50 +14,27 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertInstanceOf; -import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import datadog.trace.api.Config; import datadog.trace.api.DDSpanId; -import datadog.trace.api.DynamicConfig; +import datadog.trace.api.TraceConfig; import datadog.trace.bootstrap.instrumentation.api.TagContext; -import datadog.trace.junit.utils.config.WithConfig; import datadog.trace.junit.utils.converter.PrioritySamplingConverter; -import datadog.trace.test.util.DDJavaSpecification; import java.util.HashMap; import java.util.Map; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; +import java.util.function.Supplier; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.converter.ConvertWith; import org.tabletest.junit.TableTest; -@WithConfig(key = PROPAGATION_EXTRACT_LOG_HEADER_NAMES_ENABLED, value = "true") -class B3HttpExtractorTest extends DDJavaSpecification { - private static final String SOME_HEADER = "SOME_HEADER"; - private static final String SOME_TAG = "some-tag"; +class B3HttpExtractorTest extends AbstractHttpExtractorTest { private static final String SOME_VALUE = "my-interesting-info"; - private static final String FORWARDED_IP = "1.2.3.4"; - private static final String FORWARDED_PORT = "1234"; - private HttpCodec.Extractor extractor; - private boolean origAppSecActive; - - @BeforeEach - void setup() { - DynamicConfig dynamicConfig = - DynamicConfig.create() - .setHeaderTags(singletonMap(SOME_HEADER, SOME_TAG)) - .setBaggageMapping(emptyMap()) - .apply(); - this.extractor = B3HttpCodec.newExtractor(Config.get(), dynamicConfig::captureTraceConfig); - this.origAppSecActive = APPSEC_ACTIVE; - APPSEC_ACTIVE = true; - } - - @AfterEach - void teardown() { - APPSEC_ACTIVE = this.origAppSecActive; + @Override + protected HttpCodec.Extractor newExtractor( + Config config, Supplier traceConfigSupplier) { + return B3HttpCodec.newExtractor(config, traceConfigSupplier); } @TableTest({ @@ -84,7 +59,8 @@ void extractHttpHeaders( SAMPLING_PRIORITY_KEY, samplingPriority != null ? samplingPriority.toString() : null); // spotless:on - ExtractedContext context = (ExtractedContext) extractor.extract(headers, stringValuesMap()); + ExtractedContext context = + (ExtractedContext) this.extractor.extract(headers, stringValuesMap()); assertEquals(B3TraceId.fromHex(traceIdHex), context.getTraceId()); assertEquals(DDSpanId.fromHex(spanIdHex), context.getSpanId()); @@ -231,67 +207,6 @@ void extractHeaderTagsWithNoPropagation() { assertEquals(singletonMap(SOME_TAG, SOME_VALUE), context.getTags()); } - @Test - void extractHeadersWithForwarding() { - String forwarded = "for=" + FORWARDED_IP + ":" + FORWARDED_PORT; - Map tagOnlyCtx = headers("Forwarded", forwarded); - // spotless:off - Map fullCtx = headers( - TRACE_ID_KEY, "1", - SPAN_ID_KEY, "2", - "Forwarded", forwarded - ); - // spotless:on - - TagContext context = extractor.extract(tagOnlyCtx, stringValuesMap()); - - assertNotNull(context); - assertFalse(context instanceof ExtractedContext); - assertEquals(forwarded, context.getForwarded()); - - context = this.extractor.extract(fullCtx, stringValuesMap()); - - assertInstanceOf(ExtractedContext.class, context); - assertEquals(1L, context.getTraceId().toLong()); - assertEquals(2L, context.getSpanId()); - assertEquals(forwarded, context.getForwarded()); - } - - @Test - void extractHeadersWithXForwarding() { - // spotless:off - Map tagOnlyCtx = headers( - "X-Forwarded-For", FORWARDED_IP, - "X-Forwarded-Port", FORWARDED_PORT - ); - Map fullCtx = headers( - TRACE_ID_KEY, "1", - SPAN_ID_KEY, "2", - "x-forwarded-for", FORWARDED_IP, - "x-forwarded-port", FORWARDED_PORT - ); - // spotless:on - - TagContext context = extractor.extract(tagOnlyCtx, stringValuesMap()); - - assertNotNull(context); - assertEquals(FORWARDED_IP, context.getXForwardedFor()); - assertEquals(FORWARDED_PORT, context.getXForwardedPort()); - - context = extractor.extract(fullCtx, stringValuesMap()); - - assertInstanceOf(ExtractedContext.class, context); - assertEquals(1L, context.getTraceId().toLong()); - assertEquals(2L, context.getSpanId()); - assertEquals(FORWARDED_IP, context.getXForwardedFor()); - assertEquals(FORWARDED_PORT, context.getXForwardedPort()); - } - - @Test - void extractEmptyHeadersReturnsNull() { - assertNull(extractor.extract(headers("ignored-header", "ignored-value"), stringValuesMap())); - } - @Test void extractHttpHeadersWithInvalidNonNumericId() { // spotless:off @@ -363,35 +278,4 @@ private static String trimmed(String hex) { } return hex.substring(firstNonZero, length); } - - @Test - void extractCommonHttpHeaders() { - // spotless:off - Map headers = headers( - HttpCodec.USER_AGENT_KEY, "some-user-agent", - HttpCodec.X_CLUSTER_CLIENT_IP_KEY, "1.1.1.1", - HttpCodec.X_REAL_IP_KEY, "2.2.2.2", - HttpCodec.X_CLIENT_IP_KEY, "3.3.3.3", - HttpCodec.TRUE_CLIENT_IP_KEY, "4.4.4.4", - HttpCodec.FORWARDED_FOR_KEY, "5.5.5.5", - HttpCodec.FORWARDED_KEY, "6.6.6.6", - HttpCodec.FASTLY_CLIENT_IP_KEY, "7.7.7.7", - HttpCodec.CF_CONNECTING_IP_KEY, "8.8.8.8", - HttpCodec.CF_CONNECTING_IP_V6_KEY, "9.9.9.9" - ); - // spotless:on - - TagContext context = extractor.extract(headers, stringValuesMap()); - - assertEquals("some-user-agent", context.getUserAgent()); - assertEquals("1.1.1.1", context.getXClusterClientIp()); - assertEquals("2.2.2.2", context.getXRealIp()); - assertEquals("3.3.3.3", context.getXClientIp()); - assertEquals("4.4.4.4", context.getTrueClientIp()); - assertEquals("5.5.5.5", context.getForwardedFor()); - assertEquals("6.6.6.6", context.getForwarded()); - assertEquals("7.7.7.7", context.getFastlyClientIp()); - assertEquals("8.8.8.8", context.getCfConnectingIp()); - assertEquals("9.9.9.9", context.getCfConnectingIpv6()); - } } diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/DatadogHttpExtractorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/DatadogHttpExtractorTest.java index ae27363f07d..8fa9568ff58 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/DatadogHttpExtractorTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/DatadogHttpExtractorTest.java @@ -1,11 +1,7 @@ package datadog.trace.core.propagation; -import static datadog.trace.api.config.TracerConfig.PROPAGATION_EXTRACT_LOG_HEADER_NAMES_ENABLED; import static datadog.trace.api.config.TracerConfig.REQUEST_HEADER_TAGS_COMMA_ALLOWED; -import static datadog.trace.api.config.TracerConfig.TRACE_CLIENT_IP_HEADER; -import static datadog.trace.api.config.TracerConfig.TRACE_CLIENT_IP_RESOLVER_ENABLED; import static datadog.trace.api.sampling.PrioritySampling.UNSET; -import static datadog.trace.bootstrap.ActiveSubsystems.APPSEC_ACTIVE; import static datadog.trace.bootstrap.instrumentation.api.ContextVisitors.stringValuesMap; import static datadog.trace.core.propagation.DatadogHttpCodec.DATADOG_TAGS_KEY; import static datadog.trace.core.propagation.DatadogHttpCodec.ORIGIN_KEY; @@ -28,55 +24,26 @@ import datadog.trace.api.DDSpanId; import datadog.trace.api.DDTraceId; import datadog.trace.api.DynamicConfig; +import datadog.trace.api.TraceConfig; import datadog.trace.api.internal.util.LongStringUtils; import datadog.trace.bootstrap.instrumentation.api.TagContext; import datadog.trace.junit.utils.config.WithConfig; import datadog.trace.junit.utils.converter.PrioritySamplingConverter; import datadog.trace.junit.utils.converter.TraceIdConverter; -import datadog.trace.test.util.DDJavaSpecification; import java.util.HashMap; import java.util.Map; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; +import java.util.function.Supplier; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.converter.ConvertWith; import org.junit.jupiter.params.provider.ValueSource; import org.tabletest.junit.TableTest; -@WithConfig(key = PROPAGATION_EXTRACT_LOG_HEADER_NAMES_ENABLED, value = "true") -class DatadogHttpExtractorTest extends DDJavaSpecification { - private static final String SOME_HEADER = "SOME_HEADER"; - private static final String SOME_CUSTOM_BAGGAGE_HEADER = "SOME_CUSTOM_BAGGAGE_HEADER"; - private static final String SOME_CUSTOM_BAGGAGE_HEADER_2 = "SOME_CUSTOM_BAGGAGE_HEADER_2"; - private static final String SOME_ARBITRARY_HEADER = "SOME_ARBITRARY_HEADER"; - private static final String SOME_TAG = "some-tag"; - private static final String SOME_BAGGAGE = "some-baggage"; - private static final String SOME_CASE_SENSITIVE_BAGGAGE = "some-CaseSensitive-baggage"; - - private HttpCodec.Extractor extractor; - private boolean origAppSecActive; - - @BeforeEach - void setup() { - Map baggageMap = new HashMap<>(); - baggageMap.put(SOME_CUSTOM_BAGGAGE_HEADER, SOME_BAGGAGE); - baggageMap.put(SOME_CUSTOM_BAGGAGE_HEADER_2, SOME_CASE_SENSITIVE_BAGGAGE); - DynamicConfig dynamicConfig = - DynamicConfig.create() - .setHeaderTags(singletonMap(SOME_HEADER, SOME_TAG)) - .setBaggageMapping(baggageMap) - .apply(); - this.extractor = DatadogHttpCodec.newExtractor(Config.get(), dynamicConfig::captureTraceConfig); - - this.origAppSecActive = APPSEC_ACTIVE; - APPSEC_ACTIVE = true; - } - - @AfterEach - void teardown() { - this.extractor.cleanup(); - APPSEC_ACTIVE = this.origAppSecActive; +class DatadogHttpExtractorTest extends AbstractHttpExtractorTest { + @Override + protected HttpCodec.Extractor newExtractor( + Config config, Supplier traceConfigSupplier) { + return DatadogHttpCodec.newExtractor(config, traceConfigSupplier); } @TableTest({ @@ -165,113 +132,6 @@ void extractHeaderTagsWithNoPropagation(boolean withOrigin) { } } - @Test - void extractHeadersWithForwarding() { - String forwardedIp = "1.2.3.4"; - String forwardedPort = "1234"; - String forwarded = "for=" + forwardedIp + ":" + forwardedPort; - Map tagOnlyCtx = headers("Forwarded", forwarded); - // spotless:off - Map fullCtx = headers( - TRACE_ID_KEY, "1", - SPAN_ID_KEY, "2", - "Forwarded", forwarded - ); - // spotless:on - - TagContext context = this.extractor.extract(tagOnlyCtx, stringValuesMap()); - - assertNotNull(context); - assertFalse(context instanceof ExtractedContext); - assertEquals(forwarded, context.getForwarded()); - - context = this.extractor.extract(fullCtx, stringValuesMap()); - - assertInstanceOf(ExtractedContext.class, context); - assertEquals(1L, context.getTraceId().toLong()); - assertEquals(2L, context.getSpanId()); - assertEquals(forwarded, context.getForwarded()); - } - - @Test - void extractHeadersWithXForwarding() { - String forwardedIp = "1.2.3.4"; - String forwardedPort = "1234"; - // spotless:off - Map tagOnlyCtx = headers( - "X-Forwarded-For", forwardedIp, - "X-Forwarded-Port", forwardedPort - ); - Map fullCtx = headers( - TRACE_ID_KEY, "1", - SPAN_ID_KEY, "2", - "x-forwarded-for", forwardedIp, - "x-forwarded-port", forwardedPort - ); - // spotless:on - - TagContext context = this.extractor.extract(tagOnlyCtx, stringValuesMap()); - - assertNotNull(context); - assertEquals(forwardedIp, context.getXForwardedFor()); - assertEquals(forwardedPort, context.getXForwardedPort()); - - context = this.extractor.extract(fullCtx, stringValuesMap()); - - assertInstanceOf(ExtractedContext.class, context); - assertEquals(1L, context.getTraceId().toLong()); - assertEquals(2L, context.getSpanId()); - assertEquals(forwardedIp, context.getXForwardedFor()); - assertEquals(forwardedPort, context.getXForwardedPort()); - } - - @Test - void extractEmptyHeadersReturnsNull() { - Map headers = headers("ignored-header", "ignored-value"); - assertNull(this.extractor.extract(headers, stringValuesMap())); - } - - @Test - @WithConfig(key = TRACE_CLIENT_IP_RESOLVER_ENABLED, value = "false") - void extractHeadersWithIpResolutionDisabled() { - Map tagOnlyCtx = new HashMap<>(); - tagOnlyCtx.put("X-Forwarded-For", "::1"); - tagOnlyCtx.put("User-agent", "foo/bar"); - - TagContext context = this.extractor.extract(tagOnlyCtx, stringValuesMap()); - - assertNotNull(context); - assertNull(context.getXForwardedFor()); - assertEquals("foo/bar", context.getUserAgent()); - } - - @Test - void extractHeadersWithIpResolutionDisabledAppsecDisabled() { - APPSEC_ACTIVE = false; - Map tagOnlyCtx = new HashMap<>(); - tagOnlyCtx.put("X-Forwarded-For", "::1"); - tagOnlyCtx.put("User-agent", "foo/bar"); - - TagContext context = this.extractor.extract(tagOnlyCtx, stringValuesMap()); - - assertNotNull(context); - assertNull(context.getXForwardedFor()); - } - - @Test - @WithConfig(key = TRACE_CLIENT_IP_HEADER, value = "my-header") - void customIpHeaderCollectionDoesNotDisableStandardIpHeaderCollection() { - Map tagOnlyCtx = new HashMap<>(); - tagOnlyCtx.put("X-Forwarded-For", "::1"); - tagOnlyCtx.put("My-Header", "8.8.8.8"); - - TagContext context = this.extractor.extract(tagOnlyCtx, stringValuesMap()); - - assertNotNull(context); - assertEquals("::1", context.getXForwardedFor()); - assertEquals("8.8.8.8", context.getCustomIpHeader()); - } - @TableTest({ "scenario | hexId ", "64-bit short | '1' ", @@ -465,37 +325,6 @@ void baggageIsMappedOnContextCreation( } } - @Test - void extractCommonHttpHeaders() { - // spotless:off - Map headers = headers( - HttpCodec.USER_AGENT_KEY, "some-user-agent", - HttpCodec.X_CLUSTER_CLIENT_IP_KEY, "1.1.1.1", - HttpCodec.X_REAL_IP_KEY, "2.2.2.2", - HttpCodec.X_CLIENT_IP_KEY, "3.3.3.3", - HttpCodec.TRUE_CLIENT_IP_KEY, "4.4.4.4", - HttpCodec.FORWARDED_FOR_KEY, "5.5.5.5", - HttpCodec.FORWARDED_KEY, "6.6.6.6", - HttpCodec.FASTLY_CLIENT_IP_KEY, "7.7.7.7", - HttpCodec.CF_CONNECTING_IP_KEY, "8.8.8.8", - HttpCodec.CF_CONNECTING_IP_V6_KEY, "9.9.9.9" - ); - // spotless:on - - TagContext context = this.extractor.extract(headers, stringValuesMap()); - - assertEquals("some-user-agent", context.getUserAgent()); - assertEquals("1.1.1.1", context.getXClusterClientIp()); - assertEquals("2.2.2.2", context.getXRealIp()); - assertEquals("3.3.3.3", context.getXClientIp()); - assertEquals("4.4.4.4", context.getTrueClientIp()); - assertEquals("5.5.5.5", context.getForwardedFor()); - assertEquals("6.6.6.6", context.getForwarded()); - assertEquals("7.7.7.7", context.getFastlyClientIp()); - assertEquals("8.8.8.8", context.getCfConnectingIp()); - assertEquals("9.9.9.9", context.getCfConnectingIpv6()); - } - private static String asString(CharSequence cs) { return cs == null ? null : cs.toString(); } diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/HaystackHttpExtractorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/HaystackHttpExtractorTest.java index f87a600e23f..7cab22b6163 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/HaystackHttpExtractorTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/HaystackHttpExtractorTest.java @@ -1,8 +1,6 @@ package datadog.trace.core.propagation; -import static datadog.trace.api.config.TracerConfig.PROPAGATION_EXTRACT_LOG_HEADER_NAMES_ENABLED; import static datadog.trace.api.sampling.PrioritySampling.SAMPLER_KEEP; -import static datadog.trace.bootstrap.ActiveSubsystems.APPSEC_ACTIVE; import static datadog.trace.bootstrap.instrumentation.api.ContextVisitors.stringValuesMap; import static datadog.trace.core.propagation.HaystackHttpCodec.HAYSTACK_SPAN_ID_BAGGAGE_KEY; import static datadog.trace.core.propagation.HaystackHttpCodec.HAYSTACK_TRACE_ID_BAGGAGE_KEY; @@ -14,61 +12,27 @@ import static java.util.Collections.singletonMap; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import datadog.trace.api.Config; import datadog.trace.api.DDSpanId; import datadog.trace.api.DDTraceId; -import datadog.trace.api.DynamicConfig; +import datadog.trace.api.TraceConfig; import datadog.trace.bootstrap.instrumentation.api.TagContext; -import datadog.trace.junit.utils.config.WithConfig; import datadog.trace.junit.utils.converter.TraceIdConverter; -import datadog.trace.test.util.DDJavaSpecification; import java.util.HashMap; import java.util.Map; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; +import java.util.function.Supplier; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.converter.ConvertWith; import org.tabletest.junit.TableTest; -@WithConfig(key = PROPAGATION_EXTRACT_LOG_HEADER_NAMES_ENABLED, value = "true") -class HaystackHttpExtractorTest extends DDJavaSpecification { - - private static final String SOME_HEADER = "SOME_HEADER"; - private static final String SOME_CUSTOM_BAGGAGE_HEADER = "SOME_CUSTOM_BAGGAGE_HEADER"; - private static final String SOME_CUSTOM_BAGGAGE_HEADER_2 = "SOME_CUSTOM_BAGGAGE_HEADER_2"; - private static final String SOME_ARBITRARY_HEADER = "SOME_ARBITRARY_HEADER"; - private static final String SOME_TAG = "some-tag"; - private static final String SOME_BAGGAGE = "some-baggage"; - private static final String SOME_CASE_SENSITIVE_BAGGAGE = "some-CaseSensitive-baggage"; - - private HttpCodec.Extractor extractor; - private boolean origAppSecActive; - - @BeforeEach - void setup() { - Map baggageMap = new HashMap<>(); - baggageMap.put(SOME_CUSTOM_BAGGAGE_HEADER, SOME_BAGGAGE); - baggageMap.put(SOME_CUSTOM_BAGGAGE_HEADER_2, SOME_CASE_SENSITIVE_BAGGAGE); - DynamicConfig dynamicConfig = - DynamicConfig.create() - .setHeaderTags(singletonMap(SOME_HEADER, SOME_TAG)) - .setBaggageMapping(baggageMap) - .apply(); - this.extractor = - HaystackHttpCodec.newExtractor(Config.get(), dynamicConfig::captureTraceConfig); - - this.origAppSecActive = APPSEC_ACTIVE; - APPSEC_ACTIVE = true; - } - - @AfterEach - void teardown() { - this.extractor.cleanup(); - APPSEC_ACTIVE = origAppSecActive; +class HaystackHttpExtractorTest extends AbstractHttpExtractorTest { + @Override + protected HttpCodec.Extractor newExtractor( + Config config, Supplier traceConfigSupplier) { + return HaystackHttpCodec.newExtractor(config, traceConfigSupplier); } @TableTest({ @@ -126,72 +90,6 @@ void extractHeaderTagsWithNoPropagation() { assertEquals(singletonMap(SOME_TAG, "my-interesting-info"), context.getTags()); } - @Test - void extractHeadersWithForwarding() { - String forwardedIp = "1.2.3.4"; - String forwardedPort = "123"; - String forwarded = "for=" + forwardedIp + ":" + forwardedPort; - Map tagOnlyCtx = headers("Forwarded", forwarded); - // spotless:off - Map fullCtx = headers( - TRACE_ID_KEY, "1", - SPAN_ID_KEY, "2", - "Forwarded", forwarded - ); - // spotless:on - - TagContext context = this.extractor.extract(tagOnlyCtx, stringValuesMap()); - - assertNotNull(context); - assertFalse(context instanceof ExtractedContext); - assertEquals(forwarded, context.getForwarded()); - - context = this.extractor.extract(fullCtx, stringValuesMap()); - - assertInstanceOf(ExtractedContext.class, context); - assertEquals(1L, context.getTraceId().toLong()); - assertEquals(2L, context.getSpanId()); - assertEquals(forwarded, context.getForwarded()); - } - - @Test - void extractHeadersWithXForwarding() { - String forwardedIp = "1.2.3.4"; - String forwardedPort = "123"; - // spotless:off - Map tagOnlyCtx = headers( - "X-Forwarded-For", forwardedIp, - "X-Forwarded-Port", forwardedPort - ); - Map fullCtx = headers( - TRACE_ID_KEY, "1", - SPAN_ID_KEY, "2", - "x-forwarded-for", forwardedIp, - "x-forwarded-port", forwardedPort - ); - // spotless:on - - TagContext context = this.extractor.extract(tagOnlyCtx, stringValuesMap()); - - assertNotNull(context); - assertEquals(forwardedIp, context.getXForwardedFor()); - assertEquals(forwardedPort, context.getXForwardedPort()); - - context = this.extractor.extract(fullCtx, stringValuesMap()); - - assertInstanceOf(ExtractedContext.class, context); - assertEquals(1L, context.getTraceId().toLong()); - assertEquals(2L, context.getSpanId()); - assertEquals(forwardedIp, context.getXForwardedFor()); - assertEquals(forwardedPort, context.getXForwardedPort()); - } - - @Test - void extractEmptyHeadersReturnsNull() { - Map headers = singletonMap("ignored-header", "ignored-value"); - assertNull(this.extractor.extract(headers, stringValuesMap())); - } - @Test void extractHttpHeadersWithInvalidNonNumericId() { // spotless:off @@ -319,35 +217,4 @@ void extract128BitIdTruncatesIdTo64Bit( assertNull(context); } } - - @Test - void extractCommonHttpHeaders() { - // spotless:off - Map headers = headers( - HttpCodec.USER_AGENT_KEY, "some-user-agent", - HttpCodec.X_CLUSTER_CLIENT_IP_KEY, "1.1.1.1", - HttpCodec.X_REAL_IP_KEY, "2.2.2.2", - HttpCodec.X_CLIENT_IP_KEY, "3.3.3.3", - HttpCodec.TRUE_CLIENT_IP_KEY, "4.4.4.4", - HttpCodec.FORWARDED_FOR_KEY, "5.5.5.5", - HttpCodec.FORWARDED_KEY, "6.6.6.6", - HttpCodec.FASTLY_CLIENT_IP_KEY, "7.7.7.7", - HttpCodec.CF_CONNECTING_IP_KEY, "8.8.8.8", - HttpCodec.CF_CONNECTING_IP_V6_KEY, "9.9.9.9" - ); - // spotless:on - - TagContext context = this.extractor.extract(headers, stringValuesMap()); - - assertEquals("some-user-agent", context.getUserAgent()); - assertEquals("1.1.1.1", context.getXClusterClientIp()); - assertEquals("2.2.2.2", context.getXRealIp()); - assertEquals("3.3.3.3", context.getXClientIp()); - assertEquals("4.4.4.4", context.getTrueClientIp()); - assertEquals("5.5.5.5", context.getForwardedFor()); - assertEquals("6.6.6.6", context.getForwarded()); - assertEquals("7.7.7.7", context.getFastlyClientIp()); - assertEquals("8.8.8.8", context.getCfConnectingIp()); - assertEquals("9.9.9.9", context.getCfConnectingIpv6()); - } } diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/NoneHttpExtractorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/NoneHttpExtractorTest.java index 8bcc8ca9e6c..a4270f5447c 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/NoneHttpExtractorTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/NoneHttpExtractorTest.java @@ -1,9 +1,7 @@ package datadog.trace.core.propagation; -import static datadog.trace.api.config.TracerConfig.PROPAGATION_EXTRACT_LOG_HEADER_NAMES_ENABLED; import static datadog.trace.api.config.TracerConfig.REQUEST_HEADER_TAGS_COMMA_ALLOWED; import static datadog.trace.api.sampling.PrioritySampling.UNSET; -import static datadog.trace.bootstrap.ActiveSubsystems.APPSEC_ACTIVE; import static datadog.trace.bootstrap.instrumentation.api.ContextVisitors.stringValuesMap; import static datadog.trace.core.propagation.DatadogHttpCodec.DATADOG_TAGS_KEY; import static datadog.trace.core.propagation.DatadogHttpCodec.ORIGIN_KEY; @@ -15,7 +13,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertInstanceOf; -import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -24,54 +21,25 @@ import datadog.trace.api.DDSpanId; import datadog.trace.api.DDTraceId; import datadog.trace.api.DynamicConfig; -import datadog.trace.api.config.TracerConfig; +import datadog.trace.api.TraceConfig; import datadog.trace.api.internal.util.LongStringUtils; import datadog.trace.bootstrap.instrumentation.api.TagContext; import datadog.trace.junit.utils.config.WithConfig; import datadog.trace.junit.utils.converter.TraceIdConverter; -import datadog.trace.test.util.DDJavaSpecification; import java.util.HashMap; import java.util.Map; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; +import java.util.function.Supplier; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.converter.ConvertWith; import org.junit.jupiter.params.provider.ValueSource; import org.tabletest.junit.TableTest; -@WithConfig(key = PROPAGATION_EXTRACT_LOG_HEADER_NAMES_ENABLED, value = "true") -class NoneHttpExtractorTest extends DDJavaSpecification { - private static final String SOME_HEADER = "SOME_HEADER"; - private static final String SOME_CUSTOM_BAGGAGE_HEADER = "SOME_CUSTOM_BAGGAGE_HEADER"; - private static final String SOME_CUSTOM_BAGGAGE_HEADER_2 = "SOME_CUSTOM_BAGGAGE_HEADER_2"; - private static final String SOME_TAG = "some-tag"; - private static final String SOME_BAGGAGE = "some-baggage"; - private static final String SOME_CASE_SENSITIVE_BAGGAGE = "some-CaseSensitive-baggage"; - - private HttpCodec.Extractor extractor; - private boolean origAppSecActive; - - @BeforeEach - void setup() { - Map baggageMap = new HashMap<>(); - baggageMap.put(SOME_CUSTOM_BAGGAGE_HEADER, SOME_BAGGAGE); - baggageMap.put(SOME_CUSTOM_BAGGAGE_HEADER_2, SOME_CASE_SENSITIVE_BAGGAGE); - DynamicConfig dynamicConfig = - DynamicConfig.create() - .setHeaderTags(singletonMap(SOME_HEADER, SOME_TAG)) - .setBaggageMapping(baggageMap) - .apply(); - this.extractor = NoneCodec.newExtractor(Config.get(), dynamicConfig::captureTraceConfig); - - this.origAppSecActive = APPSEC_ACTIVE; - APPSEC_ACTIVE = true; - } - - @AfterEach - void teardown() { - APPSEC_ACTIVE = origAppSecActive; - this.extractor.cleanup(); +class NoneHttpExtractorTest extends AbstractHttpExtractorTest { + @Override + protected HttpCodec.Extractor newExtractor( + Config config, Supplier traceConfigSupplier) { + return NoneCodec.newExtractor(config, traceConfigSupplier); } @TableTest({ @@ -165,114 +133,6 @@ void extractHeaderTagsWithNoPropagation(boolean withOrigin) { assertNull(context.getOrigin()); } - @Test - void extractHeadersWithForwarding() { - String forwardedIp = "1.2.3.4"; - String forwardedPort = "1234"; - String forwarded = "for=" + forwardedIp + ":" + forwardedPort; - Map tagOnlyCtx = headers("Forwarded", forwarded); - // spotless:off - Map fullCtx = headers( - TRACE_ID_KEY, "1", - SPAN_ID_KEY, "2", - "Forwarded", forwarded - ); - // spotless:on - - TagContext context = this.extractor.extract(tagOnlyCtx, stringValuesMap()); - - assertNotNull(context); - assertFalse(context instanceof ExtractedContext); - assertEquals(forwarded, context.getForwarded()); - - context = this.extractor.extract(fullCtx, stringValuesMap()); - - assertFalse(context instanceof ExtractedContext); - assertEquals(DDTraceId.ZERO, context.getTraceId()); - assertEquals(DDSpanId.ZERO, context.getSpanId()); - assertEquals(forwarded, context.getForwarded()); - } - - @Test - void extractHeadersWithXForwarding() { - String forwardedIp = "1.2.3.4"; - String forwardedPort = "1234"; - // spotless:off - Map tagOnlyCtx = headers( - "X-Forwarded-For", forwardedIp, - "X-Forwarded-Port", forwardedPort - ); - Map fullCtx = headers( - TRACE_ID_KEY, "1", - SPAN_ID_KEY, "2", - "x-forwarded-for", forwardedIp, - "x-forwarded-port", forwardedPort - ); - // spotless:on - - TagContext context = this.extractor.extract(tagOnlyCtx, stringValuesMap()); - - assertNotNull(context); - assertFalse(context instanceof ExtractedContext); - assertEquals(forwardedIp, context.getXForwardedFor()); - assertEquals(forwardedPort, context.getXForwardedPort()); - - context = this.extractor.extract(fullCtx, stringValuesMap()); - - assertFalse(context instanceof ExtractedContext); - assertEquals(DDTraceId.ZERO, context.getTraceId()); - assertEquals(0L, context.getSpanId()); - assertEquals(forwardedIp, context.getXForwardedFor()); - assertEquals(forwardedPort, context.getXForwardedPort()); - } - - @Test - void extractEmptyHeadersReturnsNull() { - assertNull( - this.extractor.extract(headers("ignored-header", "ignored-value"), stringValuesMap())); - } - - @Test - @WithConfig(key = TracerConfig.TRACE_CLIENT_IP_RESOLVER_ENABLED, value = "false") - void extractHeadersWithIpResolutionDisabled() { - Map tagOnlyCtx = new HashMap<>(); - tagOnlyCtx.put("X-Forwarded-For", "::1"); - tagOnlyCtx.put("User-agent", "foo/bar"); - - TagContext context = this.extractor.extract(tagOnlyCtx, stringValuesMap()); - - assertNotNull(context); - assertNull(context.getXForwardedFor()); - assertEquals("foo/bar", context.getUserAgent()); - } - - @Test - void extractHeadersWithIpResolutionDisabledAppsecDisabled() { - APPSEC_ACTIVE = false; - Map tagOnlyCtx = new HashMap<>(); - tagOnlyCtx.put("X-Forwarded-For", "::1"); - tagOnlyCtx.put("User-agent", "foo/bar"); - - TagContext context = this.extractor.extract(tagOnlyCtx, stringValuesMap()); - - assertNotNull(context); - assertNull(context.getXForwardedFor()); - } - - @Test - @WithConfig(key = TracerConfig.TRACE_CLIENT_IP_HEADER, value = "my-header") - void customIpHeaderCollectionDoesNotDisableStandardIpHeaderCollection() { - Map tagOnlyCtx = new HashMap<>(); - tagOnlyCtx.put("X-Forwarded-For", "::1"); - tagOnlyCtx.put("My-Header", "8.8.8.8"); - - TagContext context = this.extractor.extract(tagOnlyCtx, stringValuesMap()); - - assertNotNull(context); - assertEquals("::1", context.getXForwardedFor()); - assertEquals("8.8.8.8", context.getCustomIpHeader()); - } - @TableTest({ "scenario | hexId ", "64-bit short | '1' ", @@ -322,34 +182,4 @@ void extractHttpHeadersWithInvalidNonNumericId() { assertInstanceOf(TagContext.class, context); assertEquals(singletonMap(SOME_TAG, "my-interesting-info"), context.getTags()); } - - @Test - void extractCommonHttpHeaders() { - // spotless:off - Map headers = headers( - HttpCodec.USER_AGENT_KEY, "some-user-agent", - HttpCodec.X_CLUSTER_CLIENT_IP_KEY, "1.1.1.1", - HttpCodec.X_REAL_IP_KEY, "2.2.2.2", - HttpCodec.X_CLIENT_IP_KEY, "3.3.3.3", - HttpCodec.TRUE_CLIENT_IP_KEY, "4.4.4.4", - HttpCodec.FORWARDED_FOR_KEY, "5.5.5.5", - HttpCodec.FORWARDED_KEY, "6.6.6.6", - HttpCodec.FASTLY_CLIENT_IP_KEY, "7.7.7.7", - HttpCodec.CF_CONNECTING_IP_KEY, "8.8.8.8", - HttpCodec.CF_CONNECTING_IP_V6_KEY, "9.9.9.9"); - // spotless:on - - TagContext context = this.extractor.extract(headers, stringValuesMap()); - - assertEquals("some-user-agent", context.getUserAgent()); - assertEquals("1.1.1.1", context.getXClusterClientIp()); - assertEquals("2.2.2.2", context.getXRealIp()); - assertEquals("3.3.3.3", context.getXClientIp()); - assertEquals("4.4.4.4", context.getTrueClientIp()); - assertEquals("5.5.5.5", context.getForwardedFor()); - assertEquals("6.6.6.6", context.getForwarded()); - assertEquals("7.7.7.7", context.getFastlyClientIp()); - assertEquals("8.8.8.8", context.getCfConnectingIp()); - assertEquals("9.9.9.9", context.getCfConnectingIpv6()); - } } diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/W3CHttpExtractorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/W3CHttpExtractorTest.java index 510a0e9a5f0..3047d2c5c66 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/W3CHttpExtractorTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/W3CHttpExtractorTest.java @@ -1,9 +1,5 @@ package datadog.trace.core.propagation; -import static datadog.trace.api.config.TracerConfig.PROPAGATION_EXTRACT_LOG_HEADER_NAMES_ENABLED; -import static datadog.trace.api.config.TracerConfig.TRACE_CLIENT_IP_HEADER; -import static datadog.trace.api.config.TracerConfig.TRACE_CLIENT_IP_RESOLVER_ENABLED; -import static datadog.trace.bootstrap.ActiveSubsystems.APPSEC_ACTIVE; import static datadog.trace.bootstrap.instrumentation.api.ContextVisitors.stringValuesMap; import static datadog.trace.core.propagation.HttpCodecTestHelper.headers; import static datadog.trace.core.propagation.W3CHttpCodec.OT_BAGGAGE_PREFIX; @@ -21,17 +17,14 @@ import datadog.trace.api.DD64bTraceId; import datadog.trace.api.DDSpanId; import datadog.trace.api.DDTraceId; -import datadog.trace.api.DynamicConfig; +import datadog.trace.api.TraceConfig; import datadog.trace.bootstrap.instrumentation.api.TagContext; -import datadog.trace.junit.utils.config.WithConfig; import datadog.trace.junit.utils.converter.PrioritySamplingConverter; import datadog.trace.junit.utils.converter.SamplingMechanismConverter; -import datadog.trace.test.util.DDJavaSpecification; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; +import java.util.function.Supplier; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ParameterContext; import org.junit.jupiter.params.ParameterizedTest; @@ -41,9 +34,7 @@ import org.junit.jupiter.params.provider.ValueSource; import org.tabletest.junit.TableTest; -@WithConfig(key = PROPAGATION_EXTRACT_LOG_HEADER_NAMES_ENABLED, value = "true") -class W3CHttpExtractorTest extends DDJavaSpecification { - +class W3CHttpExtractorTest extends AbstractHttpExtractorTest { private static final long TEST_SPAN_ID = 1311768467463790320L; private static final DDTraceId TRACE_ID_ONE = DDTraceId.fromHex("00000000000000000000000000000001"); @@ -51,33 +42,11 @@ class W3CHttpExtractorTest extends DDJavaSpecification { DDTraceId.fromHex("0000000000000000ffffffffffffffff"); private static final DDTraceId TRACE_ID_LOW_MAX = DDTraceId.fromHex("123456789abcdef0ffffffffffffffff"); - private static final String SOME_HEADER = "SOME_HEADER"; - private static final String SOME_CUSTOM_BAGGAGE_HEADER = "SOME_CUSTOM_BAGGAGE_HEADER"; - private static final String SOME_CUSTOM_BAGGAGE_HEADER_2 = "SOME_CUSTOM_BAGGAGE_HEADER_2"; - private static final String SOME_ARBITRARY_HEADER = "SOME_ARBITRARY_HEADER"; - - private HttpCodec.Extractor extractor; - private boolean origAppSecActive; - @BeforeEach - void setup() { - Map baggageMap = new HashMap<>(); - baggageMap.put(SOME_CUSTOM_BAGGAGE_HEADER, "some-baggage"); - baggageMap.put(SOME_CUSTOM_BAGGAGE_HEADER_2, "some-CaseSensitive-baggage"); - DynamicConfig dynamicConfig = - DynamicConfig.create() - .setHeaderTags(singletonMap(SOME_HEADER, "some-tag")) - .setBaggageMapping(baggageMap) - .apply(); - this.extractor = W3CHttpCodec.newExtractor(Config.get(), dynamicConfig::captureTraceConfig); - this.origAppSecActive = APPSEC_ACTIVE; - APPSEC_ACTIVE = true; - } - - @AfterEach - void teardown() { - this.extractor.cleanup(); - APPSEC_ACTIVE = origAppSecActive; + @Override + protected HttpCodec.Extractor newExtractor( + Config config, Supplier traceConfigSupplier) { + return W3CHttpCodec.newExtractor(config, traceConfigSupplier); } @TableTest({ @@ -199,121 +168,6 @@ void extractHeaderTagsWithNoPropagation() { assertEquals(singletonMap("some-tag", "my-interesting-info"), context.getTags()); } - @Test - void extractHeadersWithForwarding() { - String forwardedIp = "1.2.3.4"; - String forwardedPort = "1234"; - String forwarded = "for=" + forwardedIp + ":" + forwardedPort; - Map tagOnlyCtx = headers("Forwarded", forwarded); - // spotless:off - Map fullCtx = headers( - TRACE_PARENT_KEY, "00-00000000000000000000000000000001-0000000000000002-01", - "Forwarded", forwarded - ); - // spotless:on - - TagContext context = this.extractor.extract(tagOnlyCtx, stringValuesMap()); - - assertNotNull(context); - assertFalse(context instanceof ExtractedContext); - assertEquals(forwarded, context.getForwarded()); - - context = this.extractor.extract(fullCtx, stringValuesMap()); - - assertInstanceOf(ExtractedContext.class, context); - assertEquals(1L, context.getTraceId().toLong()); - assertEquals(2L, context.getSpanId()); - assertEquals(forwarded, context.getForwarded()); - } - - @Test - void extractHeadersWithXForwarding() { - String forwardedIp = "1.2.3.4"; - String forwardedPort = "1234"; - // spotless:off - Map tagOnlyCtx = headers( - "X-Forwarded-For", forwardedIp, - "X-Forwarded-Port", forwardedPort - ); - Map fullCtx = headers( - TRACE_PARENT_KEY, "00-00000000000000000000000000000001-0000000000000002-01", - "x-forwarded-for", forwardedIp, - "x-forwarded-port", forwardedPort - ); - // spotless:on - - TagContext context = this.extractor.extract(tagOnlyCtx, stringValuesMap()); - - assertNotNull(context); - assertFalse(context instanceof ExtractedContext); - assertEquals(forwardedIp, context.getXForwardedFor()); - assertEquals(forwardedPort, context.getXForwardedPort()); - - context = this.extractor.extract(fullCtx, stringValuesMap()); - - assertInstanceOf(ExtractedContext.class, context); - assertEquals(1L, context.getTraceId().toLong()); - assertEquals(2L, context.getSpanId()); - assertEquals(forwardedIp, context.getXForwardedFor()); - assertEquals(forwardedPort, context.getXForwardedPort()); - } - - @Test - void extractEmptyHeadersReturnsNull() { - assertNull( - this.extractor.extract(headers("ignored-header", "ignored-value"), stringValuesMap())); - } - - @Test - @WithConfig(key = TRACE_CLIENT_IP_RESOLVER_ENABLED, value = "false") - void extractHeadersWithIpResolutionDisabled() { - // spotless:off - Map tagOnlyCtx = headers( - "X-Forwarded-For", "::1", - "User-agent", "foo/bar" - ); - // spotless:on - - TagContext ctx = this.extractor.extract(tagOnlyCtx, stringValuesMap()); - - assertNotNull(ctx); - assertNull(ctx.getXForwardedFor()); - assertEquals("foo/bar", ctx.getUserAgent()); - } - - @Test - void extractHeadersWithIpResolutionDisabledAppsecDisabled() { - APPSEC_ACTIVE = false; - // spotless:off - Map tagOnlyCtx = headers( - "X-Forwarded-For", "::1", - "User-agent", "foo/bar" - ); - // spotless:on - - TagContext ctx = this.extractor.extract(tagOnlyCtx, stringValuesMap()); - - assertNotNull(ctx); - assertNull(ctx.getXForwardedFor()); - } - - @Test - @WithConfig(key = TRACE_CLIENT_IP_HEADER, value = "my-header") - void customIpHeaderCollectionDoesNotDisableStandardIpHeaderCollection() { - // spotless:off - Map tagOnlyCtx = headers( - "X-Forwarded-For", "::1", - "My-Header", "8.8.8.8" - ); - // spotless:on - - TagContext ctx = extractor.extract(tagOnlyCtx, stringValuesMap()); - - assertNotNull(ctx); - assertEquals("::1", ctx.getXForwardedFor()); - assertEquals("8.8.8.8", ctx.getCustomIpHeader()); - } - @TableTest({ "scenario | endToEndStartTime", "zero start time | 0 ", @@ -378,37 +232,6 @@ void baggageIsMappedOnContextCreation(boolean tpValid, String traceparent) { assertEquals(expectedBaggage, context.getBaggage()); } - @Test - void extractCommonHttpHeaders() { - // spotless:off - Map headers = headers( - HttpCodec.USER_AGENT_KEY, "some-user-agent", - HttpCodec.X_CLUSTER_CLIENT_IP_KEY, "1.1.1.1", - HttpCodec.X_REAL_IP_KEY, "2.2.2.2", - HttpCodec.X_CLIENT_IP_KEY, "3.3.3.3", - HttpCodec.TRUE_CLIENT_IP_KEY, "4.4.4.4", - HttpCodec.FORWARDED_FOR_KEY, "5.5.5.5", - HttpCodec.FORWARDED_KEY, "6.6.6.6", - HttpCodec.FASTLY_CLIENT_IP_KEY, "7.7.7.7", - HttpCodec.CF_CONNECTING_IP_KEY, "8.8.8.8", - HttpCodec.CF_CONNECTING_IP_V6_KEY, "9.9.9.9" - ); - // spotless:on - - TagContext context = extractor.extract(headers, stringValuesMap()); - - assertEquals("some-user-agent", context.getUserAgent()); - assertEquals("1.1.1.1", context.getXClusterClientIp()); - assertEquals("2.2.2.2", context.getXRealIp()); - assertEquals("3.3.3.3", context.getXClientIp()); - assertEquals("4.4.4.4", context.getTrueClientIp()); - assertEquals("5.5.5.5", context.getForwardedFor()); - assertEquals("6.6.6.6", context.getForwarded()); - assertEquals("7.7.7.7", context.getFastlyClientIp()); - assertEquals("8.8.8.8", context.getCfConnectingIp()); - assertEquals("9.9.9.9", context.getCfConnectingIpv6()); - } - @TableTest({ "scenario | traceparent | tracestate | consistent", "empty state | '00-123456789abcdef00fedcba987654321-123456789abcdef0-01' | '' | true ", diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/XRayHttpExtractorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/XRayHttpExtractorTest.java index fa2673c7031..f661d7fe5ed 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/XRayHttpExtractorTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/XRayHttpExtractorTest.java @@ -1,62 +1,31 @@ package datadog.trace.core.propagation; -import static datadog.trace.bootstrap.ActiveSubsystems.APPSEC_ACTIVE; import static datadog.trace.bootstrap.instrumentation.api.ContextVisitors.stringValuesMap; import static datadog.trace.core.propagation.HttpCodecTestHelper.headers; import static datadog.trace.core.propagation.XRayHttpCodec.X_AMZN_TRACE_ID; import static java.util.Collections.singletonMap; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertInstanceOf; -import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import datadog.trace.api.Config; import datadog.trace.api.DDSpanId; import datadog.trace.api.DDTraceId; -import datadog.trace.api.DynamicConfig; -import datadog.trace.api.config.TracerConfig; +import datadog.trace.api.TraceConfig; import datadog.trace.bootstrap.instrumentation.api.TagContext; -import datadog.trace.junit.utils.config.WithConfig; import datadog.trace.junit.utils.converter.PrioritySamplingConverter; -import datadog.trace.test.util.DDJavaSpecification; import java.util.HashMap; import java.util.Map; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; +import java.util.function.Supplier; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.converter.ConvertWith; import org.tabletest.junit.TableTest; -@WithConfig(key = TracerConfig.PROPAGATION_EXTRACT_LOG_HEADER_NAMES_ENABLED, value = "true") -class XRayHttpExtractorTest extends DDJavaSpecification { - - private static final String SOME_HEADER = "SOME_HEADER"; - private static final String SOME_CUSTOM_BAGGAGE_HEADER = "SOME_CUSTOM_BAGGAGE_HEADER"; - private static final String SOME_CUSTOM_BAGGAGE_HEADER_2 = "SOME_CUSTOM_BAGGAGE_HEADER_2"; - - private HttpCodec.Extractor extractor; - private boolean origAppSecActive; - - @BeforeEach - void setup() { - Map baggageMap = new HashMap<>(); - baggageMap.put(SOME_CUSTOM_BAGGAGE_HEADER, "some-baggage"); - baggageMap.put(SOME_CUSTOM_BAGGAGE_HEADER_2, "some-CaseSensitive-baggage"); - DynamicConfig dynamicConfig = - DynamicConfig.create() - .setHeaderTags(singletonMap(SOME_HEADER, "some-tag")) - .setBaggageMapping(baggageMap) - .apply(); - this.extractor = XRayHttpCodec.newExtractor(Config.get(), dynamicConfig::captureTraceConfig); - - this.origAppSecActive = APPSEC_ACTIVE; - APPSEC_ACTIVE = true; - } - - @AfterEach - void teardown() { - APPSEC_ACTIVE = this.origAppSecActive; +class XRayHttpExtractorTest extends AbstractHttpExtractorTest { + @Override + protected HttpCodec.Extractor newExtractor( + Config config, Supplier traceConfigSupplier) { + return XRayHttpCodec.newExtractor(config, traceConfigSupplier); } @TableTest({ @@ -111,71 +80,6 @@ void extractHeaderTagsWithNoPropagation() { assertEquals(singletonMap("some-tag", "my-interesting-info"), context.getTags()); } - @Test - void extractHeadersWithForwarding() { - String forwardedIp = "1.2.3.4"; - String forwardedPort = "1234"; - String forwarded = "for=" + forwardedIp + ":" + forwardedPort; - Map tagOnlyCtx = headers("Forwarded", forwarded); - // spotless:off - Map fullCtx = headers( - X_AMZN_TRACE_ID, "Root=1-00000000-000000000000000000000001;Parent=0000000000000002", - "Forwarded", forwarded - ); - // spotless:on - - TagContext context = this.extractor.extract(tagOnlyCtx, stringValuesMap()); - - assertNotNull(context); - assertFalse(context instanceof ExtractedContext); - assertEquals(forwarded, context.getForwarded()); - - context = this.extractor.extract(fullCtx, stringValuesMap()); - - assertInstanceOf(ExtractedContext.class, context); - assertEquals(1L, context.getTraceId().toLong()); - assertEquals(2L, context.getSpanId()); - assertEquals(forwarded, context.getForwarded()); - } - - @Test - void extractHeadersWithXForwarding() { - String forwardedIp = "1.2.3.4"; - String forwardedPort = "1234"; - // spotless:off - Map tagOnlyCtx = headers( - "X-Forwarded-For", forwardedIp, - "X-Forwarded-Port", forwardedPort - ); - Map fullCtx = headers( - "x-amzn-trace-id", "Root=1-00000000-000000000000000000000001;Parent=0000000000000002", - "x-forwarded-for", forwardedIp, - "x-forwarded-port", forwardedPort - ); - // spotless:on - - TagContext context = this.extractor.extract(tagOnlyCtx, stringValuesMap()); - - assertNotNull(context); - assertFalse(context instanceof ExtractedContext); - assertEquals(forwardedIp, context.getXForwardedFor()); - assertEquals(forwardedPort, context.getXForwardedPort()); - - context = this.extractor.extract(fullCtx, stringValuesMap()); - - assertInstanceOf(ExtractedContext.class, context); - assertEquals(1L, context.getTraceId().toLong()); - assertEquals(2L, context.getSpanId()); - assertEquals(forwardedIp, context.getXForwardedFor()); - assertEquals(forwardedPort, context.getXForwardedPort()); - } - - @Test - void noContextWithEmptyHeaders() { - assertNull( - this.extractor.extract(headers("ignored-header", "ignored-value"), stringValuesMap())); - } - @Test void noContextWithInvalidNonNumericId() { // spotless:off @@ -268,35 +172,4 @@ void extractHeadersWithEndToEnd(String traceId, String spanId, long endToEndStar assertEquals(expectedBaggage, context.getBaggage()); assertEquals(endToEndStartTime * 1_000_000L, context.getEndToEndStartTime()); } - - @Test - void extractCommonHttpHeaders() { - // spotless:off - Map headers = headers( - HttpCodec.USER_AGENT_KEY, "some-user-agent", - HttpCodec.X_CLUSTER_CLIENT_IP_KEY, "1.1.1.1", - HttpCodec.X_REAL_IP_KEY, "2.2.2.2", - HttpCodec.X_CLIENT_IP_KEY, "3.3.3.3", - HttpCodec.TRUE_CLIENT_IP_KEY, "4.4.4.4", - HttpCodec.FORWARDED_FOR_KEY, "5.5.5.5", - HttpCodec.FORWARDED_KEY, "6.6.6.6", - HttpCodec.FASTLY_CLIENT_IP_KEY, "7.7.7.7", - HttpCodec.CF_CONNECTING_IP_KEY, "8.8.8.8", - HttpCodec.CF_CONNECTING_IP_V6_KEY, "9.9.9.9" - ); - // spotless:on - - TagContext context = this.extractor.extract(headers, stringValuesMap()); - - assertEquals("some-user-agent", context.getUserAgent()); - assertEquals("1.1.1.1", context.getXClusterClientIp()); - assertEquals("2.2.2.2", context.getXRealIp()); - assertEquals("3.3.3.3", context.getXClientIp()); - assertEquals("4.4.4.4", context.getTrueClientIp()); - assertEquals("5.5.5.5", context.getForwardedFor()); - assertEquals("6.6.6.6", context.getForwarded()); - assertEquals("7.7.7.7", context.getFastlyClientIp()); - assertEquals("8.8.8.8", context.getCfConnectingIp()); - assertEquals("9.9.9.9", context.getCfConnectingIpv6()); - } } From 40ec36ca2c6bd4b45def0a91fecb3554939751b9 Mon Sep 17 00:00:00 2001 From: Andrea Marziali Date: Mon, 22 Jun 2026 10:22:58 +0200 Subject: [PATCH 012/139] Improve crash report message when signal is absent (#11681) Improve crash report message when signal is absent Co-authored-by: andrea.marziali --- .../parsers/HotspotCrashLogParser.java | 7 +++++-- .../parsers/J9JavacoreParser.java | 4 ++-- .../parsers/HotspotCrashLogParserTest.java | 21 +++++++++++++++++++ .../parsers/J9JavacoreParserTest.java | 18 ++++++++++++++++ 4 files changed, 46 insertions(+), 4 deletions(-) diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/parsers/HotspotCrashLogParser.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/parsers/HotspotCrashLogParser.java index 33985ebc65c..0c01f6b57a9 100644 --- a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/parsers/HotspotCrashLogParser.java +++ b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/parsers/HotspotCrashLogParser.java @@ -550,9 +550,12 @@ public CrashLog parse(String uuid, String crashLog) { if (oomMessage != null) { kind = "OutOfMemory"; message = oomMessage; - } else { - kind = sigInfo != null && sigInfo.name != null ? sigInfo.name : "UNKNOWN"; + } else if (sigInfo != null && sigInfo.name != null) { + kind = sigInfo.name; message = "Process terminated by signal " + kind; + } else { + kind = "InternalError"; + message = "Process terminated by Internal error"; } final List enrichedFrames = new ArrayList<>(frames.size()); diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/parsers/J9JavacoreParser.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/parsers/J9JavacoreParser.java index 1d7214dde6d..f13896b0dca 100644 --- a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/parsers/J9JavacoreParser.java +++ b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/parsers/J9JavacoreParser.java @@ -257,8 +257,8 @@ public CrashLog parse(String uuid, String javacoreContent) { : eventType.toUpperCase(Locale.ROOT); message = "Process terminated by signal " + kind; } else { - kind = "UNKNOWN"; - message = "Unknown crash event"; + kind = "InternalError"; + message = "Process terminated by Internal error"; } // Enrich frames with build IDs (best effort) diff --git a/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/parsers/HotspotCrashLogParserTest.java b/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/parsers/HotspotCrashLogParserTest.java index 0abe9c8921d..2008ac78e05 100644 --- a/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/parsers/HotspotCrashLogParserTest.java +++ b/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/parsers/HotspotCrashLogParserTest.java @@ -49,6 +49,8 @@ public void testIncompleteParsing() throws Exception { assertNotNull(crashLog.error.stack); assertNotNull(crashLog.error.stack.frames); assertEquals(0, crashLog.error.stack.frames.length); + assertEquals("InternalError", crashLog.error.kind); + assertEquals("Process terminated by Internal error", crashLog.error.message); } /** macOS aarch64 uses lowercase register names: x0-x28, fp, lr, sp, pc, cpsr */ @@ -335,6 +337,25 @@ public void testParseCurrentThreadName(String line, String expected) { HotspotCrashLogParser.parseCurrentThreadName(line)); } + @Test + public void testNoSignalProducesInternalError() throws Exception { + // A crash log that reaches the PROCESS section but has no siginfo line + String crashLog = + "# A fatal error has been detected by the Java Runtime Environment:\n" + + "#\n" + + "# Core dump will be written.\n" + + "--------------- T H R E A D ---------------\n" + + "Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)\n" + + "--------------- P R O C E S S ---------------\n"; + + CrashLog result = new HotspotCrashLogParser().parse(UUID.randomUUID().toString(), crashLog); + + assertNotNull(result); + assertFalse(result.incomplete); + assertEquals("InternalError", result.error.kind); + assertEquals("Process terminated by Internal error", result.error.message); + } + private String readFileAsString(String resource) throws IOException { try (InputStream stream = getClass().getClassLoader().getResourceAsStream(resource)) { return new BufferedReader( diff --git a/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/parsers/J9JavacoreParserTest.java b/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/parsers/J9JavacoreParserTest.java index 63ffe0fbe10..cab2a9a457e 100644 --- a/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/parsers/J9JavacoreParserTest.java +++ b/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/parsers/J9JavacoreParserTest.java @@ -212,6 +212,24 @@ public void testDateTimeParsing() throws Exception { "Expected ISO-8601 format, got: " + crashLog.timestamp); } + @Test + public void testNoSignalProducesInternalError() throws Exception { + // A javacore with a THREADS section but no 1TISIGINFO line + String javacoreContent = + "0SECTION TITLE subcomponent dump routine\n" + + "NULL ===============================\n" + + "1TICHARSET UTF-8\n" + + "NULL ------------------------------------------------------------------------\n" + + "0SECTION THREADS subcomponent dump routine\n" + + "NULL =================================\n"; + + CrashLog result = new J9JavacoreParser().parse(UUID.randomUUID().toString(), javacoreContent); + + assertNotNull(result); + assertEquals("InternalError", result.error.kind); + assertEquals("Process terminated by Internal error", result.error.message); + } + private String readFileAsString(String resource) throws IOException { try (InputStream stream = getClass().getClassLoader().getResourceAsStream(resource)) { return new BufferedReader( From 504877c36e8542495fcfe7c776e6e83feed0f3c3 Mon Sep 17 00:00:00 2001 From: Andrea Marziali Date: Mon, 22 Jun 2026 12:55:33 +0200 Subject: [PATCH 013/139] Remove testcontainer dependencies for buildId tests (#11689) Remove testcontainer dependencies for buildId tests Co-authored-by: devflow.devflow-routing-intake --- .../agent-crashtracking/build.gradle | 1 - .../BuildIdExtractorIntegrationTest.java | 200 +++--------------- .../test/resources/buildid/elf/elf32-le.so | Bin 0 -> 116 bytes .../test/resources/buildid/elf/elf64-be.so | Bin 0 -> 156 bytes .../test/resources/buildid/elf/elf64-le.so | Bin 0 -> 156 bytes .../buildid/pe/pe32-single-entry.dll | Bin 0 -> 404 bytes .../buildid/pe/pe32plus-multi-entry.dll | Bin 0 -> 448 bytes .../buildid/pe/pe32plus-single-entry.dll | Bin 0 -> 420 bytes 8 files changed, 27 insertions(+), 174 deletions(-) create mode 100644 dd-java-agent/agent-crashtracking/src/test/resources/buildid/elf/elf32-le.so create mode 100644 dd-java-agent/agent-crashtracking/src/test/resources/buildid/elf/elf64-be.so create mode 100644 dd-java-agent/agent-crashtracking/src/test/resources/buildid/elf/elf64-le.so create mode 100644 dd-java-agent/agent-crashtracking/src/test/resources/buildid/pe/pe32-single-entry.dll create mode 100644 dd-java-agent/agent-crashtracking/src/test/resources/buildid/pe/pe32plus-multi-entry.dll create mode 100644 dd-java-agent/agent-crashtracking/src/test/resources/buildid/pe/pe32plus-single-entry.dll diff --git a/dd-java-agent/agent-crashtracking/build.gradle b/dd-java-agent/agent-crashtracking/build.gradle index af93daaeb0a..663611c6cf3 100644 --- a/dd-java-agent/agent-crashtracking/build.gradle +++ b/dd-java-agent/agent-crashtracking/build.gradle @@ -28,7 +28,6 @@ dependencies { testImplementation libs.assertj.core testImplementation libs.json.unit.assertj testImplementation libs.jackson.databind - testImplementation libs.testcontainers testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: libs.versions.okhttp.legacy.get() } diff --git a/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/buildid/BuildIdExtractorIntegrationTest.java b/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/buildid/BuildIdExtractorIntegrationTest.java index 14c14a6a97d..27a34360b0a 100644 --- a/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/buildid/BuildIdExtractorIntegrationTest.java +++ b/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/buildid/BuildIdExtractorIntegrationTest.java @@ -1,204 +1,58 @@ package datadog.crashtracking.buildid; -import static datadog.environment.OperatingSystem.architecture; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assumptions.assumeFalse; -import java.io.IOException; -import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import java.time.Duration; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import java.util.stream.Stream; -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.io.TempDir; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.MethodSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.testcontainers.containers.Container.ExecResult; -import org.testcontainers.containers.GenericContainer; -import org.testcontainers.utility.DockerImageName; +import org.tabletest.junit.TableTest; /** - * Integration tests for BuildIdExtractor implementations using Docker containers. Tests validate - * build ID extraction from real ELF (Unix/Linux) and PE (Windows) binaries. + * Tests for BuildIdExtractor implementations using synthetic minimal fixture files committed to + * test resources. Fixtures cover ELF64/ELF32, little/big-endian, and PE32/PE32+ formats. */ public class BuildIdExtractorIntegrationTest { - private static final String DOTNET_SDK_MAJOR_VERSION = "8.0"; - private static GenericContainer linuxContainer; - private static GenericContainer dotnetContainer; - @TempDir private static Path tempDir; private static final Logger logger = LoggerFactory.getLogger(BuildIdExtractorIntegrationTest.class); - private static String dotnetVersion; - @BeforeAll - static void startContainers() throws IOException { - // Start Ubuntu container for ELF testing - // Use linux/amd64 platform to ensure x86_64 binaries are available - linuxContainer = - new GenericContainer<>( - DockerImageName.parse("ubuntu:22.04").asCompatibleSubstituteFor("ubuntu")) - .withCommand("sleep", "infinity") - .withStartupTimeout(Duration.ofMinutes(2)); - linuxContainer.start(); - - // Start dotnet SDK container for PE testing - // Use linux/amd64 platform to ensure consistent binary format - dotnetContainer = - new GenericContainer<>( - DockerImageName.parse("mcr.microsoft.com/dotnet/sdk:" + DOTNET_SDK_MAJOR_VERSION) - .asCompatibleSubstituteFor("dotnet")) - .withCommand("sleep", "infinity") - .withStartupTimeout(Duration.ofMinutes(2)); - dotnetContainer.start(); - - dotnetVersion = discoverExactDotnetVersionFrom(dotnetContainer); - } - - /** - * Discovers the .NET Core runtime version installed in the container by listing available - * versions. - * - * @param dotnetContainer the dotNet SDK container - * @return the discovered .NET version string - */ - private static String discoverExactDotnetVersionFrom(GenericContainer dotnetContainer) - throws IOException { - try { - ExecResult execResult = - dotnetContainer.execInContainer("ls", "/usr/share/dotnet/shared/Microsoft.NETCore.App"); - if (execResult.getExitCode() == 0) { - Pattern pattern = - Pattern.compile( - "^" + Pattern.quote(DOTNET_SDK_MAJOR_VERSION) + "\\.\\d+$", Pattern.MULTILINE); - Matcher matcher = pattern.matcher(execResult.getStdout()); - if (matcher.find()) { - return matcher.group(); - } - throw new IOException( - "No .NET " + DOTNET_SDK_MAJOR_VERSION + " version found in container"); - } - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); - throw new IOException("Interrupted while discovering .NET version", e); - } - - throw new IOException("Failed to list .NET versions in container"); - } - - @AfterAll - static void stopContainers() throws IOException { - // Stop containers - if (linuxContainer != null) { - linuxContainer.stop(); - } - if (dotnetContainer != null) { - dotnetContainer.stop(); - } - } - - /** - * Copy a binary file from a container to the local temp directory. - * - * @param container The container to copy from - * @param containerPath Path to the binary inside the container - * @return Path to the copied binary in the local temp directory - */ - private Path copyFromContainer(GenericContainer container, String containerPath) - throws IOException { - String filename = Paths.get(containerPath).getFileName().toString(); - Path localPath = tempDir.resolve(filename + "-" + System.nanoTime()); - - container.copyFileFromContainer(containerPath, localPath.toString()); - - if (!Files.exists(localPath) || Files.size(localPath) == 0) { - throw new IOException("Failed to copy binary: " + containerPath); - } - - return localPath; - } - - private static Stream elfBinaries() { - return Stream.of( - Arguments.of("/lib/x86_64-linux-gnu/libc.so.6", "GNU C Library"), - Arguments.of("/lib/x86_64-linux-gnu/libm.so.6", "Math library"), - Arguments.of("/lib/x86_64-linux-gnu/libpthread.so.0", "POSIX threads library")); - } - - @ParameterizedTest(name = "ELF: {1}") - @MethodSource("elfBinaries") - void testElfBuildIdExtraction(String containerPath, String description) throws Exception { - // TODO: check if arm64 can be supported too. - assumeFalse(architecture().isArm64(), "Skipping for arm64"); - Path localBinary = copyFromContainer(linuxContainer, containerPath); + @TableTest({ + "scenario | resource | expectedBuildId ", + "ELF64 little-endian | buildid/elf/elf64-le.so | 0123456789abcdef0123456789abcdefdeadbeef", + "ELF32 little-endian | buildid/elf/elf32-le.so | deadbeefcafebabe123456789abcdef0 ", + "ELF64 big-endian | buildid/elf/elf64-be.so | ff00112233445566778899aabbccddeeff000102" + }) + void testElfBuildIdExtraction(String resource, String expectedBuildId) throws Exception { + Path file = Paths.get(getClass().getClassLoader().getResource(resource).toURI()); ElfBuildIdExtractor extractor = new ElfBuildIdExtractor(); - String buildId = extractor.extractBuildId(localBinary); + String buildId = extractor.extractBuildId(file); - logger.info("Found build ID: {} for library {}", buildId, localBinary); + logger.info("Found build ID: {} for {}", buildId, resource); - assertNotNull(buildId, "Build ID should be found for " + description); - assertTrue( - buildId.matches("^[0-9a-f]{32,40}$"), "Build ID should be 32-40 hex chars: " + buildId); + assertNotNull(buildId, "Build ID should be found for " + resource); + assertEquals(expectedBuildId, buildId, "Build ID mismatch for " + resource); assertEquals(BuildInfo.FileType.ELF, extractor.fileType()); assertEquals(BuildInfo.BuildIdType.GNU, extractor.buildIdType()); } - private static Stream peBinaries() { - String basePath = "/usr/share/dotnet/shared/Microsoft.NETCore.App/" + dotnetVersion; - return Stream.of( - Arguments.of(basePath + "/System.Private.CoreLib.dll", "Core .NET Library"), - Arguments.of(basePath + "/System.Runtime.dll", ".NET Runtime"), - Arguments.of(basePath + "/System.Console.dll", "Console Library"), - Arguments.of(basePath + "/Microsoft.CSharp.dll", "C# Compiler Library")); - } - - @ParameterizedTest(name = "PE: {1}") - @MethodSource("peBinaries") - void testPeBuildIdExtraction(String containerPath, String description) throws Exception { - Path localBinary = copyFromContainer(dotnetContainer, containerPath); + @TableTest({ + "scenario | resource | expectedBuildId ", + "PE32+ single debug entry | buildid/pe/pe32plus-single-entry.dll | 12345678ABCDEF0123456789ABCDEF011 ", + "PE32 single debug entry | buildid/pe/pe32-single-entry.dll | DEADBEEF12345678DEADBEEF123456782 ", + "PE32+ multiple debug entries, CodeView is second | buildid/pe/pe32plus-multi-entry.dll | CAFEBABEBEEFDEADCAFEBABEBEEFDEADff" + }) + void testPeBuildIdExtraction(String resource, String expectedBuildId) throws Exception { + Path file = Paths.get(getClass().getClassLoader().getResource(resource).toURI()); PeBuildIdExtractor extractor = new PeBuildIdExtractor(); - String buildId = extractor.extractBuildId(localBinary); - - logger.info("Found build ID: {} for library {}", buildId, localBinary); - - assertNotNull(buildId, "GUID+Age should be found for " + description); - - // Build ID format: GUID (32 uppercase hex chars) + Age (lowercase hex, variable length) - assertTrue( - buildId.length() >= 33, - "Build ID should be at least 33 hex chars (GUID + Age): " + buildId); - - // Verify format: GUID part (32 chars) should be uppercase, Age part should be lowercase - String guidPart = buildId.substring(0, 32); - String agePart = buildId.substring(32); - - assertTrue( - guidPart.matches("^[0-9A-F]{32}$"), - "GUID part (first 32 chars) should be uppercase hex: " + guidPart); - assertTrue( - agePart.matches("^[0-9a-f]+$"), - "Age part (remaining chars) should be lowercase hex: " + agePart); - - // Verify both parts parse correctly as hex - try { - new java.math.BigInteger(guidPart, 16); - Long.parseLong(agePart, 16); - } catch (NumberFormatException e) { - throw new AssertionError("Build ID should be valid hex: " + buildId, e); - } + String buildId = extractor.extractBuildId(file); - logger.info("Build ID format verified: GUID={}, Age={}", guidPart, agePart); + logger.info("Found build ID: {} for {}", buildId, resource); + assertNotNull(buildId, "Build ID should be found for " + resource); + assertEquals(expectedBuildId, buildId, "Build ID mismatch for " + resource); assertEquals(BuildInfo.FileType.PE, extractor.fileType()); assertEquals(BuildInfo.BuildIdType.PDB, extractor.buildIdType()); } diff --git a/dd-java-agent/agent-crashtracking/src/test/resources/buildid/elf/elf32-le.so b/dd-java-agent/agent-crashtracking/src/test/resources/buildid/elf/elf32-le.so new file mode 100644 index 0000000000000000000000000000000000000000..f6c759a5e13870ae9aa0c8dcb142ebdef3544896 GIT binary patch literal 116 zcmb<-^>JflWMqH=W(H;k7|#SI2&7FI6yV}4Kz;~FP5^=xfD{O`0x?Jqgh5iwK_#5&%F--V<8S) literal 0 HcmV?d00001 diff --git a/dd-java-agent/agent-crashtracking/src/test/resources/buildid/elf/elf64-be.so b/dd-java-agent/agent-crashtracking/src/test/resources/buildid/elf/elf64-be.so new file mode 100644 index 0000000000000000000000000000000000000000..79c5b55a3cb0d94e206e2d0565e5a336da77d6ff GIT binary patch literal 156 zcmb<-^>JfjVq|~=W(GST8%Y2x;{cZjF&r2ykW{b$MOdNo6%bkg%7xJkDo_C!4blU` hB0$XS?ib4NpFvQ`*d;Wrykq97-DmE;`_I701OV~#4MP9` literal 0 HcmV?d00001 diff --git a/dd-java-agent/agent-crashtracking/src/test/resources/buildid/elf/elf64-le.so b/dd-java-agent/agent-crashtracking/src/test/resources/buildid/elf/elf64-le.so new file mode 100644 index 0000000000000000000000000000000000000000..1dbb9579c538136757348ff0e1b99663c05edffa GIT binary patch literal 156 zcmb<-^>JfjWMqH=W(GS31doBi0VaV&J1|(l)vy4?S%J6$CNBVGKxq{y7e<5Bg8+yY b0b*t#cJ~WqU{rQZ?_7QMJ&eA$cHesd`@;_a literal 0 HcmV?d00001 diff --git a/dd-java-agent/agent-crashtracking/src/test/resources/buildid/pe/pe32-single-entry.dll b/dd-java-agent/agent-crashtracking/src/test/resources/buildid/pe/pe32-single-entry.dll new file mode 100644 index 0000000000000000000000000000000000000000..54c207b42481feff93493ae3a2123afbc91a9448 GIT binary patch literal 404 zcmeZ`Vjvqh0CfhqGBEfsGNPFAfPsmT8&wEJen2<^3=A?0IF*cA^-pY literal 0 HcmV?d00001 From 3efef48b7bb97d49ed5df363d7b234e1dd41e353 Mon Sep 17 00:00:00 2001 From: "dd-octo-sts[bot]" <200755185+dd-octo-sts[bot]@users.noreply.github.com> Date: Mon, 22 Jun 2026 11:50:45 +0000 Subject: [PATCH 014/139] Update smoke test latest tool versions (#11688) chore: Update smoke test latest tool versions Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> fix: filter RC and milestone versions for maven ci: bump surefire version to 3.5.6 Co-authored-by: daniel-mohedano --- .github/workflows/update-smoke-test-latest-versions.yaml | 2 ++ .../src/test/resources/latest-tool-versions.properties | 2 +- .../gradle/src/test/resources/latest-tool-versions.properties | 4 ++-- .../maven/src/test/resources/latest-tool-versions.properties | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/update-smoke-test-latest-versions.yaml b/.github/workflows/update-smoke-test-latest-versions.yaml index f1ba7de7415..8bca8d9cb09 100644 --- a/.github/workflows/update-smoke-test-latest-versions.yaml +++ b/.github/workflows/update-smoke-test-latest-versions.yaml @@ -68,6 +68,8 @@ jobs: --artifact-id maven-surefire-plugin \ --prerelease-pattern alpha \ --prerelease-pattern beta \ + --prerelease-pattern rc \ + --prerelease-pattern '-m\d' \ --min-age-hours "${MIN_DEPENDENCY_AGE_HOURS}" \ --current-version "${{ steps.current.outputs.surefire_version }}" \ --github-output "$GITHUB_OUTPUT" diff --git a/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/latest-tool-versions.properties b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/latest-tool-versions.properties index c860212dbea..9cae8a8bf99 100644 --- a/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/latest-tool-versions.properties +++ b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/latest-tool-versions.properties @@ -1,3 +1,3 @@ # Pinned latest eligible stable version (>=48h old) for the Maven instrumentation latestDepTest. # Updated automatically by the update-smoke-test-latest-versions workflow. -maven-surefire.latest=3.5.5 +maven-surefire.latest=3.5.6 diff --git a/dd-smoke-tests/gradle/src/test/resources/latest-tool-versions.properties b/dd-smoke-tests/gradle/src/test/resources/latest-tool-versions.properties index acc65ec19cd..039d37c2a1f 100644 --- a/dd-smoke-tests/gradle/src/test/resources/latest-tool-versions.properties +++ b/dd-smoke-tests/gradle/src/test/resources/latest-tool-versions.properties @@ -1,6 +1,6 @@ # Pinned latest eligible stable versions (>=48h old) for CI Visibility Gradle smoke tests. # Updated automatically by the update-smoke-test-latest-versions workflow. -gradle.latest=9.5.1 +gradle.latest=9.6.0 # Latest eligible stable patch per Gradle major release. Used to resolve the "oldest" smoke-test # Gradle version (the latest patch of the oldest major the current TestKit supports). gradle.latest.3=3.5.1 @@ -9,4 +9,4 @@ gradle.latest.5=5.6.4 gradle.latest.6=6.9.4 gradle.latest.7=7.6.6 gradle.latest.8=8.14.5 -gradle.latest.9=9.5.1 +gradle.latest.9=9.6.0 diff --git a/dd-smoke-tests/maven/src/test/resources/latest-tool-versions.properties b/dd-smoke-tests/maven/src/test/resources/latest-tool-versions.properties index 1164b6adee6..c39f0eebb94 100644 --- a/dd-smoke-tests/maven/src/test/resources/latest-tool-versions.properties +++ b/dd-smoke-tests/maven/src/test/resources/latest-tool-versions.properties @@ -1,4 +1,4 @@ # Pinned latest eligible stable versions (>=48h old) for CI Visibility Maven smoke tests. # Updated automatically by the update-smoke-test-latest-versions workflow. maven.latest=4.0.0-beta-3 -maven-surefire.latest=3.5.5 +maven-surefire.latest=3.5.6 From 30060043a76b9d947d0a085a7e8164c3603c977c Mon Sep 17 00:00:00 2001 From: Bruce Bujon Date: Mon, 22 Jun 2026 15:20:33 +0200 Subject: [PATCH 015/139] feat(core): Improve http codec injector tests (#11690) feat(core): Improve http codec injector tests Co-authored-by: bruce.bujon --- .../propagation/AbstractHttpInjectorTest.java | 62 +++++++++++++++++++ .../core/propagation/B3HttpInjectorTest.java | 52 +++------------- .../propagation/DatadogHttpInjectorTest.java | 47 ++------------ .../propagation/HaystackHttpInjectorTest.java | 50 +++------------ .../core/propagation/HttpInjectorTest.java | 36 +---------- .../core/propagation/W3CHttpInjectorTest.java | 55 ++-------------- .../propagation/XRayHttpInjectorTest.java | 53 ++++------------ 7 files changed, 102 insertions(+), 253 deletions(-) create mode 100644 dd-trace-core/src/test/java/datadog/trace/core/propagation/AbstractHttpInjectorTest.java diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/AbstractHttpInjectorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/AbstractHttpInjectorTest.java new file mode 100644 index 00000000000..3098ab217ec --- /dev/null +++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/AbstractHttpInjectorTest.java @@ -0,0 +1,62 @@ +package datadog.trace.core.propagation; + +import datadog.trace.api.DDSpanId; +import datadog.trace.api.DDTraceId; +import datadog.trace.api.datastreams.NoopPathwayContext; +import datadog.trace.common.writer.ListWriter; +import datadog.trace.core.CoreTracer; +import datadog.trace.core.DDCoreJavaSpecification; +import datadog.trace.core.DDSpanContext; +import java.util.Map; +import org.junit.jupiter.api.BeforeEach; + +/** This class is a base test class for the {@link HttpCodec.Injector} tests. */ +abstract class AbstractHttpInjectorTest extends DDCoreJavaSpecification { + protected CoreTracer tracer; + protected HttpCodec.Injector injector; + + /** + * Creates the injector under test. + * + * @return {@code null} by default for tests that build injectors per test case. + */ + protected HttpCodec.Injector newInjector() { + return null; + } + + @BeforeEach + void setupInjectorTest() { + this.tracer = tracerBuilder().writer(new ListWriter()).build(); + this.injector = newInjector(); + } + + /** Builds a span context with the standard fake service/operation/resource values. */ + protected DDSpanContext mockSpanContext( + DDTraceId traceId, + long spanId, + int samplingPriority, + CharSequence origin, + Map baggage, + PropagationTags propagationTags) { + return new DDSpanContext( + traceId, + spanId, + DDSpanId.ZERO, + null, + "fakeService", + "fakeOperation", + "fakeResource", + samplingPriority, + origin, + baggage, + false, + "fakeType", + 0, + this.tracer.createTraceCollector(DDTraceId.ONE), + null, + null, + NoopPathwayContext.INSTANCE, + false, + propagationTags); + } +} diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/B3HttpInjectorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/B3HttpInjectorTest.java index b1a606c1106..a60923a6ebc 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/B3HttpInjectorTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/B3HttpInjectorTest.java @@ -15,50 +15,27 @@ import datadog.context.propagation.CarrierSetter; import datadog.trace.api.Config; -import datadog.trace.api.DDSpanId; import datadog.trace.api.DDTraceId; import datadog.trace.api.DynamicConfig; -import datadog.trace.api.datastreams.NoopPathwayContext; import datadog.trace.bootstrap.instrumentation.api.TagContext; -import datadog.trace.common.writer.ListWriter; -import datadog.trace.core.CoreTracer; -import datadog.trace.core.DDCoreJavaSpecification; import datadog.trace.core.DDSpanContext; import datadog.trace.junit.utils.converter.PrioritySamplingConverter; import java.util.HashMap; import java.util.Map; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.params.converter.ConvertWith; import org.tabletest.junit.TableTest; -class B3HttpInjectorTest extends DDCoreJavaSpecification { +class B3HttpInjectorTest extends AbstractHttpInjectorTest { private static final CarrierSetter> MAP_SETTER = Map::put; - private HttpCodec.Injector injector; - private HttpCodec.Extractor extractor; - private CoreTracer tracer; - protected boolean tracePropagationB3Padding() { return DEFAULT_PROPAGATION_B3_PADDING_ENABLED; } - @BeforeEach - void setup() { - this.injector = B3HttpCodec.newCombinedInjector(tracePropagationB3Padding()); - - DynamicConfig dynamicConfig = - DynamicConfig.create().setHeaderTags(emptyMap()).setBaggageMapping(emptyMap()).apply(); - this.extractor = B3HttpCodec.newExtractor(Config.get(), dynamicConfig::captureTraceConfig); - - ListWriter writer = new ListWriter(); - this.tracer = tracerBuilder().writer(writer).build(); - } - - @AfterEach - void tearDown() { - this.tracer.close(); + @Override + protected HttpCodec.Injector newInjector() { + return B3HttpCodec.newCombinedInjector(tracePropagationB3Padding()); } @TableTest({ @@ -113,7 +90,11 @@ void injectHttpHeadersWithExtractedOriginal(String traceId, String spanId) { Map headers = new HashMap<>(); headers.put(TRACE_ID_KEY.toUpperCase(), traceId); headers.put(SPAN_ID_KEY.toUpperCase(), spanId); - TagContext context = this.extractor.extract(headers, stringValuesMap()); + DynamicConfig dynamicConfig = + DynamicConfig.create().setHeaderTags(emptyMap()).setBaggageMapping(emptyMap()).apply(); + HttpCodec.Extractor extractor = + B3HttpCodec.newExtractor(Config.get(), dynamicConfig::captureTraceConfig); + TagContext context = extractor.extract(headers, stringValuesMap()); DDSpanContext mockedContext = mockedSpanContext(context); Map carrier = new HashMap<>(); @@ -135,25 +116,12 @@ private DDSpanContext mockedSpanContext(DDTraceId traceId, long spanId, int samp Map baggage = new HashMap<>(); baggage.put("k1", "v1"); baggage.put("k2", "v2"); - return new DDSpanContext( + return mockSpanContext( traceId, spanId, - DDSpanId.ZERO, - null, - "fakeService", - "fakeOperation", - "fakeResource", samplingPriority, "fakeOrigin", baggage, - false, - "fakeType", - 0, - this.tracer.createTraceCollector(DDTraceId.ONE), - null, - null, - NoopPathwayContext.INSTANCE, - false, PropagationTags.factory().empty()); } diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/DatadogHttpInjectorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/DatadogHttpInjectorTest.java index 5ad95b53a5f..24234535f9c 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/DatadogHttpInjectorTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/DatadogHttpInjectorTest.java @@ -17,37 +17,20 @@ import datadog.trace.api.DD128bTraceId; import datadog.trace.api.DDSpanId; import datadog.trace.api.DDTraceId; -import datadog.trace.api.datastreams.NoopPathwayContext; -import datadog.trace.common.writer.ListWriter; -import datadog.trace.core.CoreTracer; -import datadog.trace.core.DDCoreJavaSpecification; import datadog.trace.core.DDSpanContext; import datadog.trace.junit.utils.converter.PrioritySamplingConverter; import datadog.trace.junit.utils.converter.TraceIdConverter; import java.util.HashMap; 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.params.converter.ConvertWith; import org.tabletest.junit.TableTest; -class DatadogHttpInjectorTest extends DDCoreJavaSpecification { - private HttpCodec.Injector injector; - private CoreTracer tracer; +class DatadogHttpInjectorTest extends AbstractHttpInjectorTest { - @BeforeEach - void setup() { - this.injector = - DatadogHttpCodec.newInjector(singletonMap("some-baggage-key", "SOME_CUSTOM_HEADER")); - - ListWriter writer = new ListWriter(); - this.tracer = tracerBuilder().writer(writer).build(); - } - - @AfterEach - void tearDown() { - this.tracer.close(); + @Override + protected HttpCodec.Injector newInjector() { + return DatadogHttpCodec.newInjector(singletonMap("some-baggage-key", "SOME_CUSTOM_HEADER")); } @TableTest({ @@ -196,25 +179,7 @@ private DDSpanContext mockSpanContext( ddPTags == null ? PropagationTags.factory().empty() : PropagationTags.factory().fromHeaderValue(DATADOG, ddPTags); - return new DDSpanContext( - traceId, - DDSpanId.from(spanId), - DDSpanId.ZERO, - null, - "fakeService", - "fakeOperation", - "fakeResource", - samplingPriority, - origin, - baggage, - false, - "fakeType", - 0, - this.tracer.createTraceCollector(DDTraceId.ONE), - null, - null, - NoopPathwayContext.INSTANCE, - false, - propagationTags); + return mockSpanContext( + traceId, DDSpanId.from(spanId), samplingPriority, origin, baggage, propagationTags); } } diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/HaystackHttpInjectorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/HaystackHttpInjectorTest.java index 4e1ba647c85..b44a0998909 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/HaystackHttpInjectorTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/HaystackHttpInjectorTest.java @@ -14,38 +14,20 @@ import datadog.trace.api.DDSpanId; import datadog.trace.api.DDTraceId; -import datadog.trace.api.datastreams.NoopPathwayContext; -import datadog.trace.common.writer.ListWriter; -import datadog.trace.core.CoreTracer; -import datadog.trace.core.DDCoreJavaSpecification; import datadog.trace.core.DDSpanContext; import datadog.trace.junit.utils.converter.TraceIdConverter; import java.util.HashMap; import java.util.Map; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.params.converter.ConvertWith; import org.tabletest.junit.TableTest; -class HaystackHttpInjectorTest extends DDCoreJavaSpecification { +class HaystackHttpInjectorTest extends AbstractHttpInjectorTest { // UUID representation of DDSpanId.ZERO private static final String ZERO_UUID = "44617461-646f-6721-0000-000000000000"; - private HttpCodec.Injector injector; - private CoreTracer tracer; - - @BeforeEach - void setup() { - Map baggageMap = singletonMap("some-baggage-key", "SOME_CUSTOM_HEADER"); - this.injector = HaystackHttpCodec.newInjector(baggageMap); - - ListWriter writer = new ListWriter(); - this.tracer = tracerBuilder().writer(writer).build(); - } - - @AfterEach - void tearDown() { - this.tracer.close(); + @Override + protected HttpCodec.Injector newInjector() { + return HaystackHttpCodec.newInjector(singletonMap("some-baggage-key", "SOME_CUSTOM_HEADER")); } @TableTest({ @@ -101,7 +83,7 @@ void injectHttpHeadersWithHaystackTraceIdInBaggage( DDSpanContext spanContext = mockSpanContext(traceId, spanId, baggage); Map carrier = new HashMap<>(); - injector.inject(spanContext, carrier, Map::put); + this.injector.inject(spanContext, carrier, Map::put); assertEquals(traceUuid, carrier.get(TRACE_ID_KEY)); assertEquals(traceUuid, spanContext.unsafeGetTag(HAYSTACK_TRACE_ID_BAGGAGE_KEY)); @@ -118,25 +100,7 @@ void injectHttpHeadersWithHaystackTraceIdInBaggage( private DDSpanContext mockSpanContext( String traceId, String spanId, Map baggage) { - return new DDSpanContext( - DDTraceId.from(traceId), - DDSpanId.from(spanId), - DDSpanId.ZERO, - null, - "fakeService", - "fakeOperation", - "fakeResource", - SAMPLER_KEEP, - null, - baggage, - false, - "fakeType", - 0, - this.tracer.createTraceCollector(DDTraceId.ONE), - null, - null, - NoopPathwayContext.INSTANCE, - false, - null); + return mockSpanContext( + DDTraceId.from(traceId), DDSpanId.from(spanId), SAMPLER_KEEP, null, baggage, null); } } diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/HttpInjectorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/HttpInjectorTest.java index 24812059903..90e1d488dca 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/HttpInjectorTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/HttpInjectorTest.java @@ -15,13 +15,8 @@ import static org.mockito.Mockito.when; import datadog.trace.api.Config; -import datadog.trace.api.DDSpanId; import datadog.trace.api.DDTraceId; import datadog.trace.api.TracePropagationStyle; -import datadog.trace.api.datastreams.NoopPathwayContext; -import datadog.trace.common.writer.ListWriter; -import datadog.trace.core.CoreTracer; -import datadog.trace.core.DDCoreJavaSpecification; import datadog.trace.core.DDSpanContext; import datadog.trace.junit.utils.converter.PrioritySamplingConverter; import java.util.HashMap; @@ -29,24 +24,10 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.params.converter.ConvertWith; import org.tabletest.junit.TableTest; -class HttpInjectorTest extends DDCoreJavaSpecification { - private CoreTracer tracer; - - @BeforeEach - void setup() { - ListWriter writer = new ListWriter(); - this.tracer = tracerBuilder().writer(writer).build(); - } - - @AfterEach - void tearDown() { - this.tracer.close(); - } +class HttpInjectorTest extends AbstractHttpInjectorTest { protected boolean tracePropagationB3Padding() { return DEFAULT_PROPAGATION_B3_PADDING_ENABLED; @@ -246,25 +227,12 @@ DDSpanContext mockedContext( int samplingPriority, String origin, Map baggage) { - return new DDSpanContext( + return mockSpanContext( traceId, spanId, - DDSpanId.ZERO, - null, - "fakeService", - "fakeOperation", - "fakeResource", samplingPriority, origin, baggage, - false, - "fakeType", - 0, - this.tracer.createTraceCollector(DDTraceId.ONE), - null, - null, - NoopPathwayContext.INSTANCE, - false, PropagationTags.factory().fromHeaderValue(DATADOG, "_dd.p.usr=123")); } diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/W3CHttpInjectorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/W3CHttpInjectorTest.java index 459c035b42d..fc0256b5eb2 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/W3CHttpInjectorTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/W3CHttpInjectorTest.java @@ -7,45 +7,27 @@ import static datadog.trace.core.propagation.W3CHttpCodec.OT_BAGGAGE_PREFIX; import static datadog.trace.core.propagation.W3CHttpCodec.TRACE_PARENT_KEY; import static datadog.trace.core.propagation.W3CHttpCodec.TRACE_STATE_KEY; -import static datadog.trace.core.propagation.W3CHttpCodec.newInjector; import static java.util.Collections.singletonMap; import static org.junit.jupiter.api.Assertions.assertEquals; import datadog.trace.api.DDSpanId; import datadog.trace.api.DDTraceId; -import datadog.trace.api.datastreams.NoopPathwayContext; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; -import datadog.trace.common.writer.ListWriter; -import datadog.trace.core.CoreTracer; -import datadog.trace.core.DDCoreJavaSpecification; import datadog.trace.core.DDSpanContext; import datadog.trace.junit.utils.converter.PrioritySamplingConverter; import datadog.trace.junit.utils.converter.TraceIdConverter; import java.util.HashMap; 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.params.converter.ConvertWith; import org.tabletest.junit.TableTest; -class W3CHttpInjectorTest extends DDCoreJavaSpecification { +class W3CHttpInjectorTest extends AbstractHttpInjectorTest { - private HttpCodec.Injector injector; - private CoreTracer tracer; - - @BeforeEach - void setup() { - this.injector = newInjector(singletonMap("some-baggage-key", "SOME_CUSTOM_HEADER")); - - ListWriter writer = new ListWriter(); - this.tracer = tracerBuilder().writer(writer).build(); - } - - @AfterEach - void tearDown() { - this.tracer.close(); + @Override + protected HttpCodec.Injector newInjector() { + return W3CHttpCodec.newInjector(singletonMap("some-baggage-key", "SOME_CUSTOM_HEADER")); } @TableTest({ @@ -198,33 +180,4 @@ static long extractLastParentId(Map carrier) { } throw new AssertionError("No 'p:' in dd tracestate: " + traceState); } - - private DDSpanContext mockSpanContext( - DDTraceId traceId, - long spanId, - int samplingPriority, - String origin, - Map baggage, - PropagationTags propagationTags) { - return new DDSpanContext( - traceId, - spanId, - DDSpanId.ZERO, - null, - "fakeService", - "fakeOperation", - "fakeResource", - samplingPriority, - origin, - baggage, - false, - "fakeType", - 0, - this.tracer.createTraceCollector(DDTraceId.ONE), - null, - null, - NoopPathwayContext.INSTANCE, - false, - propagationTags); - } } diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/XRayHttpInjectorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/XRayHttpInjectorTest.java index db681314524..87e2c98abcf 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/XRayHttpInjectorTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/XRayHttpInjectorTest.java @@ -15,47 +15,35 @@ import datadog.trace.api.DDSpanId; import datadog.trace.api.DDTraceId; import datadog.trace.api.DynamicConfig; -import datadog.trace.api.datastreams.NoopPathwayContext; import datadog.trace.api.time.TimeSource; import datadog.trace.bootstrap.instrumentation.api.TagContext; -import datadog.trace.common.writer.ListWriter; -import datadog.trace.core.CoreTracer; -import datadog.trace.core.DDCoreJavaSpecification; +import datadog.trace.core.CoreTracer.CoreTracerBuilder; import datadog.trace.core.DDSpanContext; import datadog.trace.core.datastreams.DataStreamsMonitoring; import datadog.trace.junit.utils.converter.PrioritySamplingConverter; import datadog.trace.junit.utils.converter.TraceIdConverter; import java.util.HashMap; 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.params.converter.ConvertWith; import org.tabletest.junit.TableTest; -class XRayHttpInjectorTest extends DDCoreJavaSpecification { - private HttpCodec.Injector injector; - private CoreTracer tracer; +class XRayHttpInjectorTest extends AbstractHttpInjectorTest { - @BeforeEach - void setup() { - this.injector = - XRayHttpCodec.newInjector(singletonMap("some-baggage-key", "SOME_CUSTOM_HEADER")); + @Override + protected CoreTracerBuilder tracerBuilder() { TimeSource timeSource = mock(TimeSource.class); when(timeSource.getCurrentTimeMillis()).thenReturn(1_664_906_869_196L); when(timeSource.getCurrentTimeNanos()).thenReturn(1_664_906_869_196_787_813L); when(timeSource.getNanoTicks()).thenReturn(1_664_906_869_196L); - this.tracer = - tracerBuilder() - .dataStreamsMonitoring(mock(DataStreamsMonitoring.class)) - .writer(new ListWriter()) - .timeSource(timeSource) - .build(); + return super.tracerBuilder() + .dataStreamsMonitoring(mock(DataStreamsMonitoring.class)) + .timeSource(timeSource); } - @AfterEach - void tearDown() { - this.tracer.close(); + @Override + protected HttpCodec.Injector newInjector() { + return XRayHttpCodec.newInjector(singletonMap("some-baggage-key", "SOME_CUSTOM_HEADER")); } @TableTest({ @@ -137,25 +125,6 @@ void injectHttpHeadersWithEndToEnd() { private DDSpanContext createContext( DDTraceId traceId, long spanId, int samplingPriority, Map baggage) { - return new DDSpanContext( - traceId, - spanId, - DDSpanId.ZERO, - null, - "fakeService", - "fakeOperation", - "fakeResource", - samplingPriority, - "fakeOrigin", - baggage, - false, - "fakeType", - 0, - this.tracer.createTraceCollector(DDTraceId.ONE), - null, - null, - NoopPathwayContext.INSTANCE, - false, - null); + return mockSpanContext(traceId, spanId, samplingPriority, "fakeOrigin", baggage, null); } } From fa8fdf60ab05f392318e174e2065f9d1ac0d043a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Gonz=C3=A1lez=20Garc=C3=ADa?= Date: Mon, 22 Jun 2026 15:23:09 +0200 Subject: [PATCH 016/139] Add server.request.body.filenames support for Jetty (#10988) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Instrument Jetty for server.request.body.filenames Add GetFilenamesAdvice to all three Jetty AppSec modules to collect uploaded file names from multipart requests and fire the requestFilesFilenames() IG callback: - jetty-appsec-8.1.3: intercepts getParts() return value; includes Content-Disposition header fallback for Servlet 3.0 (Jetty 9.0) where getSubmittedFileName() is not available - jetty-appsec-9.2: intercepts no-arg getParts() for Servlet 3.1+ - jetty-appsec-9.3: same, applies to Jetty 9.3, 10, 11 Enable testBodyFilenames() in Jetty 9.x, 10 and 11 server tests. Fix GetFilenamesAdvice double-firing and extend coverage to getParts(MultiMap) path - jetty-appsec-9.3: add call-depth guard (Collection.class) to GetFilenamesAdvice to prevent double callback invocation when getParts() calls getParts(MultiMap) internally - jetty-appsec-9.2: extend GetFilenamesAdvice matcher to all getParts overloads (not just no-arg) to cover getParameter*()/getParameterMap() code paths, guarded with same call-depth mechanism to avoid double-firing spotless Extend testBodyFilenamesCalledOnce coverage to Jetty 9.x and 10.x - Add BODY_MULTIPART_REPEATED case to TestServlet3 (javax) so Jetty 9.x/10.x test modules can exercise the repeated getParts() scenario - Enable testBodyFilenamesCalledOnce() for Jetty 9.0, 9.0.4, 9.3, 9.4.21, and 10.0 Add BODY_MULTIPART_COMBINED test to cover GetFilenamesFromMultiPartAdvice path - New BODY_MULTIPART_COMBINED endpoint: calls getParameterMap() first (triggers GetFilenamesFromMultiPartAdvice via extractContentParameters -> getParts(MultiMap)), then getParts() explicitly (GetFilenamesAdvice must not double-fire since _contentParameters is already set) - New test 'file upload filenames called once via parameter map' verifies the callback fires exactly once across both advice paths - Enabled in Jetty 9.0, 9.0.4, 9.3, 9.4.21, 10.0 and 11.0 spotless Fix missing static imports for BODY_MULTIPART_REPEATED and BODY_MULTIPART_COMBINED Fix GetFilenamesAdvice double-fire for Jetty 9.4+ where _multiParts replaces _contentParameters as the getParts() cache In Jetty 9.3, getParts(MultiMap) sets _contentParameters, so the map==null guard prevents re-firing on repeated getParts() calls. In Jetty 9.4+, getParts() delegates to getParts(null) and caches the result in _multiParts instead, leaving _contentParameters null on every call. Add _multiParts==null as an additional guard (optional=true handles Jetty 9.3 where the field does not exist). Fix GetFilenamesAdvice double-fire in jetty-appsec-8.1.3 In Jetty 8.x/9.0, _multiPartInputStream is null only on the first getParts() call. Add OnMethodEnter guard to skip the WAF callback on subsequent calls which return the cached multipart result. Fix GetFilenamesAdvice double-fire for all Jetty 9.3–11 versions @Advice.FieldValue(optional=true) is not supported in ByteBuddy 1.11.22. Replace it with @Advice.This + inline reflection to detect whether getParts() has already been called on this request: - Jetty 9.4+: checks _multiParts (set after first getParts() call) - Jetty 9.3.x: falls back to _multiPartInputStream (the cache field in 9.3.x, where _multiParts does not exist and _contentParameters is only set by the getParameterMap() → extractContentParameters() path, not by getParts()) Covers all forkedTest and latestDepForkedTest suites for Jetty 9.0–11. Simplify GetFilenamesAdvice in jetty-appsec-8.1.3: remove dead Servlet 3.1+ branch Jetty 8 implements only Servlet 3.0, so getSubmittedFileName() is never present on the Part objects. The reflection probe (try { getMethod("getSubmittedFileName") }) and the Servlet 3.1+ code path were dead code. Remove them and always parse filenames from the Content-Disposition header directly. Remove unnecessary casts in Jetty AppSec GetFilenamesAdvice Type @Advice.Return as Collection so the loop variable can be Part directly, eliminating the (Part) cast on each iteration. Extract Content-Disposition parsing to MultipartHelper + unit tests Move the filename extraction logic from GetFilenamesAdvice into a new MultipartHelper helper class so it can be unit tested in isolation. Add 12 Spock test cases covering quoted/unquoted filenames, empty values, whitespace, null input, and edge cases. Extract filename extraction to MultipartHelper in jetty-appsec-9.2 + unit tests Move the getSubmittedFileName() loop from GetFilenamesAdvice into a new MultipartHelper helper class (injected via helperClassNames) so it can be unit tested in isolation. Add 8 Spock test cases covering null/empty collections, null/empty filenames, multiple parts, and special characters. Split jetty-appsec-9.3 [9.3,12) into three clean modules: 9.3, 9.4, 11.0 Eliminates all reflection from the multipart filename instrumentation by creating version-specific modules with compile-time type safety: - jetty-appsec-9.3 [9.3,9.4): javax.servlet, uses _multiPartInputStream field - jetty-appsec-9.4 [9.4,11.0): javax.servlet, uses _multiParts field - jetty-appsec-11.0 [11.0,12.0): jakarta.servlet, uses _multiParts field Each module uses muzzle references as version discriminators instead of runtime reflection, and delegates filename extraction to a testable MultipartHelper class with 8 Spock unit tests each. Server test modules updated to reference the correct appsec module per Jetty version range. Add Jetty 8.x integration tests for multipart body and filenames - Add Jetty8LatestDepForkedTest: runs against Jetty 8.x (latestDepForkedTest task) and enables testBodyMultipart/testBodyFilenames coverage. Gated by 'test.dd.filenames' system property so it is skipped when running against Jetty 7.6. - Add testCompileOnly dep on org.eclipse.jetty.orbit:javax.servlet so MultipartConfigElement compiles without pulling in the excluded javax.servlet:javax.servlet-api artifact. - Fix ParameterCollector.put to accept (Object, Object) and cast internally: Jetty 8.x MultiMap.add uses (Object, Object) descriptor while Jetty 9.x uses (String, Object), so the ASM bytecode visitor was silently skipping all form field captures on Jetty 8. - Update GetPartsMethodVisitor to match both (String,Object) and (Object,Object) MultiMap.add descriptors and emit the INVOKEINTERFACE with (Object, Object). Fix muzzle range for jetty-appsec-9.3/9.4: split at 9.4.10 _multiPartInputStream was replaced by _multiParts in Jetty 9.4.10.v20180503. Early 9.4.x versions (9.4.0–9.4.9) still use _multiPartInputStream like 9.3.x, so extend jetty-appsec-9.3 to cover [9.3, 9.4.10) and narrow jetty-appsec-9.4 to [9.4.10, 11.0). The classLoaderMatcher in jetty-appsec-9.4 (checking for _multiParts) now correctly matches only versions >= 9.4.10. Replace MultiPartsFieldMatcher with typed module splits for Jetty 9.4–11.x The _multiParts field type changes multiple times across Jetty versions, making a single typed muzzle reference insufficient. Replace the ASM-based classLoaderMatcher with clean module splits using typed muzzle references: - jetty-appsec-9.4 [9.4.10, 10.0): _multiParts: MultiParts _queryEncoding: String (excludes 10.x) - jetty-appsec-10.0 [10.0, 10.0.10): _multiParts: MultiPartFormInputStream - jetty-appsec-10.0.10 [10.0.10, 11.0): _multiParts: MultiParts _queryEncoding: Charset (excludes 9.4.x) - jetty-appsec-11.0 [11.0, 11.0.10): _multiParts: MultiPartFormInputStream - jetty-appsec-11.0.10 [11.0.10, 12.0): _multiParts: MultiParts All six modules pass muzzle with assertInverse = true. Fix CI failures and reduce agent JAR size for Jetty filenames PR - Add jetty-appsec-9.4 and jetty-appsec-11.0 to armeria-jetty-1.24 testRuntimeOnly classpath; these are required after the muzzle split that tightened jetty-appsec-9.3 to [9.3, 9.4.10) - Merge jetty-appsec-10.0 functionality into jetty-appsec-9.4: extend the muzzle from [9.4.10, 10.0) to also cover [10.0.10, 11.0) using _multiParts:MultiParts + javax.servlet.http.Part as discriminators; delete the now-redundant jetty-appsec-10.0 module - Delete intermediate modules jetty-appsec-10.0.10 and jetty-appsec-11.0.10 that were split-by-point-release and now handled by the two modules above - Scope server.request.body.filenames to Jetty 9.3+: revert filenames additions from jetty-appsec-8.1.3 (Jetty 8, EOL 2015) and jetty-appsec-9.2 (Jetty 9.2, EOL 2019) to stay within the 32 MiB agent JAR limit; requestBodyProcessed support for those versions is unchanged Agent JAR: 33,551,402 bytes (3,030 bytes under the 32 MiB limit) Remove redundant .or(named("getParts")) from ExtractContentParametersAdvice matcher ExtractContentParametersAdvice applied to getParts() is always a no-op: it increments/decrements CallDepthThreadLocalMap but never fires since _contentParameters is always null at that point. GetFilenamesAdvice and GetFilenamesFromMultiPartAdvice handle getParts() exclusively. Disable testBodyFilenames in jetty-server-9.0 and jetty-server-9.0.4 jetty-appsec-8.1.3 (covers Jetty <9) and jetty-appsec-9.2 (covers Jetty [9.2,9.3)) were reverted to master state: they report requestBodyProcessed but not requestFilesFilenames. Jetty 9.0.x and 9.2.x therefore have no active appsec module that fires the filenames event, so testBodyFilenames() must stay false for those modules. Restore .or(named("getParts")) in ExtractContentParametersAdvice for jetty-appsec-9.3/9.4/11.0 In Armeria + Jetty 9.4.48 (and possibly other embedded/wrapped setups), getParts() is the application entry point for multipart parsing — it internally calls extractContentParameters(), which sets _contentParameters. Without the matcher on getParts(), ExtractContentParametersAdvice.after() never fires in that code path, so the requestBodyProcessed event (and request.body.converted tag) is never reported. The call-depth guard (Request.class key) already prevents double-firing when both methods are instrumented: getParts() increments depth to 1 before extractContentParameters() is entered, so the nested advice is a no-op. fix(appsec/jetty): use _dispatcherType bytecode discriminator for jetty-appsec-9.4 Replace the JAVAX_PART_REFERENCE muzzle check (class presence on classpath) with a field-level bytecode check on Request._dispatcherType descriptor: - Ljavax/servlet/DispatcherType; in Jetty 9.4/10 (javax namespace) - Ljakarta/servlet/DispatcherType; in Jetty 11+ (jakarta namespace) This reliably excludes Jetty 11+ even when both javax and jakarta servlet jars are on the test classpath simultaneously. Also remove assertInverse from 9_series muzzle block to avoid conflict with 10_series (both cover overlapping Jetty 10.0.x versions). Fixes armeria-jetty-1.24:jetty11Test ClassCastException where jetty94.MultipartHelper tried to cast jakarta.servlet.http.Part to javax.servlet.http.Part. Skip multipart test on Jetty 9.0.x where jetty-appsec-8.1.3 causes HTTP 500 jetty-appsec-8.1.3 muzzle range [8.1.3, 9.2.0.RC0) includes Jetty 9.0.x. When applied, it calls ParameterCollector.put(String, String) which does not exist in Jetty 9.0.x → HTTP 500 on multipart requests. Override multipart() with assumeTrue(false) in jetty-server-9.0 and jetty-server-9.0.4 test classes until the muzzle range is corrected. Use @Ignore to skip multipart test on Jetty 9.0.x where jetty-appsec-8.1.3 causes HTTP 500 Replace assumeTrue(false) with Spock's @Ignore annotation — more reliable for overriding void feature methods without Spock block labels. jetty-appsec-8.1.3 muzzle range [8.1.3, 9.2.0.RC0) includes Jetty 9.0.x. When applied, it calls ParameterCollector.put(String, String) which does not exist in Jetty 9.0.x → HTTP 500 on multipart requests. Add supportsMultipart() hook to skip multipart test on Jetty 9.0.x Spock AST-transforms feature methods, so @Override on a feature method override triggers a compile error. Use a boolean hook instead: - AppSecInactiveHttpServerTest.supportsMultipart() returns true by default and is guarded with assumeTrue() at the setup: block level - Jetty9InactiveAppSecTest overrides to false in both jetty-server-9.0 and jetty-server-9.0.4, where jetty-appsec-8.1.3 range [8.1.3, 9.2.0.RC0) causes ParameterCollector.put(String, String) to fail → HTTP 500. Verified locally: tests=8, skipped=3 (multipart correctly skipped), failures=0. fix(appsec/jetty): disable multipart test on Jetty 9.0.x and bump test version to 10.0.10 - jetty-server-9.0 and jetty-server-9.0.4: set testBodyMultipart() = false. jetty-appsec-8.1.3 covers [8.1.3, 9.2.0.RC0) which includes Jetty 9.0.x; its extractContentParameters() calls ParameterCollector.put(String, String) which does not exist in Jetty 9.0.x, causing HTTP 500 on multipart requests. - jetty-server-10.0: bump test dependency from 10.0.0 to 10.0.10. jetty-appsec-9.4 requires _multiParts: Lorg/eclipse/jetty/server/MultiParts; but that type was only introduced in 10.0.10 (previously MultiPartFormInputStream), so the muzzle check fails for Jetty 10.0.0-10.0.9, leaving tests uninstrumented. - Revert accidental modification of agent-jmxfetch/integrations-core submodule back to its master pointer. fix(appsec/jetty): replace bytecode injection in jetty-appsec-8.1.3 with exit-advice Replace the brittle GetPartsMethodVisitor ASM bytecode injection (intercepting MultiMap.add() calls inside getParts()) with a clean ByteBuddy exit-advice approach: - Remove ParameterCollector, GetPartsAdvice, GetPartsVisitorWrapper, RequestClassVisitor, and GetPartsMethodVisitor; drop HasTypeAdvice from the instrumentation module. - Add PartHelper with extractFormFields() (reads InputStream per part) and extractFilenames() (parses Content-Disposition manually, since Part.getSubmittedFileName() is Servlet 3.1+ and not available in Jetty 8.x). - Add GetFilenamesAdvice (@RequiresRequestContext / @ActiveRequestContext) on getParts():Collection that fires requestBodyProcessed() with form fields and requestFilesFilenames() with upload filenames. Uses CallDepthThreadLocalMap to guard against reentrant calls. - Jetty8LatestDepForkedTest: set testBodyFilenamesCalledOnce() and testBodyFilenamesCalledOnceCombined() to false because Jetty 8.x has no _multiParts / _contentParameters field guards to suppress duplicate firings. test(appsec/jetty): add unit tests for PartHelper (jetty-appsec-8.1.3) fix(appsec/jetty): cover Jetty 10.0.0-10.0.9 and close PartHelper InputStream - jetty-appsec-9.4: extend muzzle to also cover Jetty 10.0.0–10.0.9, which were previously a gap. In those versions _multiParts is typed MultiPartFormInputStream (not MultiParts); the primary Reference spec matches 9.4.10+ and 10.0.10+, and an OrReference alternative matches 10.0.0–10.0.9. The GetFilenamesAdvice already uses typing=DYNAMIC so no advice changes are needed. - jetty-appsec-8.1.3 PartHelper: wrap part.getInputStream() in try-with-resources to avoid leaking file descriptors on file-backed multipart form fields. fix(appsec/jetty): quote-aware Content-Disposition parser in PartHelper Splitting the header on ';' naively truncated filenames that contain semicolons inside a quoted value, e.g. filename="shell;evil.php" would produce "shell" instead of the full name. Replace the split() loop with a quote-aware state-machine parser that skips semicolons inside quoted strings and handles backslash-escaped characters. Add test cases for semicolons in filenames, escaped quotes, and filename appearing before other parameters. fix(appsec/jetty): use Request bytecode discriminator for jetty-appsec-11.0 Replace the JAKARTA_PART_REFERENCE classpath check with a _dispatcherType field descriptor check on Request.class bytecode, mirroring the approach already used by jetty-appsec-9.4. The classpath check passes on any Jetty 9.4/10 app that has jakarta.servlet-api as a dependency, causing double-instrumentation of extractContentParameters. The bytecode check is authoritative: in Jetty 11+ Request.class carries _dispatcherType as Ljakarta/servlet/DispatcherType;, while 9.4/10 carry the javax descriptor. feat(appsec): advise getPart(String) in Jetty 8 to catch single-part uploads In Jetty 8.x, getPart(String name) calls _multiPartInputStream.getPart(String) directly without delegating to getParts(). Applications that retrieve only one file via getPart() without ever calling getParts() would have their filename event missed. Add GetPartAdvice to cover this path. The charset fix (AI comment 2) was investigated and is not applicable: HTML5 form submissions always use UTF-8 and browsers never include charset= on individual part Content-Type headers, so the existing hardcoded UTF-8 is correct. fix(appsec): guard Jetty 8 getParts against repeated calls; disable filename tests in async suite 1. Add _multiPartInputStream == null guard to GetFilenamesAdvice.before() so that repeated getParts() calls on the same request (which Jetty caches) do not re-fire requestFilesFilenames/requestBodyProcessed WAF callbacks. The field is null before the first multipart parse and non-null on all subsequent cached calls, matching the pattern used in the 9.4/11.0 advice (_multiParts guard). 2. JettyAsyncHandlerTest already disabled testBodyFilenames() but neglected to disable testBodyFilenamesCalledOnce() and testBodyFilenamesCalledOnceCombined(), which are now enabled in the Jetty11Test parent. Override both to false in the async handler suite to prevent spurious test failures. fix(appsec): distinguish empty filename from absent filename in PartHelper filenameFromPart() was returning null for both 'no filename parameter' and 'filename=""', causing extractFormFields() to buffer the full body of file inputs submitted with no file chosen (filename=""). An empty is still a file part, not a form field. Return "" instead of null so that callers using != null correctly skip those parts without reading their content. Update tests to assert "" for empty-filename cases and add regression tests for extractFormFields/extractFilenames with empty-filename parts. Note: the second AI comment about getPart(String) double-firing was not implemented. The bytecode shows the internal call is to MultiPartInputStream.getParts() (not Request.getParts()), so GetFilenamesAdvice (which instruments Request.getParts()) is never triggered during a getPart() call. There is no double-firing. test(appsec): add earlyDep10ForkedTest to cover Jetty 10.0.0–10.0.9 The jetty-appsec-9.4 early_10_series muzzle pass covers [10.0.0, 10.0.10) where _multiParts is MultiPartFormInputStream (before the type changed to MultiParts in 10.0.10). The existing test suite used 10.0.10, leaving the early versions untested. Add earlyDep10ForkedTest (Jetty 10.0.9) to exercise the OR-muzzle reference and verify that multipart filename events fire correctly on the old field type. All three filename tests pass: filenames, filenames-called-once, filenames-combined. refactor(appsec/jetty): extract fire-event logic into helpers; fix ASM API constant Move duplicated IG-callback + blocking-commit blocks out of advice into helper methods (MultipartHelper.fireFilenamesEvent / PartHelper.fireBodyProcessedEvent + fireFilenamesEvent) that return BlockingException|null, exploiting @Advice.Thrown(readOnly=false) assignment behaviour. Also replace hardcoded Opcodes.ASM9 with OpenedClassReader.ASM_API in RequestGetPartsInstrumentation and fix extractFormFields to use computeIfAbsent instead of get+put. fix(appsec/jetty8): prevent double-firing filename event when getPart() delegates to getParts() In Jetty 9.0/9.1 (covered by jetty-appsec-8.1.3's [8.1.3,9.2.0.RC0) range), Request.getPart(String) delegates to getParts() internally. Without this fix, GetFilenamesAdvice fires for the full collection (via the internal getParts() call) and then GetPartAdvice fires again for the returned singleton, because the two advice classes use independent call-depth keys and cannot see each other. Fix: peek at the Part.class call depth in GetFilenamesAdvice.before(). If > 1, GetPartAdvice is active on the stack and will handle the event; skip to avoid double-firing. In Jetty 8.x (where getPart() does not delegate), the peek is always 1, so GetFilenamesAdvice continues to fire normally. fix(appsec/jetty8): correct partPeek condition — use == 0 instead of == 1 CallDepthThreadLocalMap.incrementCallDepth() uses post-increment (depth++) so it returns the depth BEFORE the increment. In the normal case (no GetPartAdvice active), Part.class depth is 0 before the peek, making partPeek == 0. The previous guard checked partPeek == 1 which is true only when GetPartAdvice IS already on the stack — exactly backwards. Result: GetFilenamesAdvice never fired for direct getParts() calls, breaking the filenames event on Jetty 8.x. Fix: use partPeek == 0 (proceed when GetPartAdvice is not active) so the condition is: - partPeek == 0: normal direct getParts() → proceed (fire filenames event) - partPeek == 1: getParts() called by getPart() in Jetty 9.0/9.1 → skip (GetPartAdvice handles it) fix(appsec/jetty8): inspect all cached parts in GetPartAdvice, not just the singleton When getPart("field") is the app's first multipart access, Jetty 8 parses the entire multipart stream and caches all parts in _multiPartInputStream, but only returns the one requested part. The previous advice forwarded just that singleton to AppSec, so any co-uploaded file parts were invisible to requestFilesFilenames — a WAF bypass if the app never called getParts() explicitly. Fix: read all cached parts via MultiPartInputStream.getParts() (reflected, cached handle) and fall back to the singleton only when reflection fails. Also remove the part==null early return: even if the requested field was not found, other file parts may have parsed. Add PartHelper.getAllParts(Object, Part) + FakeMpi unit tests. fix(appsec/jetty8): guard GetPartAdvice against repeated getPart() calls The Part.class depth check only prevents re-entry within a single getPart() invocation; after the call returns the depth is 0 again, so a second getPart("file") call on the same request would re-fire requestBodyProcessed and requestFilesFilenames with the same cached parts. Add the same _multiPartInputStream == null guard that GetFilenamesAdvice already uses: once the field is set the multipart body was parsed and events were already dispatched — skip. fix(appsec/jetty8): respect part Content-Type charset in extractFormFields Hard-coded UTF-8 in readPartContent() caused mojibake for fields with Content-Type: text/plain; charset=ISO-8859-1 (or any non-UTF-8 charset). Now parses the charset from the part's Content-Type header and falls back to UTF-8 only when absent or unrecognised. fix(appsec/jetty10): regenerate lockfile and force 10.0.9 for earlyDep10ForkedTest The lockfile was out of sync: testCompileClasspath was locked to 10.0.0 instead of 10.0.10, and earlyDep10ForkedTest configurations were missing entirely. Regenerated with --write-locks. Also added a resolutionStrategy to force Jetty 10.0.9 for earlyDep10ForkedTest: without it, Gradle picks 10.0.10 (inherited via testImplementation), defeating the purpose of the suite which exercises the MultiPartFormInputStream path present in [10.0.0, 10.0.10). fix(appsec/jetty): pendingBlock pattern, jetty9.2 filenames, tryCommit check, per-part try/catch - Fix body+filenames ordering bug in jetty8 GetFilenamesAdvice and GetPartAdvice: both callbacks now always fire even when body blocks (pendingBlock pattern, appsec-ig-events §7) - Add requestFilesFilenames support for jetty-appsec-9.2 ([9.2, 9.3)): new MultipartHelper, GetFilenamesAdvice, GetFilenamesFromMultiPartAdvice, and integration test Jetty92LatestDepForkedTest - Fix tryCommitBlockingResponse() return not checked before effectivelyBlocked() in PartHelper (jetty8) and MultipartHelper (jetty9.3, 9.4, 11.0) - Add per-part try/catch in extractFilenames() and extractFormFields() loops in PartHelper and all MultipartHelper implementations test(appsec/jetty): migrate 8 new Groovy test files to Java/JUnit 5 Satisfies the enforce-groovy-migration CI check. All 8 Groovy test files introduced in this PR are replaced by Java equivalents: - jetty-appsec-8.1.3: PartHelperTest (36 unit tests via Mockito) - jetty-appsec-9.2/9.3/9.4: MultipartHelperTest (8 unit tests each) - jetty-appsec-11.0: MultipartHelperTest using jakarta.servlet.http.Part - jetty-server-7.6: Jetty8LatestDepForkedTest (extends Jetty76Test) - jetty-server-9.0.4: Jetty92LatestDepForkedTest (extends Jetty9Test) - jetty-server-10.0: Jetty10EarlyDepForkedTest (extends Jetty10Test) Integration tests extending Groovy Spock base classes are placed in src/test/groovy/ as .java files so groovyc compiles them together with the Groovy classes they extend, avoiding the compileTestJava ordering issue. This pattern is already used elsewhere in the repo. test(appsec/jetty): delete the 8 replaced Groovy test files fix(appsec/jetty): add catch comments and remove dead call-depth decrement - Add explanatory comments to all catch(Exception ignored) blocks in PartHelper and MultipartHelper across jetty8/9.2/9.3/9.4/11.0 modules, consistent with the pattern used in Jersey and GlassFish helpers - Remove spurious CallDepthThreadLocalMap.decrementCallDepth(Request.class) from jetty92 GetPartsAdvice.after() which had no matching increment and was corrupting the thread-local counter refactor(appsec/jetty): address review comments from amarziali - ArrayList(parts.size()) in extractFilenames() across all 5 modules to pre-size the list and avoid rehashing - Callback-before-extract optimization in fireFilenamesEvent() and fireBodyProcessedEvent(): check callback != null before calling extractFilenames()/extractFormFields() so we skip Part iteration when AppSec is not listening - WithTypeStructure.structureMatcher() in jetty-appsec-11.0 to replace additionalMuzzleReferences() for javax vs jakarta DispatcherType discrimination; evaluated per-class at transformation time - Skip-increment optimization in ExtractContentParametersAdvice and GetFilenamesAdvice (jetty-appsec-11.0): return false early when guard fields are already non-null, avoiding CallDepthThreadLocalMap overhead on cached repeat calls - IODH + MethodHandle in PartHelper (jetty-appsec-8.1.3) replacing volatile Method for MultiPartInputStream.getParts() resolution; inner class MpiGetPartsHolder added to helperClassNames() fix(appsec/jetty8): duck-typed reflection fallback in getAllParts() when IODH handle is null MpiGetPartsHolder resolves MultiPartInputStream.getParts() at class-load time via Class.forName(). In test environments where jetty-server is not on the test classpath (compileOnly only), GET_PARTS is null and the MethodHandle path is unavailable. Add duck-typed reflection as fallback: when GET_PARTS is null, call getParts() via getClass().getMethod("getParts").invoke(...). In production the fast MethodHandle path always wins; the reflection fallback only activates when the class could not be resolved. This restores getAllPartsReturnsAllPartsFromMultiPartInputStream and getAllPartsPrefersFullCollectionOverSingleton unit tests that regressed after the IODH refactor. fix(appsec/jetty11): revert GetFilenamesAdvice skip-increment optimization The skip-increment optimization introduced in the amarziali review commit broke the shared Collection.class depth counter that GetFilenamesAdvice and GetFilenamesFromMultiPartAdvice rely on to coordinate. In Jetty 11.0.0, public getParts() delegates to the private getParts(MultiMap) overload. GetFilenamesAdvice increments Collection depth before the public method runs, which raises the depth so GetFilenamesFromMultiPartAdvice (also applied to the private overload) sees depth > 0 and skips firing. When the optimization skipped the increment because _multiParts != null, the private getParts(MultiMap) call found Collection depth = 0 on the second and third repeated calls and fired the requestFilesFilenames callback again, causing _dd.appsec.filenames.cb.calls = 3 (BODY_MULTIPART_REPEATED) and = 2 (BODY_MULTIPART_COMBINED) instead of the expected 1. Fix: restore the original always-increment/always-decrement pattern in GetFilenamesAdvice so the depth counter remains balanced on every code path. refactor(appsec/jetty8): remove duck-typed fallback from getAllParts, use real MultiPartInputStream in tests The reflection fallback (getClass().getMethod("getParts").invoke(...)) was only needed because MultiPartInputStream was not on the test classpath, causing the IODH MethodHandle to initialize to null. Fix the root cause instead: add testImplementation for jetty-server 8.1.3.v20120416 and replace the FakeMpi stub with mock(MultiPartInputStream.class). fix(appsec/jetty8): add log.debug to all PartHelper catch blocks - getAllParts: log.debug on MethodHandle invocation failure - extractFilenames: log.debug when skipping a malformed part - extractFormFields: log.debug when skipping a malformed part - readPartContent: log.debug on IOException before returning null IODH static block and charsetFromContentType left comment-only: static initializer context and attacker-controlled input respectively. fix(appsec/jetty8): replace increment+decrement peek with getCallDepth Use CallDepthThreadLocalMap.getCallDepth(Part.class) to read the current depth without modifying it, instead of the equivalent incrementCallDepth + decrementCallDepth pair. fix(appsec/jetty): use MultipartHelper.class as CallDepthThreadLocalMap key Replace Collection.class with MultipartHelper.class in all four jetty appsec modules (9.2, 9.3, 9.4, 11.0). Collection.class is a generic JDK class that any other instrumentation could use as a key on the same thread, silently corrupting call depth tracking. MultipartHelper.class is specific to each module and cannot collide with other instrumentations. Merge branch 'master' into alejandro.gonzalez/APPSEC-61873-3 Co-authored-by: devflow.devflow-routing-intake --- .../AppSecInactiveHttpServerTest.groovy | 5 + .../agent/test/base/HttpServerTest.groovy | 63 ++++ .../armeria/armeria-jetty-1.24/build.gradle | 2 + .../jetty-appsec-11.0/build.gradle | 29 ++ .../jetty-appsec-11.0/gradle.lockfile | 127 +++++++ .../jetty11/MultipartHelper.java | 77 +++++ ...tractContentParametersInstrumentation.java | 193 +++++++++++ .../jetty11/MultipartHelperTest.java | 67 ++++ .../jetty-appsec-8.1.3/build.gradle | 6 +- .../jetty8/ParameterCollector.java | 59 ---- .../instrumentation/jetty8/PartHelper.java | 307 +++++++++++++++++ .../RequestGetPartsInstrumentation.java | 221 ++++-------- .../jetty8/PartHelperTest.java | 324 ++++++++++++++++++ .../jetty-appsec-9.2/build.gradle | 5 +- .../jetty92/MultipartHelper.java | 77 +++++ ...tractContentParametersInstrumentation.java | 80 ++++- .../jetty92/MultipartHelperTest.java | 67 ++++ .../jetty-appsec-9.3/build.gradle | 7 +- .../jetty93/MultipartHelper.java | 77 +++++ ...tractContentParametersInstrumentation.java | 88 +++++ .../jetty93/MultipartHelperTest.java | 67 ++++ .../jetty-appsec-9.4/build.gradle | 32 ++ .../jetty-appsec-9.4/gradle.lockfile | 126 +++++++ .../jetty94/MultipartHelper.java | 77 +++++ ...tractContentParametersInstrumentation.java | 199 +++++++++++ .../jetty94/MultipartHelperTest.java | 67 ++++ .../jetty-server-10.0/build.gradle | 45 ++- .../jetty-server-10.0/gradle.lockfile | 253 ++++++++------ .../jetty10/Jetty10EarlyDepForkedTest.java | 58 ++++ .../jetty10/Jetty10Test.groovy | 15 + .../jetty-server-11.0/build.gradle | 2 +- .../src/test/groovy/Jetty11Test.groovy | 15 + .../test/groovy/JettyAsyncHandlerTest.groovy | 15 + .../jetty-server-12.0/build.gradle | 2 + .../jetty-server-7.6/build.gradle | 11 + .../jetty-server-7.6/gradle.lockfile | 2 +- .../groovy/Jetty8LatestDepForkedTest.java | 133 +++++++ .../jetty-server-9.0.4/build.gradle | 4 + .../jetty9/Jetty92LatestDepForkedTest.java | 77 +++++ .../jetty9/Jetty9InactiveAppSecTest.groovy | 8 + .../instrumentation/jetty9/Jetty9Test.groovy | 5 +- .../jetty9/Jetty9InactiveAppSecTest.groovy | 8 + .../instrumentation/jetty9/Jetty9Test.groovy | 5 +- .../jetty-server-9.3/build.gradle | 1 + .../instrumentation/jetty9/Jetty9Test.groovy | 15 + .../jetty-server-9.4.21/build.gradle | 2 +- .../instrumentation/jetty9/Jetty9Test.groovy | 15 + .../servlet5/TestServlet5.groovy | 18 + .../servlet3/TestServlet3.groovy | 18 + settings.gradle.kts | 2 + 50 files changed, 2837 insertions(+), 341 deletions(-) create mode 100644 dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/build.gradle create mode 100644 dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/gradle.lockfile create mode 100644 dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/src/main/java/datadog/trace/instrumentation/jetty11/MultipartHelper.java create mode 100644 dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/src/main/java/datadog/trace/instrumentation/jetty11/RequestExtractContentParametersInstrumentation.java create mode 100644 dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/src/test/java/datadog/trace/instrumentation/jetty11/MultipartHelperTest.java delete mode 100644 dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/src/main/java/datadog/trace/instrumentation/jetty8/ParameterCollector.java create mode 100644 dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/src/main/java/datadog/trace/instrumentation/jetty8/PartHelper.java create mode 100644 dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/src/test/java/datadog/trace/instrumentation/jetty8/PartHelperTest.java create mode 100644 dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/src/main/java/datadog/trace/instrumentation/jetty92/MultipartHelper.java create mode 100644 dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/src/test/java/datadog/trace/instrumentation/jetty92/MultipartHelperTest.java create mode 100644 dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/src/main/java/datadog/trace/instrumentation/jetty93/MultipartHelper.java create mode 100644 dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/src/test/java/datadog/trace/instrumentation/jetty93/MultipartHelperTest.java create mode 100644 dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/build.gradle create mode 100644 dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/gradle.lockfile create mode 100644 dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/src/main/java/datadog/trace/instrumentation/jetty94/MultipartHelper.java create mode 100644 dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/src/main/java/datadog/trace/instrumentation/jetty94/RequestExtractContentParametersInstrumentation.java create mode 100644 dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/src/test/java/datadog/trace/instrumentation/jetty94/MultipartHelperTest.java create mode 100644 dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/test/groovy/datadog/trace/instrumentation/jetty10/Jetty10EarlyDepForkedTest.java create mode 100644 dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/test/groovy/Jetty8LatestDepForkedTest.java create mode 100644 dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty92LatestDepForkedTest.java diff --git a/dd-java-agent/appsec/appsec-test-fixtures/src/main/groovy/com/datadog/appsec/AppSecInactiveHttpServerTest.groovy b/dd-java-agent/appsec/appsec-test-fixtures/src/main/groovy/com/datadog/appsec/AppSecInactiveHttpServerTest.groovy index 140893ec525..37a0d56f7fa 100644 --- a/dd-java-agent/appsec/appsec-test-fixtures/src/main/groovy/com/datadog/appsec/AppSecInactiveHttpServerTest.groovy +++ b/dd-java-agent/appsec/appsec-test-fixtures/src/main/groovy/com/datadog/appsec/AppSecInactiveHttpServerTest.groovy @@ -139,8 +139,13 @@ abstract class AppSecInactiveHttpServerTest extends WithHttpServer { } } + protected boolean supportsMultipart() { + true + } + void multipart() { setup: + assumeTrue supportsMultipart() def body = new MultipartBody.Builder() .setType(MultipartBody.FORM) .addFormDataPart('a', 'x') diff --git a/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/base/HttpServerTest.groovy b/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/base/HttpServerTest.groovy index 03fced9538e..3cf73374fb2 100644 --- a/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/base/HttpServerTest.groovy +++ b/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/base/HttpServerTest.groovy @@ -65,6 +65,8 @@ import java.util.function.Supplier 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 +import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_MULTIPART_REPEATED import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_URLENCODED import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.CREATED import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.CREATED_IS @@ -369,6 +371,14 @@ abstract class HttpServerTest extends WithHttpServer { false } + boolean testBodyFilenamesCalledOnce() { + false + } + + boolean testBodyFilenamesCalledOnceCombined() { + false + } + boolean testBodyFilenames() { false } @@ -481,6 +491,8 @@ abstract class HttpServerTest extends WithHttpServer { CREATED_IS("created_input_stream", 201, "created"), BODY_URLENCODED("body-urlencoded?ignore=pair", 200, '[a:[x]]'), BODY_MULTIPART("body-multipart?ignore=pair", 200, '[a:[x]]'), + BODY_MULTIPART_REPEATED("body-multipart-repeated", 200, "ok"), + BODY_MULTIPART_COMBINED("body-multipart-combined", 200, "ok"), BODY_JSON("body-json", 200, '{"a":"x"}'), BODY_XML("body-xml", 200, 'mytext'), REDIRECT("redirect", 302, "/redirected"), @@ -1657,6 +1669,54 @@ abstract class HttpServerTest extends WithHttpServer { response.close() } + def 'test instrumentation gateway file upload filenames called once'() { + setup: + assumeTrue(testBodyFilenamesCalledOnce()) + RequestBody fileBody = RequestBody.create(MediaType.parse('application/octet-stream'), 'file content') + def body = new MultipartBody.Builder() + .setType(MultipartBody.FORM) + .addFormDataPart('file', 'evil.php', fileBody) + .build() + def httpRequest = request(BODY_MULTIPART_REPEATED, 'POST', body).build() + def response = client.newCall(httpRequest).execute() + + when: + TEST_WRITER.waitForTraces(1) + + then: + TEST_WRITER.get(0).any { + it.getTag('request.body.filenames') == "[evil.php]" + && it.getTag('_dd.appsec.filenames.cb.calls') == 1 + } + + cleanup: + response.close() + } + + def 'test instrumentation gateway file upload filenames called once via parameter map'() { + setup: + assumeTrue(testBodyFilenamesCalledOnceCombined()) + RequestBody fileBody = RequestBody.create(MediaType.parse('application/octet-stream'), 'file content') + def body = new MultipartBody.Builder() + .setType(MultipartBody.FORM) + .addFormDataPart('file', 'evil.php', fileBody) + .build() + def httpRequest = request(BODY_MULTIPART_COMBINED, 'POST', body).build() + def response = client.newCall(httpRequest).execute() + + when: + TEST_WRITER.waitForTraces(1) + + then: + TEST_WRITER.get(0).any { + it.getTag('request.body.filenames') == "[evil.php]" + && it.getTag('_dd.appsec.filenames.cb.calls') == 1 + } + + cleanup: + response.close() + } + def 'test instrumentation gateway file upload content'() { setup: assumeTrue(testBodyFilesContent()) @@ -2667,6 +2727,7 @@ abstract class HttpServerTest extends WithHttpServer { Object responseBody List uploadedFilenames List uploadedFilesContent + int uploadedFilenamesCallCount = 0 } static final String stringOrEmpty(String string) { @@ -2840,6 +2901,8 @@ abstract class HttpServerTest extends WithHttpServer { rqCtxt.traceSegment.setTagTop('request.body.filenames', filenames as String) Context context = rqCtxt.getData(RequestContextSlot.APPSEC) context.uploadedFilenames = filenames + context.uploadedFilenamesCallCount++ + rqCtxt.traceSegment.setTagTop('_dd.appsec.filenames.cb.calls', context.uploadedFilenamesCallCount) Flow.ResultFlow.empty() } as BiFunction, Flow>) diff --git a/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/build.gradle b/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/build.gradle index 65cde281c07..2d8e7cf20a5 100644 --- a/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/build.gradle +++ b/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/build.gradle @@ -87,6 +87,8 @@ dependencies { testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0') testRuntimeOnly(project(':dd-java-agent:instrumentation:jetty:jetty-util-9.4.31')) testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.3') + testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.4') + testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-11.0') testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:jakarta-servlet-5.0') testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0') } diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/build.gradle new file mode 100644 index 00000000000..4eaaee67246 --- /dev/null +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/build.gradle @@ -0,0 +1,29 @@ +muzzle { + pass { + group = 'org.eclipse.jetty' + module = 'jetty-server' + versions = '[11.0,12.0)' + assertInverse = true + javaVersion = 11 + } +} + +apply from: "$rootDir/gradle/java.gradle" + +dependencies { + compileOnly(group: 'org.eclipse.jetty', name: 'jetty-server', version: '11.0.26') { + exclude group: 'org.slf4j', module: 'slf4j-api' + } + testImplementation(group: 'org.eclipse.jetty.toolchain', name: 'jetty-jakarta-servlet-api', version: '5.0.1') + testImplementation libs.bundles.mockito +} + +tasks.withType(JavaCompile).configureEach { + configureCompiler(it, 11, JavaVersion.VERSION_1_8) +} + +tasks.withType(Test).configureEach { + javaLauncher = getJavaLauncherFor(11) +} + +// testing happens in the jetty-* modules diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/gradle.lockfile new file mode 100644 index 00000000000..ddb930c8200 --- /dev/null +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/gradle.lockfile @@ -0,0 +1,127 @@ +# This is a Gradle generated file for dependency locking. +# Manual edits can break the build and are not advised. +# This file is expected to be part of source control. +cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath +cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath +ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath +ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath +com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath +com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.3=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:java-dogstatsd-client:4.4.3=testRuntimeClasspath +com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath +com.github.javaparser:javaparser-core:3.25.6=codenarc +com.github.jnr:jffi:1.3.14=testRuntimeClasspath +com.github.jnr:jnr-a64asm:1.0.0=testRuntimeClasspath +com.github.jnr:jnr-constants:0.10.4=testRuntimeClasspath +com.github.jnr:jnr-enxio:0.32.19=testRuntimeClasspath +com.github.jnr:jnr-ffi:2.2.18=testRuntimeClasspath +com.github.jnr:jnr-posix:3.1.21=testRuntimeClasspath +com.github.jnr:jnr-unixsocket:0.38.24=testRuntimeClasspath +com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs:4.9.8=spotbugs +com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs +com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath +com.google.auto.service:auto-service:1.1.1=annotationProcessor,testAnnotationProcessor +com.google.auto:auto-common:1.2.1=annotationProcessor,testAnnotationProcessor +com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +com.google.code.gson:gson:2.13.2=spotbugs +com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor +com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.re2j:re2j:1.7=testRuntimeClasspath +com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath +com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath +com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath +com.squareup.okio:okio:1.17.5=testCompileClasspath,testRuntimeClasspath +com.thoughtworks.qdox:qdox:1.12.1=codenarc +commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClasspath +commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath +commons-io:commons-io:2.20.0=spotbugs +de.thetaphi:forbiddenapis:3.10=compileClasspath +io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath +io.sqreen:libsqreen:17.3.0=testRuntimeClasspath +javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath +jaxen:jaxen:2.0.0=spotbugs +junit:junit:4.13.2=testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.3=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.3=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath +net.java.dev.jna:jna:5.8.0=testRuntimeClasspath +net.sf.saxon:Saxon-HE:12.9=spotbugs +org.apache.ant:ant-antlr:1.10.14=codenarc +org.apache.ant:ant-junit:1.10.14=codenarc +org.apache.bcel:bcel:6.11.0=spotbugs +org.apache.commons:commons-lang3:3.19.0=spotbugs +org.apache.commons:commons-text:1.14.0=spotbugs +org.apache.logging.log4j:log4j-api:2.25.2=spotbugs +org.apache.logging.log4j:log4j-core:2.25.2=spotbugs +org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath +org.checkerframework:checker-qual:3.33.0=annotationProcessor,testAnnotationProcessor +org.codehaus.groovy:groovy-ant:3.0.23=codenarc +org.codehaus.groovy:groovy-docgenerator:3.0.23=codenarc +org.codehaus.groovy:groovy-groovydoc:3.0.23=codenarc +org.codehaus.groovy:groovy-json:3.0.23=codenarc +org.codehaus.groovy:groovy-json:3.0.25=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-templates:3.0.23=codenarc +org.codehaus.groovy:groovy-xml:3.0.23=codenarc +org.codehaus.groovy:groovy:3.0.23=codenarc +org.codehaus.groovy:groovy:3.0.25=testCompileClasspath,testRuntimeClasspath +org.codenarc:CodeNarc:3.7.0=codenarc +org.dom4j:dom4j:2.2.0=spotbugs +org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.1=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-http:11.0.0=compileClasspath +org.eclipse.jetty:jetty-io:11.0.0=compileClasspath +org.eclipse.jetty:jetty-server:11.0.0=compileClasspath +org.eclipse.jetty:jetty-util:11.0.0=compileClasspath +org.gmetrics:GMetrics:2.1.0=codenarc +org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath +org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath +org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath +org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath +org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter:5.14.1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath +org.junit.platform:junit-platform-runner:1.14.1=testRuntimeClasspath +org.junit.platform:junit-platform-suite-api:1.14.1=testRuntimeClasspath +org.junit.platform:junit-platform-suite-commons:1.14.1=testRuntimeClasspath +org.junit:junit-bom:5.14.0=spotbugs +org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath +org.mockito:mockito-core:4.4.0=testRuntimeClasspath +org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath +org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath +org.ow2.asm:asm-analysis:9.7.1=testRuntimeClasspath +org.ow2.asm:asm-analysis:9.9=spotbugs +org.ow2.asm:asm-commons:9.9=spotbugs +org.ow2.asm:asm-commons:9.9.1=testRuntimeClasspath +org.ow2.asm:asm-tree:9.9=spotbugs +org.ow2.asm:asm-tree:9.9.1=testRuntimeClasspath +org.ow2.asm:asm-util:9.7.1=testRuntimeClasspath +org.ow2.asm:asm-util:9.9=spotbugs +org.ow2.asm:asm:9.9=spotbugs +org.ow2.asm:asm:9.9.1=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:jcl-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath +org.slf4j:jul-to-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath +org.slf4j:log4j-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:1.7.30=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath +org.slf4j:slf4j-api:1.7.32=testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:2.0.17=spotbugs,spotbugsSlf4j +org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j +org.snakeyaml:snakeyaml-engine:2.9=buildTimeInstrumentationPlugin,muzzleTooling,runtimeClasspath,testRuntimeClasspath +org.spockframework:spock-bom:2.4-groovy-3.0=testCompileClasspath,testRuntimeClasspath +org.spockframework:spock-core:2.4-groovy-3.0=testCompileClasspath,testRuntimeClasspath +org.tabletest:tabletest-junit:1.2.1=testCompileClasspath,testRuntimeClasspath +org.tabletest:tabletest-parser:1.2.0=testCompileClasspath,testRuntimeClasspath +org.xmlresolver:xmlresolver:5.3.3=spotbugs +empty=spotbugsPlugins diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/src/main/java/datadog/trace/instrumentation/jetty11/MultipartHelper.java b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/src/main/java/datadog/trace/instrumentation/jetty11/MultipartHelper.java new file mode 100644 index 00000000000..388818f8704 --- /dev/null +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/src/main/java/datadog/trace/instrumentation/jetty11/MultipartHelper.java @@ -0,0 +1,77 @@ +package datadog.trace.instrumentation.jetty11; + +import static datadog.trace.api.gateway.Events.EVENTS; + +import datadog.appsec.api.blocking.BlockingException; +import datadog.trace.api.gateway.BlockResponseFunction; +import datadog.trace.api.gateway.CallbackProvider; +import datadog.trace.api.gateway.Flow; +import datadog.trace.api.gateway.RequestContext; +import datadog.trace.api.gateway.RequestContextSlot; +import datadog.trace.bootstrap.instrumentation.api.AgentTracer; +import jakarta.servlet.http.Part; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.function.BiFunction; + +public class MultipartHelper { + + private MultipartHelper() {} + + /** + * Extracts non-null, non-empty filenames from a collection of multipart {@link Part}s using + * {@link Part#getSubmittedFileName()} (Servlet 5.0+, Jetty 11.x). + * + * @return list of filenames; never {@code null}, may be empty + */ + public static List extractFilenames(Collection parts) { + if (parts == null || parts.isEmpty()) { + return Collections.emptyList(); + } + List filenames = new ArrayList<>(parts.size()); + for (Part part : parts) { + try { + String name = part.getSubmittedFileName(); + if (name != null && !name.isEmpty()) { + filenames.add(name); + } + } catch (Exception ignored) { + // malformed or inaccessible part — skip and continue with remaining parts + } + } + return filenames; + } + + /** + * Fires the {@code requestFilesFilenames} IG event and returns a {@link BlockingException} if the + * WAF requests blocking, or {@code null} otherwise. + */ + public static BlockingException fireFilenamesEvent( + Collection parts, RequestContext reqCtx) { + CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC); + BiFunction, Flow> callback = + cbp.getCallback(EVENTS.requestFilesFilenames()); + if (callback == null) { + return null; + } + List filenames = extractFilenames(parts); + if (filenames.isEmpty()) { + return null; + } + Flow flow = callback.apply(reqCtx, filenames); + Flow.Action action = flow.getAction(); + if (action instanceof Flow.Action.RequestBlockingAction) { + Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action; + BlockResponseFunction brf = reqCtx.getBlockResponseFunction(); + if (brf != null) { + if (brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba)) { + reqCtx.getTraceSegment().effectivelyBlocked(); + return new BlockingException("Blocked request (multipart file upload)"); + } + } + } + return null; + } +} diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/src/main/java/datadog/trace/instrumentation/jetty11/RequestExtractContentParametersInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/src/main/java/datadog/trace/instrumentation/jetty11/RequestExtractContentParametersInstrumentation.java new file mode 100644 index 00000000000..3e32765c578 --- /dev/null +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/src/main/java/datadog/trace/instrumentation/jetty11/RequestExtractContentParametersInstrumentation.java @@ -0,0 +1,193 @@ +package datadog.trace.instrumentation.jetty11; + +import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.declaresField; +import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; +import static datadog.trace.api.gateway.Events.EVENTS; +import static net.bytebuddy.matcher.ElementMatchers.fieldType; +import static net.bytebuddy.matcher.ElementMatchers.takesArguments; + +import com.google.auto.service.AutoService; +import datadog.appsec.api.blocking.BlockingException; +import datadog.trace.advice.ActiveRequestContext; +import datadog.trace.advice.RequiresRequestContext; +import datadog.trace.agent.tooling.Instrumenter; +import datadog.trace.agent.tooling.InstrumenterModule; +import datadog.trace.api.gateway.BlockResponseFunction; +import datadog.trace.api.gateway.CallbackProvider; +import datadog.trace.api.gateway.Flow; +import datadog.trace.api.gateway.RequestContext; +import datadog.trace.api.gateway.RequestContextSlot; +import datadog.trace.bootstrap.CallDepthThreadLocalMap; +import datadog.trace.bootstrap.instrumentation.api.AgentTracer; +import jakarta.servlet.http.Part; +import java.util.Collection; +import java.util.function.BiFunction; +import net.bytebuddy.asm.Advice; +import net.bytebuddy.description.type.TypeDescription; +import net.bytebuddy.implementation.bytecode.assign.Assigner; +import net.bytebuddy.matcher.ElementMatcher; +import org.eclipse.jetty.server.Request; +import org.eclipse.jetty.util.MultiMap; + +@AutoService(InstrumenterModule.class) +public class RequestExtractContentParametersInstrumentation extends InstrumenterModule.AppSec + implements Instrumenter.ForSingleType, + Instrumenter.WithTypeStructure, + Instrumenter.HasMethodAdvice { + + public RequestExtractContentParametersInstrumentation() { + super("jetty"); + } + + @Override + public String instrumentedType() { + return "org.eclipse.jetty.server.Request"; + } + + @Override + public String[] helperClassNames() { + return new String[] {packageName + ".MultipartHelper"}; + } + + // Discriminates Jetty 11.0.x ([11.0, 12.0)): + // - _contentParameters: MultiMap field exists in 11.x (excludes Jetty 12 where + // org.eclipse.jetty.server.Request was removed) + // - _dispatcherType: jakarta.servlet.DispatcherType in the Request bytecode (excludes + // Jetty 9.4–10.x where the field type is javax.servlet.DispatcherType). Checked against + // Request.class bytecode, so it works even when both javax and jakarta are on the classpath. + // NOTE: _multiParts changes type at 11.0.10 (MultiPartFormInputStream → MultiParts); both + // are handled transparently because GetFilenamesAdvice reads it with typing=DYNAMIC. + @Override + public ElementMatcher structureMatcher() { + return declaresField( + named("_contentParameters").and(fieldType(named("org.eclipse.jetty.util.MultiMap")))) + .and( + declaresField( + named("_dispatcherType").and(fieldType(named("jakarta.servlet.DispatcherType"))))); + } + + @Override + public void methodAdvice(MethodTransformer transformer) { + transformer.applyAdvice( + named("extractContentParameters").and(takesArguments(0)).or(named("getParts")), + getClass().getName() + "$ExtractContentParametersAdvice"); + transformer.applyAdvice( + named("getParts").and(takesArguments(0)), getClass().getName() + "$GetFilenamesAdvice"); + transformer.applyAdvice( + named("getParts").and(takesArguments(1)), + getClass().getName() + "$GetFilenamesFromMultiPartAdvice"); + } + + @RequiresRequestContext(RequestContextSlot.APPSEC) + public static class ExtractContentParametersAdvice { + @Advice.OnMethodEnter(suppress = Throwable.class) + static boolean before(@Advice.FieldValue("_contentParameters") final MultiMap map) { + if (map != null) { + return false; + } + CallDepthThreadLocalMap.incrementCallDepth(Request.class); + return true; + } + + @Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class) + static void after( + @Advice.Enter boolean proceed, + @Advice.FieldValue("_contentParameters") final MultiMap map, + @ActiveRequestContext RequestContext reqCtx, + @Advice.Thrown(readOnly = false) Throwable t) { + if (!proceed) { + return; + } + if (CallDepthThreadLocalMap.decrementCallDepth(Request.class) != 0) { + return; + } + if (map == null || map.isEmpty()) { + return; + } + + CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC); + BiFunction> callback = + cbp.getCallback(EVENTS.requestBodyProcessed()); + if (callback == null) { + return; + } + + Flow flow = callback.apply(reqCtx, map); + Flow.Action action = flow.getAction(); + if (action instanceof Flow.Action.RequestBlockingAction) { + Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action; + BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction(); + if (blockResponseFunction != null) { + blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba); + if (t == null) { + t = new BlockingException("Blocked request (for Request/extractContentParameters)"); + reqCtx.getTraceSegment().effectivelyBlocked(); + } + } + } + } + } + + /** + * Fires the {@code requestFilesFilenames} event when the application calls public {@code + * getParts()}. Guards prevent double-firing: + * + *
    + *
  • {@code _contentParameters != null}: set by {@code extractContentParameters()} (the {@code + * getParameterMap()} path); means filenames were already reported via {@code + * GetFilenamesFromMultiPartAdvice}. + *
  • {@code _multiParts != null}: set by the first {@code getParts()} call in Jetty 11.0.x; + * means filenames were already reported. + *
+ */ + @RequiresRequestContext(RequestContextSlot.APPSEC) + public static class GetFilenamesAdvice { + @Advice.OnMethodEnter(suppress = Throwable.class) + static boolean before( + @Advice.FieldValue("_contentParameters") final MultiMap contentParameters, + @Advice.FieldValue(value = "_multiParts", typing = Assigner.Typing.DYNAMIC) + final Object multiParts) { + final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(MultipartHelper.class); + return callDepth == 0 && contentParameters == null && multiParts == null; + } + + @Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class) + static void after( + @Advice.Enter boolean proceed, + @Advice.Return Collection parts, + @ActiveRequestContext RequestContext reqCtx, + @Advice.Thrown(readOnly = false) Throwable t) { + CallDepthThreadLocalMap.decrementCallDepth(MultipartHelper.class); + if (!proceed || t != null || parts == null || parts.isEmpty()) { + return; + } + t = MultipartHelper.fireFilenamesEvent(parts, reqCtx); + } + } + + /** + * Fires the {@code requestFilesFilenames} event when multipart content is parsed via the internal + * {@code getParts(MultiMap)} path triggered by {@code getParameter*()} / {@code + * getParameterMap()} — i.e. when the application never calls public {@code getParts()}. + */ + @RequiresRequestContext(RequestContextSlot.APPSEC) + public static class GetFilenamesFromMultiPartAdvice { + @Advice.OnMethodEnter(suppress = Throwable.class) + static boolean before() { + return CallDepthThreadLocalMap.incrementCallDepth(MultipartHelper.class) == 0; + } + + @Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class) + static void after( + @Advice.Enter boolean proceed, + @Advice.Return Collection parts, + @ActiveRequestContext RequestContext reqCtx, + @Advice.Thrown(readOnly = false) Throwable t) { + CallDepthThreadLocalMap.decrementCallDepth(MultipartHelper.class); + if (!proceed || t != null || parts == null || parts.isEmpty()) { + return; + } + t = MultipartHelper.fireFilenamesEvent(parts, reqCtx); + } + } +} diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/src/test/java/datadog/trace/instrumentation/jetty11/MultipartHelperTest.java b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/src/test/java/datadog/trace/instrumentation/jetty11/MultipartHelperTest.java new file mode 100644 index 00000000000..6a929e9debd --- /dev/null +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/src/test/java/datadog/trace/instrumentation/jetty11/MultipartHelperTest.java @@ -0,0 +1,67 @@ +package datadog.trace.instrumentation.jetty11; + +import static java.util.Arrays.asList; +import static java.util.Collections.emptyList; +import static java.util.Collections.singletonList; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import jakarta.servlet.http.Part; +import java.util.List; +import org.junit.jupiter.api.Test; + +class MultipartHelperTest { + + @Test + void returnsEmptyListForNull() { + assertEquals(emptyList(), MultipartHelper.extractFilenames(null)); + } + + @Test + void returnsEmptyListForEmpty() { + assertEquals(emptyList(), MultipartHelper.extractFilenames(emptyList())); + } + + @Test + void returnsEmptyListWhenAllPartsHaveNullFilename() { + List parts = asList(part(null), part(null)); + assertEquals(emptyList(), MultipartHelper.extractFilenames(parts)); + } + + @Test + void returnsEmptyListWhenAllPartsHaveEmptyFilename() { + List parts = asList(part(""), part("")); + assertEquals(emptyList(), MultipartHelper.extractFilenames(parts)); + } + + @Test + void extractsFilenameFromSinglePart() { + List parts = singletonList(part("photo.jpg")); + assertEquals(singletonList("photo.jpg"), MultipartHelper.extractFilenames(parts)); + } + + @Test + void extractsFilenamesFromMultipleParts() { + List parts = asList(part("a.jpg"), part("b.png"), part("c.pdf")); + assertEquals(asList("a.jpg", "b.png", "c.pdf"), MultipartHelper.extractFilenames(parts)); + } + + @Test + void skipsPartsWithNullOrEmptyFilenameAndKeepsValid() { + List parts = asList(part(null), part("valid.txt"), part(""), part("other.zip")); + assertEquals(asList("valid.txt", "other.zip"), MultipartHelper.extractFilenames(parts)); + } + + @Test + void preservesFilenamesWithSpacesAndSpecialCharacters() { + List parts = asList(part("my file.tar.gz"), part("résumé.pdf")); + assertEquals(asList("my file.tar.gz", "résumé.pdf"), MultipartHelper.extractFilenames(parts)); + } + + private Part part(String submittedFileName) { + Part p = mock(Part.class); + when(p.getSubmittedFileName()).thenReturn(submittedFileName); + return p; + } +} diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/build.gradle index 86e26948d2d..70a700f8294 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/build.gradle +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/build.gradle @@ -11,6 +11,8 @@ apply from: "$rootDir/gradle/java.gradle" dependencies { compileOnly group: 'org.eclipse.jetty', name: 'jetty-server', version: '8.1.3.v20120416' -} + testImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '8.1.3.v20120416' -// testing happens in the jetty-* modules + testImplementation libs.bundles.mockito + testImplementation group: 'javax.servlet', name: 'javax.servlet-api', version: '3.0.1' +} diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/src/main/java/datadog/trace/instrumentation/jetty8/ParameterCollector.java b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/src/main/java/datadog/trace/instrumentation/jetty8/ParameterCollector.java deleted file mode 100644 index 73e7038238e..00000000000 --- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/src/main/java/datadog/trace/instrumentation/jetty8/ParameterCollector.java +++ /dev/null @@ -1,59 +0,0 @@ -package datadog.trace.instrumentation.jetty8; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -public interface ParameterCollector { - boolean isEmpty(); - - void put(String key, String value); - - Map> getMap(); - - class ParameterCollectorNoop implements ParameterCollector { - public static final ParameterCollector INSTANCE = new ParameterCollectorNoop(); - - private ParameterCollectorNoop() {} - - @Override - public boolean isEmpty() { - return true; - } - - @Override - public void put(String key, String value) {} - - @Override - public Map> getMap() { - return Collections.emptyMap(); - } - } - - class ParameterCollectorImpl implements ParameterCollector { - public Map> map; - - public boolean isEmpty() { - return map == null; - } - - public void put(String key, String value) { - if (map == null) { - map = new HashMap<>(); - } - List strings = map.get(key); - if (strings == null) { - strings = new ArrayList<>(); - map.put(key, strings); - } - strings.add(value); - } - - @Override - public Map> getMap() { - return map; - } - } -} diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/src/main/java/datadog/trace/instrumentation/jetty8/PartHelper.java b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/src/main/java/datadog/trace/instrumentation/jetty8/PartHelper.java new file mode 100644 index 00000000000..8fc2a44f22d --- /dev/null +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/src/main/java/datadog/trace/instrumentation/jetty8/PartHelper.java @@ -0,0 +1,307 @@ +package datadog.trace.instrumentation.jetty8; + +import static datadog.trace.api.gateway.Events.EVENTS; + +import datadog.appsec.api.blocking.BlockingException; +import datadog.trace.api.gateway.BlockResponseFunction; +import datadog.trace.api.gateway.CallbackProvider; +import datadog.trace.api.gateway.Flow; +import datadog.trace.api.gateway.RequestContext; +import datadog.trace.api.gateway.RequestContextSlot; +import datadog.trace.bootstrap.instrumentation.api.AgentTracer; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.function.BiFunction; +import javax.servlet.http.Part; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Helper for extracting filenames and form-field values from Servlet 3.0 {@link Part} objects. + * + *

{@code Part.getSubmittedFileName()} was added in Servlet 3.1 (Jetty 9.1+); for Jetty 8.x we + * must parse the {@code Content-Disposition} header manually. + */ +public class PartHelper { + + private static final Logger log = LoggerFactory.getLogger(PartHelper.class); + + private PartHelper() {} + + // Lazily resolves MultiPartInputStream.getParts() as a MethodHandle on first class access. + // Uses IODH so no volatile is needed; the JVM class-loading guarantee ensures safe publication. + private static final class MpiGetPartsHolder { + static final MethodHandle GET_PARTS; + + static { + MethodHandle h = null; + try { + Class cls = + Class.forName( + "org.eclipse.jetty.util.MultiPartInputStream", + false, + MpiGetPartsHolder.class.getClassLoader()); + h = MethodHandles.lookup().unreflect(cls.getMethod("getParts")); + } catch (Exception ignored) { + // class or method not available — getAllParts() falls back to singleton + } + GET_PARTS = h; + } + } + + /** + * Returns all parts from a {@code MultiPartInputStream} object (already-parsed, no re-trigger). + * Falls back to a singleton of {@code singlePart} if reflection fails or the collection is empty. + */ + public static Collection getAllParts(Object multiPartInputStream, Part singlePart) { + if (multiPartInputStream != null) { + MethodHandle mh = MpiGetPartsHolder.GET_PARTS; + if (mh != null) { + try { + @SuppressWarnings("unchecked") + Collection all = (Collection) mh.invoke(multiPartInputStream); + if (all != null && !all.isEmpty()) { + return all; + } + } catch (Throwable e) { + log.debug("getAllParts: MethodHandle invocation failed, falling back to singleton", e); + } + } + } + return singlePart != null ? Collections.singletonList(singlePart) : Collections.emptyList(); + } + + /** + * Returns filenames found in {@code parts} by parsing each part's {@code Content-Disposition} + * header for a {@code filename=} parameter. + */ + public static List extractFilenames(Collection parts) { + if (parts == null || parts.isEmpty()) { + return Collections.emptyList(); + } + List filenames = new ArrayList<>(parts.size()); + for (Object obj : parts) { + try { + String filename = filenameFromPart((Part) obj); + if (filename != null && !filename.isEmpty()) { + filenames.add(filename); + } + } catch (Exception e) { + log.debug("extractFilenames: skipping malformed part", e); + } + } + return filenames; + } + + /** + * Returns a name→values map of form-field parts (those without a {@code filename=} parameter). + * File-upload parts are skipped to avoid reading potentially large content. + */ + public static Map> extractFormFields(Collection parts) { + if (parts == null || parts.isEmpty()) { + return Collections.emptyMap(); + } + Map> result = new LinkedHashMap<>(); + for (Object obj : parts) { + try { + Part part = (Part) obj; + if (filenameFromPart(part) != null) { + continue; // file-upload part — skip + } + String name = part.getName(); + if (name == null) { + continue; + } + String value = readPartContent(part); + if (value == null) { + continue; + } + result.computeIfAbsent(name, k -> new ArrayList<>()).add(value); + } catch (Exception e) { + log.debug("extractFormFields: skipping malformed part", e); + } + } + return result; + } + + /** + * Extracts the {@code filename} value from a {@code Content-Disposition} header, or {@code null} + * if the part has no filename (i.e. it is a plain form field). + * + *

Uses a quote-aware parser so that semicolons inside a quoted filename (e.g. {@code + * filename="shell;evil.php"}) are not mistaken for parameter separators. + */ + static String filenameFromPart(Part part) { + String cd = part.getHeader("Content-Disposition"); + if (cd == null) { + return null; + } + int len = cd.length(); + int i = 0; + while (i < len) { + // Skip separators between parameters + while (i < len && (cd.charAt(i) == ';' || cd.charAt(i) == ' ' || cd.charAt(i) == '\t')) { + i++; + } + if (i >= len) break; + // Read parameter name (up to '=' or ';') + int nameStart = i; + while (i < len && cd.charAt(i) != '=' && cd.charAt(i) != ';') { + i++; + } + boolean isFilename = "filename".equalsIgnoreCase(cd.substring(nameStart, i).trim()); + if (i >= len || cd.charAt(i) == ';') { + // Value-less token (e.g. "form-data") — skip + continue; + } + i++; // skip '=' + String value; + if (i < len && cd.charAt(i) == '"') { + i++; // skip opening quote + StringBuilder sb = new StringBuilder(); + while (i < len && cd.charAt(i) != '"') { + if (cd.charAt(i) == '\\' && i + 1 < len) { + i++; // consume escape backslash, add next char literally + } + sb.append(cd.charAt(i++)); + } + if (i < len) i++; // skip closing quote + value = sb.toString(); + } else { + int valueStart = i; + while (i < len && cd.charAt(i) != ';') { + i++; + } + value = cd.substring(valueStart, i).trim(); + } + if (isFilename) { + // Return empty string (not null) so callers can distinguish "filename present but empty" + // from "no filename parameter". extractFormFields() uses != null to skip file parts, + // so empty string correctly prevents buffering a file-upload body with filename="". + return value; + } + } + return null; + } + + /** + * Fires the {@code requestBodyProcessed} IG event for form-field parts in {@code parts} and + * returns a {@link BlockingException} if the WAF requests blocking, or {@code null} otherwise. + */ + public static BlockingException fireBodyProcessedEvent( + Collection parts, RequestContext reqCtx) { + CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC); + BiFunction> callback = + cbp.getCallback(EVENTS.requestBodyProcessed()); + if (callback == null) { + return null; + } + Map> formFields = extractFormFields(parts); + if (formFields.isEmpty()) { + return null; + } + Flow flow = callback.apply(reqCtx, formFields); + Flow.Action action = flow.getAction(); + if (action instanceof Flow.Action.RequestBlockingAction) { + Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action; + BlockResponseFunction brf = reqCtx.getBlockResponseFunction(); + if (brf != null) { + if (brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba)) { + reqCtx.getTraceSegment().effectivelyBlocked(); + return new BlockingException("Blocked request (multipart form fields)"); + } + } + } + return null; + } + + /** + * Fires the {@code requestFilesFilenames} IG event for file-upload parts in {@code parts} and + * returns a {@link BlockingException} if the WAF requests blocking, or {@code null} otherwise. + */ + public static BlockingException fireFilenamesEvent(Collection parts, RequestContext reqCtx) { + CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC); + BiFunction, Flow> callback = + cbp.getCallback(EVENTS.requestFilesFilenames()); + if (callback == null) { + return null; + } + List filenames = extractFilenames(parts); + if (filenames.isEmpty()) { + return null; + } + Flow flow = callback.apply(reqCtx, filenames); + Flow.Action action = flow.getAction(); + if (action instanceof Flow.Action.RequestBlockingAction) { + Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action; + BlockResponseFunction brf = reqCtx.getBlockResponseFunction(); + if (brf != null) { + if (brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba)) { + reqCtx.getTraceSegment().effectivelyBlocked(); + return new BlockingException("Blocked request (multipart file upload)"); + } + } + } + return null; + } + + private static String readPartContent(Part part) { + Charset charset = charsetFromContentType(part.getContentType()); + try (InputStream is = part.getInputStream()) { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + byte[] buf = new byte[4096]; + int read; + while ((read = is.read(buf)) != -1) { + baos.write(buf, 0, read); + } + return new String(baos.toByteArray(), charset); + } catch (IOException e) { + log.debug("readPartContent: stream read failed", e); + return null; + } + } + + /** + * Parses the {@code charset} parameter from a {@code Content-Type} header value (e.g. {@code + * text/plain; charset=ISO-8859-1}). Returns UTF-8 when absent, unknown, or {@code null}. + */ + static Charset charsetFromContentType(String contentType) { + if (contentType != null) { + int idx = contentType.toLowerCase(Locale.ROOT).indexOf("charset="); + if (idx >= 0) { + String name = contentType.substring(idx + 8).trim(); + if (!name.isEmpty() && name.charAt(0) == '"') { + name = name.substring(1); + int end = name.indexOf('"'); + if (end >= 0) name = name.substring(0, end); + } else { + int end = 0; + while (end < name.length() + && name.charAt(end) != ';' + && !Character.isWhitespace(name.charAt(end))) { + end++; + } + name = name.substring(0, end); + } + try { + return Charset.forName(name); + } catch (Exception ignored) { + // unknown or unsupported charset name — fall back to UTF-8 + } + } + } + return StandardCharsets.UTF_8; + } +} diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/src/main/java/datadog/trace/instrumentation/jetty8/RequestGetPartsInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/src/main/java/datadog/trace/instrumentation/jetty8/RequestGetPartsInstrumentation.java index 104a3affa7c..2dc980dc1df 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/src/main/java/datadog/trace/instrumentation/jetty8/RequestGetPartsInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/src/main/java/datadog/trace/instrumentation/jetty8/RequestGetPartsInstrumentation.java @@ -1,48 +1,35 @@ package datadog.trace.instrumentation.jetty8; import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; -import static datadog.trace.api.gateway.Events.EVENTS; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import static net.bytebuddy.matcher.ElementMatchers.takesArguments; import com.google.auto.service.AutoService; import datadog.appsec.api.blocking.BlockingException; +import datadog.trace.advice.ActiveRequestContext; +import datadog.trace.advice.RequiresRequestContext; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; -import datadog.trace.api.gateway.BlockResponseFunction; -import datadog.trace.api.gateway.CallbackProvider; -import datadog.trace.api.gateway.Flow; import datadog.trace.api.gateway.RequestContext; import datadog.trace.api.gateway.RequestContextSlot; -import datadog.trace.bootstrap.instrumentation.api.AgentSpan; -import datadog.trace.bootstrap.instrumentation.api.AgentTracer; +import datadog.trace.bootstrap.CallDepthThreadLocalMap; import java.io.IOException; import java.io.InputStream; -import java.util.function.BiFunction; -import javax.servlet.ServletException; +import java.util.Collection; +import javax.servlet.http.Part; import net.bytebuddy.asm.Advice; -import net.bytebuddy.asm.AsmVisitorWrapper; -import net.bytebuddy.description.field.FieldDescription; -import net.bytebuddy.description.field.FieldList; -import net.bytebuddy.description.method.MethodList; -import net.bytebuddy.description.type.TypeDescription; -import net.bytebuddy.implementation.Implementation; +import net.bytebuddy.implementation.bytecode.assign.Assigner; import net.bytebuddy.jar.asm.ClassReader; import net.bytebuddy.jar.asm.ClassVisitor; -import net.bytebuddy.jar.asm.ClassWriter; import net.bytebuddy.jar.asm.FieldVisitor; import net.bytebuddy.jar.asm.MethodVisitor; import net.bytebuddy.jar.asm.Opcodes; -import net.bytebuddy.jar.asm.Type; import net.bytebuddy.matcher.ElementMatcher; -import net.bytebuddy.pool.TypePool; -import org.eclipse.jetty.server.Request; +import net.bytebuddy.utility.OpenedClassReader; @AutoService(InstrumenterModule.class) public class RequestGetPartsInstrumentation extends InstrumenterModule.AppSec - implements Instrumenter.ForSingleType, - Instrumenter.HasTypeAdvice, - Instrumenter.HasMethodAdvice { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public RequestGetPartsInstrumentation() { super("jetty"); } @@ -55,25 +42,17 @@ public String instrumentedType() { @Override public String[] helperClassNames() { return new String[] { - packageName + ".ParameterCollector", - packageName + ".ParameterCollector$ParameterCollectorImpl", - packageName + ".ParameterCollector$ParameterCollectorNoop", + packageName + ".PartHelper", packageName + ".PartHelper$MpiGetPartsHolder" }; } - @Override - public void typeAdvice(TypeTransformer transformer) { - transformer.applyAdvice(new GetPartsVisitorWrapper()); - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( - named("getPart") - .and(takesArguments(1)) - .and(takesArgument(0, String.class)) - .or(named("getParts").and(takesArguments(0))), - getClass().getName() + "$GetPartsAdvice"); + named("getParts").and(takesArguments(0)), getClass().getName() + "$GetFilenamesAdvice"); + transformer.applyAdvice( + named("getPart").and(takesArguments(1)).and(takesArgument(0, String.class)), + getClass().getName() + "$GetPartAdvice"); } @Override @@ -108,7 +87,7 @@ public static class ClassLoaderMatcherClassVisitor extends ClassVisitor { final boolean[] foundGetParameters; public ClassLoaderMatcherClassVisitor(boolean[] foundField, boolean[] foundGetParameters) { - super(Opcodes.ASM9); + super(OpenedClassReader.ASM_API); this.foundField = foundField; this.foundGetParameters = foundGetParameters; } @@ -126,7 +105,7 @@ public FieldVisitor visitField( public MethodVisitor visitMethod( int access, String name, String descriptor, String signature, String[] exceptions) { if (name.equals("getParts") && "()Ljava/util/Collection;".equals(descriptor)) { - return new MethodVisitor(Opcodes.ASM9) { + return new MethodVisitor(OpenedClassReader.ASM_API) { @Override public void visitMethodInsn( int opcode, String owner, String name, String descriptor, boolean isInterface) { @@ -142,134 +121,78 @@ public void visitMethodInsn( } } - public static class GetPartsAdvice { + @RequiresRequestContext(RequestContextSlot.APPSEC) + public static class GetFilenamesAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - static void before( - @Advice.Local("collector") ParameterCollector collector, - @Advice.Local("reqCtx") RequestContext reqCtx) { - AgentSpan agentSpan = AgentTracer.activeSpan(); - if (agentSpan != null) { - RequestContext requestContext = agentSpan.getRequestContext(); - if (requestContext != null && requestContext.getData(RequestContextSlot.APPSEC) != null) { - reqCtx = requestContext; - collector = new ParameterCollector.ParameterCollectorImpl(); - return; - } - } - // this variable is used in the custom instrumentation below - collector = ParameterCollector.ParameterCollectorNoop.INSTANCE; + static boolean before( + @Advice.FieldValue(value = "_multiPartInputStream", typing = Assigner.Typing.DYNAMIC) + final Object multiPartInputStream) { + final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(Collection.class); + // _multiPartInputStream is null before the first parse; non-null on cached repeat calls. + // In Jetty 9.0/9.1, getPart(String) delegates to getParts() internally, triggering both + // GetPartAdvice and GetFilenamesAdvice — double-firing the filename event. + // If GetPartAdvice is already active (Part.class depth > 0) it will handle the event; skip. + return callDepth == 0 + && multiPartInputStream == null + && CallDepthThreadLocalMap.getCallDepth(Part.class) == 0; } @Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class) static void after( - @Advice.Local("collector") ParameterCollector collector, - @Advice.Local("reqCtx") RequestContext reqCtx, + @Advice.Enter boolean proceed, + @Advice.Return Collection parts, + @ActiveRequestContext RequestContext reqCtx, @Advice.Thrown(readOnly = false) Throwable t) { - if (t != null || reqCtx == null || collector.isEmpty()) { + CallDepthThreadLocalMap.decrementCallDepth(Collection.class); + if (!proceed || t != null || parts == null || parts.isEmpty()) { return; } - - CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC); - BiFunction> callback = - cbp.getCallback(EVENTS.requestBodyProcessed()); - if (callback == null) { - return; - } - Flow flow = callback.apply(reqCtx, collector.getMap()); - Flow.Action action = flow.getAction(); - if (action instanceof Flow.Action.RequestBlockingAction) { - Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action; - BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction(); - if (blockResponseFunction != null) { - blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba); - if (t == null) { - t = new BlockingException("Blocked request (for Request/parsePart(s))"); - } - } - } - } - - static void muzzle(Request req) throws ServletException, IOException { - req.getParts(); - } - } - - public static class GetPartsVisitorWrapper implements AsmVisitorWrapper { - @Override - public int mergeWriter(int flags) { - return flags | ClassWriter.COMPUTE_MAXS; - } - - @Override - public int mergeReader(int flags) { - return flags; - } - - @Override - public ClassVisitor wrap( - TypeDescription instrumentedType, - ClassVisitor classVisitor, - Implementation.Context implementationContext, - TypePool typePool, - FieldList fields, - MethodList methods, - int writerFlags, - int readerFlags) { - return new RequestClassVisitor(Opcodes.ASM8, classVisitor); + BlockingException bodyBlock = PartHelper.fireBodyProcessedEvent(parts, reqCtx); + BlockingException filenamesBlock = PartHelper.fireFilenamesEvent(parts, reqCtx); + t = bodyBlock != null ? bodyBlock : filenamesBlock; } } - public static class RequestClassVisitor extends ClassVisitor { - public RequestClassVisitor(int api, ClassVisitor cv) { - super(api, cv); + /** + * Fires AppSec events for requests whose first multipart access is {@code getPart(String)}. + * + *

In Jetty 8.x, {@code getPart(String)} parses and caches the entire multipart stream into + * {@code _multiPartInputStream} but returns only the single requested part. If the app only calls + * {@code getPart("field")} (a text field), any co-uploaded file parts would never reach {@code + * requestFilesFilenames}. We therefore read all cached parts via {@code + * MultiPartInputStream.getParts()} and fall back to the returned singleton only if that fails. + */ + @RequiresRequestContext(RequestContextSlot.APPSEC) + public static class GetPartAdvice { + @Advice.OnMethodEnter(suppress = Throwable.class) + static boolean before( + @Advice.FieldValue(value = "_multiPartInputStream", typing = Assigner.Typing.DYNAMIC) + Object multiPartInputStream) { + // _multiPartInputStream is null before the first parse. Once set, all parts are cached and + // events have already fired (either here or in GetFilenamesAdvice). Skip on repeat calls. + return CallDepthThreadLocalMap.incrementCallDepth(Part.class) == 0 + && multiPartInputStream == null; } - @Override - public MethodVisitor visitMethod( - int access, String name, String descriptor, String signature, String[] exceptions) { - MethodVisitor superMv = super.visitMethod(access, name, descriptor, signature, exceptions); - if ("getPart".equals(name) - && "(Ljava/lang/String;)Ljavax/servlet/http/Part;".equals(descriptor) - || "getParts".equals(name) && "()Ljava/util/Collection;".equals(descriptor)) { - return new GetPartsMethodVisitor(api, superMv, descriptor.startsWith("()") ? 1 : 2); - } else { - return superMv; + @Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class) + static void after( + @Advice.Enter boolean proceed, + @Advice.Return Part part, + @Advice.FieldValue(value = "_multiPartInputStream", typing = Assigner.Typing.DYNAMIC) + Object multiPartInputStream, + @ActiveRequestContext RequestContext reqCtx, + @Advice.Thrown(readOnly = false) Throwable t) { + CallDepthThreadLocalMap.decrementCallDepth(Part.class); + if (!proceed || t != null) { + return; } - } - } - - public static class GetPartsMethodVisitor extends MethodVisitor { - private final int collectedParamsVar; - - public GetPartsMethodVisitor(int api, MethodVisitor superMv, int collectedParamsVar) { - super(api, superMv); - this.collectedParamsVar = collectedParamsVar; - } - - @Override - public void visitMethodInsn( - int opcode, String owner, String name, String descriptor, boolean isInterface) { - if (opcode == Opcodes.INVOKEVIRTUAL - && owner.equals("org/eclipse/jetty/util/MultiMap") - && name.equals("add") - && descriptor.equals("(Ljava/lang/String;Ljava/lang/Object;)V")) { - super.visitVarInsn(Opcodes.ALOAD, collectedParamsVar); - // stack: ..., key, value, collParams - super.visitInsn(Opcodes.DUP_X2); - // stack: ..., collParams, key, value, collParams - super.visitInsn(Opcodes.POP); - // stack: ..., collParams, key, value - super.visitInsn(Opcodes.DUP2_X1); - // stack: ..., key, value, collParams, key, value - super.visitMethodInsn( - Opcodes.INVOKEINTERFACE, - Type.getInternalName(ParameterCollector.class), - "put", - "(Ljava/lang/String;Ljava/lang/String;)V", - true); - // original stack + Collection parts = PartHelper.getAllParts(multiPartInputStream, part); + if (parts.isEmpty()) { + return; } - super.visitMethodInsn(opcode, owner, name, descriptor, isInterface); + BlockingException bodyBlock = PartHelper.fireBodyProcessedEvent(parts, reqCtx); + BlockingException filenamesBlock = PartHelper.fireFilenamesEvent(parts, reqCtx); + t = bodyBlock != null ? bodyBlock : filenamesBlock; } } } diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/src/test/java/datadog/trace/instrumentation/jetty8/PartHelperTest.java b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/src/test/java/datadog/trace/instrumentation/jetty8/PartHelperTest.java new file mode 100644 index 00000000000..03c1ae51827 --- /dev/null +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/src/test/java/datadog/trace/instrumentation/jetty8/PartHelperTest.java @@ -0,0 +1,324 @@ +package datadog.trace.instrumentation.jetty8; + +import static java.util.Arrays.asList; +import static java.util.Collections.emptyList; +import static java.util.Collections.singletonList; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import javax.servlet.http.Part; +import org.eclipse.jetty.util.MultiPartInputStream; +import org.junit.jupiter.api.Test; + +class PartHelperTest { + + // ── extractFilenames ──────────────────────────────────────────────────────── + + @Test + void extractFilenamesReturnsEmptyListForNull() { + assertEquals(emptyList(), PartHelper.extractFilenames(null)); + } + + @Test + void extractFilenamesReturnsEmptyListForEmpty() { + assertEquals(emptyList(), PartHelper.extractFilenames(emptyList())); + } + + @Test + void extractFilenamesReturnsEmptyListWhenNoPartsHaveFilename() { + List parts = asList(formField("a"), formField("b")); + assertEquals(emptyList(), PartHelper.extractFilenames(parts)); + } + + @Test + void extractFilenamesExtractsFilenameFromSingleFilePart() { + List parts = singletonList(filePart("photo.jpg")); + assertEquals(singletonList("photo.jpg"), PartHelper.extractFilenames(parts)); + } + + @Test + void extractFilenamesExtractsFilenamesFromMultipleFileParts() { + List parts = asList(filePart("a.jpg"), filePart("b.png"), filePart("c.pdf")); + assertEquals(asList("a.jpg", "b.png", "c.pdf"), PartHelper.extractFilenames(parts)); + } + + @Test + void extractFilenamesSkipsFormFieldPartsAndKeepsFileParts() { + List parts = asList(formField("x"), filePart("upload.zip"), formField("y")); + assertEquals(singletonList("upload.zip"), PartHelper.extractFilenames(parts)); + } + + @Test + void extractFilenamesPreservesFilenamesWithSpacesAndSpecialCharacters() { + List parts = asList(filePart("my file.tar.gz"), filePart("résumé.pdf")); + assertEquals(asList("my file.tar.gz", "résumé.pdf"), PartHelper.extractFilenames(parts)); + } + + // ── filenameFromPart ──────────────────────────────────────────────────────── + + @Test + void filenameFromPartReturnsNullWhenContentDispositionHeaderIsAbsent() { + Part p = mock(Part.class); + when(p.getHeader("Content-Disposition")).thenReturn(null); + assertNull(PartHelper.filenameFromPart(p)); + } + + @Test + void filenameFromPartReturnsNullWhenThereIsNoFilenameParameter() { + Part p = mock(Part.class); + when(p.getHeader("Content-Disposition")).thenReturn("form-data; name=\"field\""); + assertNull(PartHelper.filenameFromPart(p)); + } + + @Test + void filenameFromPartExtractsUnquotedFilename() { + Part p = mock(Part.class); + when(p.getHeader("Content-Disposition")) + .thenReturn("form-data; name=\"file\"; filename=photo.jpg"); + assertEquals("photo.jpg", PartHelper.filenameFromPart(p)); + } + + @Test + void filenameFromPartStripsQuotesFromFilename() { + Part p = mock(Part.class); + when(p.getHeader("Content-Disposition")) + .thenReturn("form-data; name=\"file\"; filename=\"photo.jpg\""); + assertEquals("photo.jpg", PartHelper.filenameFromPart(p)); + } + + @Test + void filenameFromPartReturnsEmptyStringForEmptyQuotedFilename() { + Part p = mock(Part.class); + when(p.getHeader("Content-Disposition")).thenReturn("form-data; name=\"file\"; filename=\"\""); + assertEquals("", PartHelper.filenameFromPart(p)); + } + + @Test + void filenameFromPartReturnsEmptyStringForEmptyUnquotedFilename() { + Part p = mock(Part.class); + when(p.getHeader("Content-Disposition")).thenReturn("form-data; name=\"file\"; filename="); + assertEquals("", PartHelper.filenameFromPart(p)); + } + + @Test + void filenameFromPartPreservesSemicolonsInsideQuotedFilename() { + Part p = mock(Part.class); + when(p.getHeader("Content-Disposition")) + .thenReturn("form-data; name=\"file\"; filename=\"shell;evil.php\""); + assertEquals("shell;evil.php", PartHelper.filenameFromPart(p)); + } + + @Test + void filenameFromPartHandlesEscapedQuoteInsideFilename() { + Part p = mock(Part.class); + when(p.getHeader("Content-Disposition")) + .thenReturn("form-data; name=\"file\"; filename=\"file\\\"name.txt\""); + assertEquals("file\"name.txt", PartHelper.filenameFromPart(p)); + } + + @Test + void filenameFromPartHandlesFilenameBeforeOtherParameters() { + Part p = mock(Part.class); + when(p.getHeader("Content-Disposition")) + .thenReturn("form-data; filename=\"first.txt\"; name=\"file\""); + assertEquals("first.txt", PartHelper.filenameFromPart(p)); + } + + // ── charsetFromContentType ────────────────────────────────────────────────── + + @Test + void charsetFromContentTypeReturnsUtf8ForNull() { + assertEquals(StandardCharsets.UTF_8, PartHelper.charsetFromContentType(null)); + } + + @Test + void charsetFromContentTypeReturnsUtf8WhenNoCharsetParameter() { + assertEquals(StandardCharsets.UTF_8, PartHelper.charsetFromContentType("text/plain")); + } + + @Test + void charsetFromContentTypeParsesUnquotedCharset() { + assertEquals( + Charset.forName("ISO-8859-1"), + PartHelper.charsetFromContentType("text/plain; charset=ISO-8859-1")); + } + + @Test + void charsetFromContentTypeParsesQuotedCharset() { + assertEquals( + Charset.forName("ISO-8859-1"), + PartHelper.charsetFromContentType("text/plain; charset=\"ISO-8859-1\"")); + } + + @Test + void charsetFromContentTypeIsCaseInsensitive() { + assertEquals( + StandardCharsets.UTF_16, PartHelper.charsetFromContentType("text/plain; CHARSET=UTF-16")); + } + + @Test + void charsetFromContentTypeReturnsUtf8ForUnknownCharset() { + assertEquals( + StandardCharsets.UTF_8, + PartHelper.charsetFromContentType("text/plain; charset=not-a-real-charset")); + } + + // ── extractFormFields ─────────────────────────────────────────────────────── + + @Test + void extractFormFieldsReturnsEmptyMapForNull() { + assertEquals(Collections.emptyMap(), PartHelper.extractFormFields(null)); + } + + @Test + void extractFormFieldsReturnsEmptyMapForEmpty() { + assertEquals(Collections.emptyMap(), PartHelper.extractFormFields(emptyList())); + } + + @Test + void extractFormFieldsSkipsFileUploadParts() { + List parts = singletonList(filePart("evil.php")); + assertEquals(Collections.emptyMap(), PartHelper.extractFormFields(parts)); + } + + @Test + void extractFormFieldsSkipsPartWithEmptyFilename() { + List parts = singletonList(emptyFilenamePart("field")); + assertEquals(Collections.emptyMap(), PartHelper.extractFormFields(parts)); + } + + @Test + void extractFilenamesSkipsEmptyFilename() { + List parts = singletonList(emptyFilenamePart("field")); + assertEquals(emptyList(), PartHelper.extractFilenames(parts)); + } + + @Test + void extractFormFieldsExtractsSingleFormField() throws IOException { + List parts = singletonList(field("username", "alice")); + Map> expected = + Collections.singletonMap("username", singletonList("alice")); + assertEquals(expected, PartHelper.extractFormFields(parts)); + } + + @Test + void extractFormFieldsGroupsMultipleValuesUnderSameName() throws IOException { + List parts = asList(field("tag", "foo"), field("tag", "bar")); + Map> result = PartHelper.extractFormFields(parts); + assertEquals(asList("foo", "bar"), result.get("tag")); + } + + @Test + void extractFormFieldsMixesFieldsAndSkipsFiles() throws IOException { + List parts = asList(field("a", "x"), filePart("upload.bin"), field("b", "y")); + Map> result = PartHelper.extractFormFields(parts); + assertEquals(singletonList("x"), result.get("a")); + assertEquals(singletonList("y"), result.get("b")); + assertNull(result.get("file")); + } + + @Test + void extractFormFieldsDecodesFieldUsingContentTypeCharset() throws IOException { + byte[] iso88591Bytes = "café".getBytes("ISO-8859-1"); + List parts = + singletonList( + fieldWithContentType("drink", iso88591Bytes, "text/plain; charset=ISO-8859-1")); + Map> result = PartHelper.extractFormFields(parts); + assertEquals(singletonList("café"), result.get("drink")); + } + + // ── getAllParts ───────────────────────────────────────────────────────────── + + @Test + void getAllPartsReturnsEmptyListWhenBothNull() { + assertEquals(emptyList(), PartHelper.getAllParts(null, null)); + } + + @Test + void getAllPartsFallsBackToSingletonWhenMultiPartInputStreamIsNull() { + Part part = filePart("evil.php"); + assertEquals(singletonList(part), PartHelper.getAllParts(null, part)); + } + + @Test + void getAllPartsReturnsAllPartsFromMultiPartInputStream() throws Exception { + Part file = filePart("evil.php"); + Part text = formField("name"); + MultiPartInputStream mpi = mock(MultiPartInputStream.class); + when(mpi.getParts()).thenReturn(asList(file, text)); + assertEquals(asList(file, text), PartHelper.getAllParts(mpi, null)); + } + + @Test + void getAllPartsPrefersFullCollectionOverSingleton() throws Exception { + Part file = filePart("evil.php"); + Part other = formField("name"); + MultiPartInputStream mpi = mock(MultiPartInputStream.class); + when(mpi.getParts()).thenReturn(asList(file, other)); + assertEquals(asList(file, other), PartHelper.getAllParts(mpi, file)); + } + + @Test + void getAllPartsFallsBackToSingletonWhenGetPartsThrows() throws Exception { + Part part = filePart("fallback.jpg"); + MultiPartInputStream mpi = mock(MultiPartInputStream.class); + when(mpi.getParts()).thenThrow(new IOException("simulated failure")); + assertEquals(singletonList(part), PartHelper.getAllParts(mpi, part)); + } + + // ── helpers ───────────────────────────────────────────────────────────────── + + /** Creates a stub Part that looks like a plain form field (no filename). */ + private Part field(String name, String value) throws IOException { + Part p = mock(Part.class); + when(p.getHeader("Content-Disposition")).thenReturn("form-data; name=\"" + name + "\""); + when(p.getName()).thenReturn(name); + when(p.getInputStream()) + .thenReturn(new ByteArrayInputStream(value.getBytes(StandardCharsets.UTF_8))); + return p; + } + + /** Creates a stub Part with a specific Content-Type (for charset testing). */ + private Part fieldWithContentType(String name, byte[] rawValue, String contentType) + throws IOException { + Part p = mock(Part.class); + when(p.getHeader("Content-Disposition")).thenReturn("form-data; name=\"" + name + "\""); + when(p.getName()).thenReturn(name); + when(p.getContentType()).thenReturn(contentType); + when(p.getInputStream()).thenReturn(new ByteArrayInputStream(rawValue)); + return p; + } + + /** Creates a stub Part for extractFilenames/extractFormFields tests that only need the header. */ + private Part formField(String name) { + Part p = mock(Part.class); + when(p.getHeader("Content-Disposition")).thenReturn("form-data; name=\"" + name + "\""); + when(p.getName()).thenReturn(name); + return p; + } + + /** Creates a stub Part that looks like a file upload with the given filename. */ + private Part filePart(String filename) { + Part p = mock(Part.class); + when(p.getHeader("Content-Disposition")) + .thenReturn("form-data; name=\"file\"; filename=\"" + filename + "\""); + return p; + } + + /** Creates a stub Part that has filename="" — a file input submitted with no file chosen. */ + private Part emptyFilenamePart(String name) { + Part p = mock(Part.class); + when(p.getHeader("Content-Disposition")) + .thenReturn("form-data; name=\"" + name + "\"; filename=\"\""); + return p; + } +} diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/build.gradle index 349861079eb..ffcf95ba27c 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/build.gradle +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/build.gradle @@ -11,6 +11,7 @@ apply from: "$rootDir/gradle/java.gradle" dependencies { compileOnly group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.2.30.v20200428' -} -// testing happens in the jetty-* modules + testImplementation libs.bundles.mockito + testImplementation group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0' +} diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/src/main/java/datadog/trace/instrumentation/jetty92/MultipartHelper.java b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/src/main/java/datadog/trace/instrumentation/jetty92/MultipartHelper.java new file mode 100644 index 00000000000..24780c46110 --- /dev/null +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/src/main/java/datadog/trace/instrumentation/jetty92/MultipartHelper.java @@ -0,0 +1,77 @@ +package datadog.trace.instrumentation.jetty92; + +import static datadog.trace.api.gateway.Events.EVENTS; + +import datadog.appsec.api.blocking.BlockingException; +import datadog.trace.api.gateway.BlockResponseFunction; +import datadog.trace.api.gateway.CallbackProvider; +import datadog.trace.api.gateway.Flow; +import datadog.trace.api.gateway.RequestContext; +import datadog.trace.api.gateway.RequestContextSlot; +import datadog.trace.bootstrap.instrumentation.api.AgentTracer; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.function.BiFunction; +import javax.servlet.http.Part; + +public class MultipartHelper { + + private MultipartHelper() {} + + /** + * Extracts non-null, non-empty filenames from a collection of multipart {@link Part}s using + * {@link Part#getSubmittedFileName()} (Servlet 3.1+, Jetty 9.2.x). + * + * @return list of filenames; never {@code null}, may be empty + */ + public static List extractFilenames(Collection parts) { + if (parts == null || parts.isEmpty()) { + return Collections.emptyList(); + } + List filenames = new ArrayList<>(parts.size()); + for (Part part : parts) { + try { + String name = part.getSubmittedFileName(); + if (name != null && !name.isEmpty()) { + filenames.add(name); + } + } catch (Exception ignored) { + // malformed or inaccessible part — skip and continue with remaining parts + } + } + return filenames; + } + + /** + * Fires the {@code requestFilesFilenames} IG event and returns a {@link BlockingException} if the + * WAF requests blocking, or {@code null} otherwise. + */ + public static BlockingException fireFilenamesEvent( + Collection parts, RequestContext reqCtx) { + CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC); + BiFunction, Flow> callback = + cbp.getCallback(EVENTS.requestFilesFilenames()); + if (callback == null) { + return null; + } + List filenames = extractFilenames(parts); + if (filenames.isEmpty()) { + return null; + } + Flow flow = callback.apply(reqCtx, filenames); + Flow.Action action = flow.getAction(); + if (action instanceof Flow.Action.RequestBlockingAction) { + Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action; + BlockResponseFunction brf = reqCtx.getBlockResponseFunction(); + if (brf != null) { + if (brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba)) { + reqCtx.getTraceSegment().effectivelyBlocked(); + return new BlockingException("Blocked request (multipart file upload)"); + } + } + } + return null; + } +} diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/src/main/java/datadog/trace/instrumentation/jetty92/RequestExtractContentParametersInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/src/main/java/datadog/trace/instrumentation/jetty92/RequestExtractContentParametersInstrumentation.java index 0796aa32538..902b792fee2 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/src/main/java/datadog/trace/instrumentation/jetty92/RequestExtractContentParametersInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/src/main/java/datadog/trace/instrumentation/jetty92/RequestExtractContentParametersInstrumentation.java @@ -19,9 +19,11 @@ import datadog.trace.api.gateway.RequestContextSlot; import datadog.trace.bootstrap.CallDepthThreadLocalMap; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; +import java.util.Collection; import java.util.function.BiFunction; +import javax.servlet.http.Part; import net.bytebuddy.asm.Advice; -import org.eclipse.jetty.server.Request; +import net.bytebuddy.implementation.bytecode.assign.Assigner; import org.eclipse.jetty.util.MultiMap; @AutoService(InstrumenterModule.class) @@ -38,6 +40,11 @@ public String instrumentedType() { return "org.eclipse.jetty.server.Request"; } + @Override + public String[] helperClassNames() { + return new String[] {packageName + ".MultipartHelper"}; + } + @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( @@ -48,6 +55,11 @@ public void methodAdvice(MethodTransformer transformer) { .and(takesArguments(1)) .and(takesArgument(0, named("org.eclipse.jetty.util.MultiMap"))), getClass().getName() + "$GetPartsAdvice"); + transformer.applyAdvice( + named("getParts").and(takesArguments(0)), getClass().getName() + "$GetFilenamesAdvice"); + transformer.applyAdvice( + named("getParts").and(takesArguments(1)), + getClass().getName() + "$GetFilenamesFromMultiPartAdvice"); } private static final Reference REQUEST_REFERENCE = @@ -105,7 +117,6 @@ static void after( @Advice.FieldValue("_contentParameters") final MultiMap map, @ActiveRequestContext RequestContext reqCtx, @Advice.Thrown(readOnly = false) Throwable t) { - CallDepthThreadLocalMap.decrementCallDepth(Request.class); if (!proceed) { return; } @@ -135,4 +146,69 @@ static void after( } } } + + /** + * Fires the {@code requestFilesFilenames} event when the application calls public {@code + * getParts()}. Guards prevent double-firing: + * + *

    + *
  • {@code _contentParameters != null}: set by {@code extractContentParameters()} (the {@code + * getParameterMap()} path); means filenames were already reported via {@code + * GetFilenamesFromMultiPartAdvice}. + *
  • {@code _multiPartInputStream != null}: set by the first {@code getParts()} call in Jetty + * 9.2.x; means filenames were already reported. + *
+ */ + @RequiresRequestContext(RequestContextSlot.APPSEC) + public static class GetFilenamesAdvice { + @Advice.OnMethodEnter(suppress = Throwable.class) + static boolean before( + @Advice.FieldValue("_contentParameters") final MultiMap contentParameters, + @Advice.FieldValue(value = "_multiPartInputStream", typing = Assigner.Typing.DYNAMIC) + final Object multiPartInputStream) { + final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(MultipartHelper.class); + return callDepth == 0 && contentParameters == null && multiPartInputStream == null; + } + + @Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class) + static void after( + @Advice.Enter boolean proceed, + @Advice.Return Collection parts, + @ActiveRequestContext RequestContext reqCtx, + @Advice.Thrown(readOnly = false) Throwable t) { + CallDepthThreadLocalMap.decrementCallDepth(MultipartHelper.class); + if (!proceed || t != null || parts == null || parts.isEmpty()) { + return; + } + t = MultipartHelper.fireFilenamesEvent(parts, reqCtx); + } + } + + /** + * Fires the {@code requestFilesFilenames} event when multipart content is parsed via the internal + * {@code getParts(MultiMap)} path triggered by {@code getParameter*()} / {@code + * getParameterMap()} — i.e. when the application never calls public {@code getParts()}. The + * call-depth guard prevents double-firing when {@code getParts()} internally delegates to this + * method. + */ + @RequiresRequestContext(RequestContextSlot.APPSEC) + public static class GetFilenamesFromMultiPartAdvice { + @Advice.OnMethodEnter(suppress = Throwable.class) + static boolean before() { + return CallDepthThreadLocalMap.incrementCallDepth(MultipartHelper.class) == 0; + } + + @Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class) + static void after( + @Advice.Enter boolean proceed, + @Advice.Return Collection parts, + @ActiveRequestContext RequestContext reqCtx, + @Advice.Thrown(readOnly = false) Throwable t) { + CallDepthThreadLocalMap.decrementCallDepth(MultipartHelper.class); + if (!proceed || t != null || parts == null || parts.isEmpty()) { + return; + } + t = MultipartHelper.fireFilenamesEvent(parts, reqCtx); + } + } } diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/src/test/java/datadog/trace/instrumentation/jetty92/MultipartHelperTest.java b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/src/test/java/datadog/trace/instrumentation/jetty92/MultipartHelperTest.java new file mode 100644 index 00000000000..7ef06eede04 --- /dev/null +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/src/test/java/datadog/trace/instrumentation/jetty92/MultipartHelperTest.java @@ -0,0 +1,67 @@ +package datadog.trace.instrumentation.jetty92; + +import static java.util.Arrays.asList; +import static java.util.Collections.emptyList; +import static java.util.Collections.singletonList; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import java.util.List; +import javax.servlet.http.Part; +import org.junit.jupiter.api.Test; + +class MultipartHelperTest { + + @Test + void returnsEmptyListForNull() { + assertEquals(emptyList(), MultipartHelper.extractFilenames(null)); + } + + @Test + void returnsEmptyListForEmpty() { + assertEquals(emptyList(), MultipartHelper.extractFilenames(emptyList())); + } + + @Test + void returnsEmptyListWhenAllPartsHaveNullFilename() { + List parts = asList(part(null), part(null)); + assertEquals(emptyList(), MultipartHelper.extractFilenames(parts)); + } + + @Test + void returnsEmptyListWhenAllPartsHaveEmptyFilename() { + List parts = asList(part(""), part("")); + assertEquals(emptyList(), MultipartHelper.extractFilenames(parts)); + } + + @Test + void extractsFilenameFromSinglePart() { + List parts = singletonList(part("photo.jpg")); + assertEquals(singletonList("photo.jpg"), MultipartHelper.extractFilenames(parts)); + } + + @Test + void extractsFilenamesFromMultipleParts() { + List parts = asList(part("a.jpg"), part("b.png"), part("c.pdf")); + assertEquals(asList("a.jpg", "b.png", "c.pdf"), MultipartHelper.extractFilenames(parts)); + } + + @Test + void skipsPartsWithNullOrEmptyFilenameAndKeepsValid() { + List parts = asList(part(null), part("valid.txt"), part(""), part("other.zip")); + assertEquals(asList("valid.txt", "other.zip"), MultipartHelper.extractFilenames(parts)); + } + + @Test + void preservesFilenamesWithSpacesAndSpecialCharacters() { + List parts = asList(part("my file.tar.gz"), part("résumé.pdf")); + assertEquals(asList("my file.tar.gz", "résumé.pdf"), MultipartHelper.extractFilenames(parts)); + } + + private Part part(String submittedFileName) { + Part p = mock(Part.class); + when(p.getSubmittedFileName()).thenReturn(submittedFileName); + return p; + } +} diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/build.gradle index 69bad38c12b..f7dbb028001 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/build.gradle +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/build.gradle @@ -2,7 +2,7 @@ muzzle { pass { group = 'org.eclipse.jetty' module = 'jetty-server' - versions = '[9.3,12)' + versions = '[9.3,9.4.10)' assertInverse = true } } @@ -11,6 +11,7 @@ apply from: "$rootDir/gradle/java.gradle" dependencies { compileOnly group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.2.30.v20200428' -} -// testing happens in the jetty-* modules + testImplementation libs.bundles.mockito + testImplementation group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0' +} diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/src/main/java/datadog/trace/instrumentation/jetty93/MultipartHelper.java b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/src/main/java/datadog/trace/instrumentation/jetty93/MultipartHelper.java new file mode 100644 index 00000000000..dedd0b2705b --- /dev/null +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/src/main/java/datadog/trace/instrumentation/jetty93/MultipartHelper.java @@ -0,0 +1,77 @@ +package datadog.trace.instrumentation.jetty93; + +import static datadog.trace.api.gateway.Events.EVENTS; + +import datadog.appsec.api.blocking.BlockingException; +import datadog.trace.api.gateway.BlockResponseFunction; +import datadog.trace.api.gateway.CallbackProvider; +import datadog.trace.api.gateway.Flow; +import datadog.trace.api.gateway.RequestContext; +import datadog.trace.api.gateway.RequestContextSlot; +import datadog.trace.bootstrap.instrumentation.api.AgentTracer; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.function.BiFunction; +import javax.servlet.http.Part; + +public class MultipartHelper { + + private MultipartHelper() {} + + /** + * Extracts non-null, non-empty filenames from a collection of multipart {@link Part}s using + * {@link Part#getSubmittedFileName()} (Servlet 3.1+, Jetty 9.3.x). + * + * @return list of filenames; never {@code null}, may be empty + */ + public static List extractFilenames(Collection parts) { + if (parts == null || parts.isEmpty()) { + return Collections.emptyList(); + } + List filenames = new ArrayList<>(parts.size()); + for (Part part : parts) { + try { + String name = part.getSubmittedFileName(); + if (name != null && !name.isEmpty()) { + filenames.add(name); + } + } catch (Exception ignored) { + // malformed or inaccessible part — skip and continue with remaining parts + } + } + return filenames; + } + + /** + * Fires the {@code requestFilesFilenames} IG event and returns a {@link BlockingException} if the + * WAF requests blocking, or {@code null} otherwise. + */ + public static BlockingException fireFilenamesEvent( + Collection parts, RequestContext reqCtx) { + CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC); + BiFunction, Flow> callback = + cbp.getCallback(EVENTS.requestFilesFilenames()); + if (callback == null) { + return null; + } + List filenames = extractFilenames(parts); + if (filenames.isEmpty()) { + return null; + } + Flow flow = callback.apply(reqCtx, filenames); + Flow.Action action = flow.getAction(); + if (action instanceof Flow.Action.RequestBlockingAction) { + Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action; + BlockResponseFunction brf = reqCtx.getBlockResponseFunction(); + if (brf != null) { + if (brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba)) { + reqCtx.getTraceSegment().effectivelyBlocked(); + return new BlockingException("Blocked request (multipart file upload)"); + } + } + } + return null; + } +} diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/src/main/java/datadog/trace/instrumentation/jetty93/RequestExtractContentParametersInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/src/main/java/datadog/trace/instrumentation/jetty93/RequestExtractContentParametersInstrumentation.java index 3e1e2bf6d5c..57948e5d45a 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/src/main/java/datadog/trace/instrumentation/jetty93/RequestExtractContentParametersInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/src/main/java/datadog/trace/instrumentation/jetty93/RequestExtractContentParametersInstrumentation.java @@ -18,8 +18,11 @@ import datadog.trace.api.gateway.RequestContextSlot; import datadog.trace.bootstrap.CallDepthThreadLocalMap; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; +import java.util.Collection; import java.util.function.BiFunction; +import javax.servlet.http.Part; import net.bytebuddy.asm.Advice; +import net.bytebuddy.implementation.bytecode.assign.Assigner; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.util.MultiMap; @@ -37,17 +40,36 @@ public String instrumentedType() { return "org.eclipse.jetty.server.Request"; } + @Override + public String[] helperClassNames() { + return new String[] {packageName + ".MultipartHelper"}; + } + @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( named("extractContentParameters").and(takesArguments(0)).or(named("getParts")), getClass().getName() + "$ExtractContentParametersAdvice"); + transformer.applyAdvice( + named("getParts").and(takesArguments(0)), getClass().getName() + "$GetFilenamesAdvice"); + transformer.applyAdvice( + named("getParts").and(takesArguments(1)), + getClass().getName() + "$GetFilenamesFromMultiPartAdvice"); } + // Discriminates Jetty 9.3.x–9.4.9.x ([9.3, 9.4.10)): + // - _contentParameters + extractContentParameters(void) exist from 9.3+ (excludes 9.2) + // - _multiPartInputStream exists in 9.3.x and early 9.4.x (< 9.4.10); replaced by _multiParts + // in 9.4.10 (covered by jetty-appsec-9.4) private static final Reference REQUEST_REFERENCE = new Reference.Builder("org.eclipse.jetty.server.Request") .withMethod(new String[0], 0, "extractContentParameters", "V") .withField(new String[0], 0, "_contentParameters", MULTI_MAP_INTERNAL_NAME) + .withField( + new String[0], + 0, + "_multiPartInputStream", + "Lorg/eclipse/jetty/util/MultiPartInputStreamParser;") .build(); @Override @@ -99,4 +121,70 @@ static void after( } } } + + /** + * Fires the {@code requestFilesFilenames} event when the application calls public {@code + * getParts()}. Guards prevent double-firing: + * + *
    + *
  • {@code _contentParameters != null}: set by {@code extractContentParameters()} (the {@code + * getParameterMap()} path); means filenames were already reported via {@code + * GetFilenamesFromMultiPartAdvice}. + *
  • {@code _multiPartInputStream != null}: set by the first {@code getParts()} call in Jetty + * 9.3.x; means filenames were already reported. + *
+ */ + @RequiresRequestContext(RequestContextSlot.APPSEC) + public static class GetFilenamesAdvice { + @Advice.OnMethodEnter(suppress = Throwable.class) + static boolean before( + @Advice.FieldValue("_contentParameters") final MultiMap contentParameters, + @Advice.FieldValue(value = "_multiPartInputStream", typing = Assigner.Typing.DYNAMIC) + final Object multiPartInputStream) { + final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(MultipartHelper.class); + return callDepth == 0 && contentParameters == null && multiPartInputStream == null; + } + + @Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class) + static void after( + @Advice.Enter boolean proceed, + @Advice.Return Collection parts, + @ActiveRequestContext RequestContext reqCtx, + @Advice.Thrown(readOnly = false) Throwable t) { + CallDepthThreadLocalMap.decrementCallDepth(MultipartHelper.class); + if (!proceed || t != null || parts == null || parts.isEmpty()) { + return; + } + t = MultipartHelper.fireFilenamesEvent(parts, reqCtx); + } + } + + /** + * Fires the {@code requestFilesFilenames} event when multipart content is parsed via the internal + * {@code getParts(MultiMap)} path triggered by {@code getParameter*()} / {@code + * getParameterMap()} — i.e. when the application never calls public {@code getParts()}. In Jetty + * 9.3+, {@code extractContentParameters()} assigns {@code _contentParameters} before calling this + * method, so {@code map == null} cannot be used as a "first parse" guard here; the call-depth + * guard prevents double-firing when {@code getParts()} internally delegates to this method. + */ + @RequiresRequestContext(RequestContextSlot.APPSEC) + public static class GetFilenamesFromMultiPartAdvice { + @Advice.OnMethodEnter(suppress = Throwable.class) + static boolean before() { + return CallDepthThreadLocalMap.incrementCallDepth(MultipartHelper.class) == 0; + } + + @Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class) + static void after( + @Advice.Enter boolean proceed, + @Advice.Return Collection parts, + @ActiveRequestContext RequestContext reqCtx, + @Advice.Thrown(readOnly = false) Throwable t) { + CallDepthThreadLocalMap.decrementCallDepth(MultipartHelper.class); + if (!proceed || t != null || parts == null || parts.isEmpty()) { + return; + } + t = MultipartHelper.fireFilenamesEvent(parts, reqCtx); + } + } } diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/src/test/java/datadog/trace/instrumentation/jetty93/MultipartHelperTest.java b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/src/test/java/datadog/trace/instrumentation/jetty93/MultipartHelperTest.java new file mode 100644 index 00000000000..00250efe19a --- /dev/null +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/src/test/java/datadog/trace/instrumentation/jetty93/MultipartHelperTest.java @@ -0,0 +1,67 @@ +package datadog.trace.instrumentation.jetty93; + +import static java.util.Arrays.asList; +import static java.util.Collections.emptyList; +import static java.util.Collections.singletonList; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import java.util.List; +import javax.servlet.http.Part; +import org.junit.jupiter.api.Test; + +class MultipartHelperTest { + + @Test + void returnsEmptyListForNull() { + assertEquals(emptyList(), MultipartHelper.extractFilenames(null)); + } + + @Test + void returnsEmptyListForEmpty() { + assertEquals(emptyList(), MultipartHelper.extractFilenames(emptyList())); + } + + @Test + void returnsEmptyListWhenAllPartsHaveNullFilename() { + List parts = asList(part(null), part(null)); + assertEquals(emptyList(), MultipartHelper.extractFilenames(parts)); + } + + @Test + void returnsEmptyListWhenAllPartsHaveEmptyFilename() { + List parts = asList(part(""), part("")); + assertEquals(emptyList(), MultipartHelper.extractFilenames(parts)); + } + + @Test + void extractsFilenameFromSinglePart() { + List parts = singletonList(part("photo.jpg")); + assertEquals(singletonList("photo.jpg"), MultipartHelper.extractFilenames(parts)); + } + + @Test + void extractsFilenamesFromMultipleParts() { + List parts = asList(part("a.jpg"), part("b.png"), part("c.pdf")); + assertEquals(asList("a.jpg", "b.png", "c.pdf"), MultipartHelper.extractFilenames(parts)); + } + + @Test + void skipsPartsWithNullOrEmptyFilenameAndKeepsValid() { + List parts = asList(part(null), part("valid.txt"), part(""), part("other.zip")); + assertEquals(asList("valid.txt", "other.zip"), MultipartHelper.extractFilenames(parts)); + } + + @Test + void preservesFilenamesWithSpacesAndSpecialCharacters() { + List parts = asList(part("my file.tar.gz"), part("résumé.pdf")); + assertEquals(asList("my file.tar.gz", "résumé.pdf"), MultipartHelper.extractFilenames(parts)); + } + + private Part part(String submittedFileName) { + Part p = mock(Part.class); + when(p.getSubmittedFileName()).thenReturn(submittedFileName); + return p; + } +} diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/build.gradle new file mode 100644 index 00000000000..10fc0a659a9 --- /dev/null +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/build.gradle @@ -0,0 +1,32 @@ +muzzle { + pass { + name = '9_series' + group = 'org.eclipse.jetty' + module = 'jetty-server' + versions = '[9.4.10,10.0)' + } + pass { + name = 'early_10_series' + group = 'org.eclipse.jetty' + module = 'jetty-server' + // _multiParts: MultiPartFormInputStream (before 10.0.10 switched to MultiParts) + versions = '[10.0.0,10.0.10)' + javaVersion = 11 + } + pass { + name = '10_series' + group = 'org.eclipse.jetty' + module = 'jetty-server' + versions = '[10.0.10,11.0)' + javaVersion = 11 + } +} + +apply from: "$rootDir/gradle/java.gradle" + +dependencies { + compileOnly group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.4.21.v20190926' + + testImplementation libs.bundles.mockito + testImplementation group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0' +} diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/gradle.lockfile new file mode 100644 index 00000000000..961940d455a --- /dev/null +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/gradle.lockfile @@ -0,0 +1,126 @@ +# This is a Gradle generated file for dependency locking. +# Manual edits can break the build and are not advised. +# This file is expected to be part of source control. +cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath +cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath +ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath +ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath +com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath +com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.3=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:java-dogstatsd-client:4.4.3=testRuntimeClasspath +com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath +com.github.javaparser:javaparser-core:3.25.6=codenarc +com.github.jnr:jffi:1.3.14=testRuntimeClasspath +com.github.jnr:jnr-a64asm:1.0.0=testRuntimeClasspath +com.github.jnr:jnr-constants:0.10.4=testRuntimeClasspath +com.github.jnr:jnr-enxio:0.32.19=testRuntimeClasspath +com.github.jnr:jnr-ffi:2.2.18=testRuntimeClasspath +com.github.jnr:jnr-posix:3.1.21=testRuntimeClasspath +com.github.jnr:jnr-unixsocket:0.38.24=testRuntimeClasspath +com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs:4.9.8=spotbugs +com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs +com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath +com.google.auto.service:auto-service:1.1.1=annotationProcessor,testAnnotationProcessor +com.google.auto:auto-common:1.2.1=annotationProcessor,testAnnotationProcessor +com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +com.google.code.gson:gson:2.13.2=spotbugs +com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor +com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.re2j:re2j:1.7=testRuntimeClasspath +com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath +com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath +com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath +com.squareup.okio:okio:1.17.5=testCompileClasspath,testRuntimeClasspath +com.thoughtworks.qdox:qdox:1.12.1=codenarc +commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClasspath +commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath +commons-io:commons-io:2.20.0=spotbugs +de.thetaphi:forbiddenapis:3.10=compileClasspath +io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath +io.sqreen:libsqreen:17.3.0=testRuntimeClasspath +javax.servlet:javax.servlet-api:3.1.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +jaxen:jaxen:2.0.0=spotbugs +junit:junit:4.13.2=testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.3=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.3=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath +net.java.dev.jna:jna:5.8.0=testRuntimeClasspath +net.sf.saxon:Saxon-HE:12.9=spotbugs +org.apache.ant:ant-antlr:1.10.14=codenarc +org.apache.ant:ant-junit:1.10.14=codenarc +org.apache.bcel:bcel:6.11.0=spotbugs +org.apache.commons:commons-lang3:3.19.0=spotbugs +org.apache.commons:commons-text:1.14.0=spotbugs +org.apache.logging.log4j:log4j-api:2.25.2=spotbugs +org.apache.logging.log4j:log4j-core:2.25.2=spotbugs +org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath +org.checkerframework:checker-qual:3.33.0=annotationProcessor,testAnnotationProcessor +org.codehaus.groovy:groovy-ant:3.0.23=codenarc +org.codehaus.groovy:groovy-docgenerator:3.0.23=codenarc +org.codehaus.groovy:groovy-groovydoc:3.0.23=codenarc +org.codehaus.groovy:groovy-json:3.0.23=codenarc +org.codehaus.groovy:groovy-json:3.0.25=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-templates:3.0.23=codenarc +org.codehaus.groovy:groovy-xml:3.0.23=codenarc +org.codehaus.groovy:groovy:3.0.23=codenarc +org.codehaus.groovy:groovy:3.0.25=testCompileClasspath,testRuntimeClasspath +org.codenarc:CodeNarc:3.7.0=codenarc +org.dom4j:dom4j:2.2.0=spotbugs +org.eclipse.jetty:jetty-http:9.4.21.v20190926=compileClasspath +org.eclipse.jetty:jetty-io:9.4.21.v20190926=compileClasspath +org.eclipse.jetty:jetty-server:9.4.21.v20190926=compileClasspath +org.eclipse.jetty:jetty-util:9.4.21.v20190926=compileClasspath +org.gmetrics:GMetrics:2.1.0=codenarc +org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath +org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath +org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath +org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath +org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter:5.14.1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath +org.junit.platform:junit-platform-runner:1.14.1=testRuntimeClasspath +org.junit.platform:junit-platform-suite-api:1.14.1=testRuntimeClasspath +org.junit.platform:junit-platform-suite-commons:1.14.1=testRuntimeClasspath +org.junit:junit-bom:5.14.0=spotbugs +org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath +org.mockito:mockito-core:4.4.0=testRuntimeClasspath +org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath +org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath +org.ow2.asm:asm-analysis:9.7.1=testRuntimeClasspath +org.ow2.asm:asm-analysis:9.9=spotbugs +org.ow2.asm:asm-commons:9.9=spotbugs +org.ow2.asm:asm-commons:9.9.1=testRuntimeClasspath +org.ow2.asm:asm-tree:9.9=spotbugs +org.ow2.asm:asm-tree:9.9.1=testRuntimeClasspath +org.ow2.asm:asm-util:9.7.1=testRuntimeClasspath +org.ow2.asm:asm-util:9.9=spotbugs +org.ow2.asm:asm:9.9=spotbugs +org.ow2.asm:asm:9.9.1=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:jcl-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath +org.slf4j:jul-to-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath +org.slf4j:log4j-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:1.7.30=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath +org.slf4j:slf4j-api:1.7.32=testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:2.0.17=spotbugs,spotbugsSlf4j +org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j +org.snakeyaml:snakeyaml-engine:2.9=buildTimeInstrumentationPlugin,muzzleTooling,runtimeClasspath,testRuntimeClasspath +org.spockframework:spock-bom:2.4-groovy-3.0=testCompileClasspath,testRuntimeClasspath +org.spockframework:spock-core:2.4-groovy-3.0=testCompileClasspath,testRuntimeClasspath +org.tabletest:tabletest-junit:1.2.1=testCompileClasspath,testRuntimeClasspath +org.tabletest:tabletest-parser:1.2.0=testCompileClasspath,testRuntimeClasspath +org.xmlresolver:xmlresolver:5.3.3=spotbugs +empty=spotbugsPlugins diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/src/main/java/datadog/trace/instrumentation/jetty94/MultipartHelper.java b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/src/main/java/datadog/trace/instrumentation/jetty94/MultipartHelper.java new file mode 100644 index 00000000000..7cc4ac9e930 --- /dev/null +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/src/main/java/datadog/trace/instrumentation/jetty94/MultipartHelper.java @@ -0,0 +1,77 @@ +package datadog.trace.instrumentation.jetty94; + +import static datadog.trace.api.gateway.Events.EVENTS; + +import datadog.appsec.api.blocking.BlockingException; +import datadog.trace.api.gateway.BlockResponseFunction; +import datadog.trace.api.gateway.CallbackProvider; +import datadog.trace.api.gateway.Flow; +import datadog.trace.api.gateway.RequestContext; +import datadog.trace.api.gateway.RequestContextSlot; +import datadog.trace.bootstrap.instrumentation.api.AgentTracer; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.function.BiFunction; +import javax.servlet.http.Part; + +public class MultipartHelper { + + private MultipartHelper() {} + + /** + * Extracts non-null, non-empty filenames from a collection of multipart {@link Part}s using + * {@link Part#getSubmittedFileName()} (Servlet 3.1+, Jetty 9.4.x–10.x). + * + * @return list of filenames; never {@code null}, may be empty + */ + public static List extractFilenames(Collection parts) { + if (parts == null || parts.isEmpty()) { + return Collections.emptyList(); + } + List filenames = new ArrayList<>(parts.size()); + for (Part part : parts) { + try { + String name = part.getSubmittedFileName(); + if (name != null && !name.isEmpty()) { + filenames.add(name); + } + } catch (Exception ignored) { + // malformed or inaccessible part — skip and continue with remaining parts + } + } + return filenames; + } + + /** + * Fires the {@code requestFilesFilenames} IG event and returns a {@link BlockingException} if the + * WAF requests blocking, or {@code null} otherwise. + */ + public static BlockingException fireFilenamesEvent( + Collection parts, RequestContext reqCtx) { + CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC); + BiFunction, Flow> callback = + cbp.getCallback(EVENTS.requestFilesFilenames()); + if (callback == null) { + return null; + } + List filenames = extractFilenames(parts); + if (filenames.isEmpty()) { + return null; + } + Flow flow = callback.apply(reqCtx, filenames); + Flow.Action action = flow.getAction(); + if (action instanceof Flow.Action.RequestBlockingAction) { + Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action; + BlockResponseFunction brf = reqCtx.getBlockResponseFunction(); + if (brf != null) { + if (brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba)) { + reqCtx.getTraceSegment().effectivelyBlocked(); + return new BlockingException("Blocked request (multipart file upload)"); + } + } + } + return null; + } +} diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/src/main/java/datadog/trace/instrumentation/jetty94/RequestExtractContentParametersInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/src/main/java/datadog/trace/instrumentation/jetty94/RequestExtractContentParametersInstrumentation.java new file mode 100644 index 00000000000..8b69460c16b --- /dev/null +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/src/main/java/datadog/trace/instrumentation/jetty94/RequestExtractContentParametersInstrumentation.java @@ -0,0 +1,199 @@ +package datadog.trace.instrumentation.jetty94; + +import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; +import static datadog.trace.api.gateway.Events.EVENTS; +import static net.bytebuddy.matcher.ElementMatchers.takesArguments; + +import com.google.auto.service.AutoService; +import datadog.appsec.api.blocking.BlockingException; +import datadog.trace.advice.ActiveRequestContext; +import datadog.trace.advice.RequiresRequestContext; +import datadog.trace.agent.tooling.Instrumenter; +import datadog.trace.agent.tooling.InstrumenterModule; +import datadog.trace.agent.tooling.muzzle.Reference; +import datadog.trace.api.gateway.BlockResponseFunction; +import datadog.trace.api.gateway.CallbackProvider; +import datadog.trace.api.gateway.Flow; +import datadog.trace.api.gateway.RequestContext; +import datadog.trace.api.gateway.RequestContextSlot; +import datadog.trace.bootstrap.CallDepthThreadLocalMap; +import datadog.trace.bootstrap.instrumentation.api.AgentTracer; +import java.util.Collection; +import java.util.function.BiFunction; +import javax.servlet.http.Part; +import net.bytebuddy.asm.Advice; +import net.bytebuddy.implementation.bytecode.assign.Assigner; +import org.eclipse.jetty.server.Request; +import org.eclipse.jetty.util.MultiMap; + +@AutoService(InstrumenterModule.class) +public class RequestExtractContentParametersInstrumentation extends InstrumenterModule.AppSec + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { + private static final String MULTI_MAP_INTERNAL_NAME = "Lorg/eclipse/jetty/util/MultiMap;"; + + public RequestExtractContentParametersInstrumentation() { + super("jetty"); + } + + @Override + public String instrumentedType() { + return "org.eclipse.jetty.server.Request"; + } + + @Override + public String[] helperClassNames() { + return new String[] {packageName + ".MultipartHelper"}; + } + + @Override + public void methodAdvice(MethodTransformer transformer) { + transformer.applyAdvice( + named("extractContentParameters").and(takesArguments(0)).or(named("getParts")), + getClass().getName() + "$ExtractContentParametersAdvice"); + transformer.applyAdvice( + named("getParts").and(takesArguments(0)), getClass().getName() + "$GetFilenamesAdvice"); + transformer.applyAdvice( + named("getParts").and(takesArguments(1)), + getClass().getName() + "$GetFilenamesFromMultiPartAdvice"); + } + + // Discriminates Jetty [9.4.10, 10.0) + [10.0.0, 11.0): + // - _contentParameters + extractContentParameters(void) exist from 9.3+ (excludes 9.2) + // - _multiParts field exists from 9.4.10+ (excludes 9.3.x–9.4.9 covered by jetty-appsec-9.3) + // - primary spec: _multiParts: MultiParts → matches 9.4.10–9.4.x and 10.0.10+ + // - OR spec: _multiParts: MultiPartFormInputStream → matches 10.0.0–10.0.9 + // - _dispatcherType: Ljavax/servlet/DispatcherType; in the Request bytecode (excludes Jetty 11+ + // where the field descriptor is Ljakarta/servlet/DispatcherType;). This check is tied to the + // Request.class bytecode, NOT just classpath presence, so it works even when both + // javax.servlet and jakarta.servlet are on the classpath simultaneously. + // Note: GetFilenamesAdvice reads _multiParts with typing=DYNAMIC so it works for all versions. + private static final Reference REQUEST_REFERENCE = + new Reference.Builder("org.eclipse.jetty.server.Request") + .withMethod(new String[0], 0, "extractContentParameters", "V") + .withField(new String[0], 0, "_contentParameters", MULTI_MAP_INTERNAL_NAME) + .withField(new String[0], 0, "_multiParts", "Lorg/eclipse/jetty/server/MultiParts;") + .withField(new String[0], 0, "_dispatcherType", "Ljavax/servlet/DispatcherType;") + .or() + .withMethod(new String[0], 0, "extractContentParameters", "V") + .withField(new String[0], 0, "_contentParameters", MULTI_MAP_INTERNAL_NAME) + .withField( + new String[0], + 0, + "_multiParts", + "Lorg/eclipse/jetty/server/MultiPartFormInputStream;") + .withField(new String[0], 0, "_dispatcherType", "Ljavax/servlet/DispatcherType;") + .build(); + + @Override + public Reference[] additionalMuzzleReferences() { + return new Reference[] {REQUEST_REFERENCE}; + } + + @RequiresRequestContext(RequestContextSlot.APPSEC) + public static class ExtractContentParametersAdvice { + @Advice.OnMethodEnter(suppress = Throwable.class) + static boolean before(@Advice.FieldValue("_contentParameters") final MultiMap map) { + final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(Request.class); + return callDepth == 0 && map == null; + } + + @Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class) + static void after( + @Advice.Enter boolean proceed, + @Advice.FieldValue("_contentParameters") final MultiMap map, + @ActiveRequestContext RequestContext reqCtx, + @Advice.Thrown(readOnly = false) Throwable t) { + CallDepthThreadLocalMap.decrementCallDepth(Request.class); + if (!proceed) { + return; + } + if (map == null || map.isEmpty()) { + return; + } + + CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC); + BiFunction> callback = + cbp.getCallback(EVENTS.requestBodyProcessed()); + if (callback == null) { + return; + } + + Flow flow = callback.apply(reqCtx, map); + Flow.Action action = flow.getAction(); + if (action instanceof Flow.Action.RequestBlockingAction) { + Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action; + BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction(); + if (blockResponseFunction != null) { + blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba); + if (t == null) { + t = new BlockingException("Blocked request (for Request/extractContentParameters)"); + reqCtx.getTraceSegment().effectivelyBlocked(); + } + } + } + } + } + + /** + * Fires the {@code requestFilesFilenames} event when the application calls public {@code + * getParts()}. Guards prevent double-firing: + * + *
    + *
  • {@code _contentParameters != null}: set by {@code extractContentParameters()} (the {@code + * getParameterMap()} path); means filenames were already reported via {@code + * GetFilenamesFromMultiPartAdvice}. + *
  • {@code _multiParts != null}: set by the first {@code getParts()} call in Jetty 9.4.10+; + * means filenames were already reported. + *
+ */ + @RequiresRequestContext(RequestContextSlot.APPSEC) + public static class GetFilenamesAdvice { + @Advice.OnMethodEnter(suppress = Throwable.class) + static boolean before( + @Advice.FieldValue("_contentParameters") final MultiMap contentParameters, + @Advice.FieldValue(value = "_multiParts", typing = Assigner.Typing.DYNAMIC) + final Object multiParts) { + final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(MultipartHelper.class); + return callDepth == 0 && contentParameters == null && multiParts == null; + } + + @Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class) + static void after( + @Advice.Enter boolean proceed, + @Advice.Return Collection parts, + @ActiveRequestContext RequestContext reqCtx, + @Advice.Thrown(readOnly = false) Throwable t) { + CallDepthThreadLocalMap.decrementCallDepth(MultipartHelper.class); + if (!proceed || t != null || parts == null || parts.isEmpty()) { + return; + } + t = MultipartHelper.fireFilenamesEvent(parts, reqCtx); + } + } + + /** + * Fires the {@code requestFilesFilenames} event when multipart content is parsed via the internal + * {@code getParts(MultiMap)} path triggered by {@code getParameter*()} / {@code + * getParameterMap()} — i.e. when the application never calls public {@code getParts()}. + */ + @RequiresRequestContext(RequestContextSlot.APPSEC) + public static class GetFilenamesFromMultiPartAdvice { + @Advice.OnMethodEnter(suppress = Throwable.class) + static boolean before() { + return CallDepthThreadLocalMap.incrementCallDepth(MultipartHelper.class) == 0; + } + + @Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class) + static void after( + @Advice.Enter boolean proceed, + @Advice.Return Collection parts, + @ActiveRequestContext RequestContext reqCtx, + @Advice.Thrown(readOnly = false) Throwable t) { + CallDepthThreadLocalMap.decrementCallDepth(MultipartHelper.class); + if (!proceed || t != null || parts == null || parts.isEmpty()) { + return; + } + t = MultipartHelper.fireFilenamesEvent(parts, reqCtx); + } + } +} diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/src/test/java/datadog/trace/instrumentation/jetty94/MultipartHelperTest.java b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/src/test/java/datadog/trace/instrumentation/jetty94/MultipartHelperTest.java new file mode 100644 index 00000000000..1b632fbb8fa --- /dev/null +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/src/test/java/datadog/trace/instrumentation/jetty94/MultipartHelperTest.java @@ -0,0 +1,67 @@ +package datadog.trace.instrumentation.jetty94; + +import static java.util.Arrays.asList; +import static java.util.Collections.emptyList; +import static java.util.Collections.singletonList; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import java.util.List; +import javax.servlet.http.Part; +import org.junit.jupiter.api.Test; + +class MultipartHelperTest { + + @Test + void returnsEmptyListForNull() { + assertEquals(emptyList(), MultipartHelper.extractFilenames(null)); + } + + @Test + void returnsEmptyListForEmpty() { + assertEquals(emptyList(), MultipartHelper.extractFilenames(emptyList())); + } + + @Test + void returnsEmptyListWhenAllPartsHaveNullFilename() { + List parts = asList(part(null), part(null)); + assertEquals(emptyList(), MultipartHelper.extractFilenames(parts)); + } + + @Test + void returnsEmptyListWhenAllPartsHaveEmptyFilename() { + List parts = asList(part(""), part("")); + assertEquals(emptyList(), MultipartHelper.extractFilenames(parts)); + } + + @Test + void extractsFilenameFromSinglePart() { + List parts = singletonList(part("photo.jpg")); + assertEquals(singletonList("photo.jpg"), MultipartHelper.extractFilenames(parts)); + } + + @Test + void extractsFilenamesFromMultipleParts() { + List parts = asList(part("a.jpg"), part("b.png"), part("c.pdf")); + assertEquals(asList("a.jpg", "b.png", "c.pdf"), MultipartHelper.extractFilenames(parts)); + } + + @Test + void skipsPartsWithNullOrEmptyFilenameAndKeepsValid() { + List parts = asList(part(null), part("valid.txt"), part(""), part("other.zip")); + assertEquals(asList("valid.txt", "other.zip"), MultipartHelper.extractFilenames(parts)); + } + + @Test + void preservesFilenamesWithSpacesAndSpecialCharacters() { + List parts = asList(part("my file.tar.gz"), part("résumé.pdf")); + assertEquals(asList("my file.tar.gz", "résumé.pdf"), MultipartHelper.extractFilenames(parts)); + } + + private Part part(String submittedFileName) { + Part p = mock(Part.class); + when(p.getSubmittedFileName()).thenReturn(submittedFileName); + return p; + } +} diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/build.gradle index 334d032273c..aab0069cbcb 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/build.gradle +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/build.gradle @@ -36,6 +36,9 @@ tracerJava { addTestSuiteForDir("latestDepTest", "test") addTestSuiteExtendingForDir("latestDepForkedTest", "latestDepTest", "test") +// Exercises jetty-appsec-9.4's early_10_series muzzle pass: _multiParts was +// MultiPartFormInputStream in [10.0.0, 10.0.10) before switching to MultiParts in 10.0.10. +addTestSuiteForDir("earlyDep10ForkedTest", "test") dependencies { main_java11Implementation project(':dd-java-agent:instrumentation:jetty:jetty-common') @@ -48,9 +51,11 @@ dependencies { } testImplementation project(':dd-java-agent:instrumentation:jetty:jetty-util-9.4.31') - testImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '10.0.0' - testImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '10.0.0' - testImplementation group: 'org.eclipse.jetty.websocket', name: 'websocket-javax-server', version: '10.0.0' + // Use 10.0.10+ so jetty-appsec-9.4 applies: _multiParts changed from MultiPartFormInputStream + // to MultiParts in 10.0.10 (jetty-appsec-9.4's muzzle requires the MultiParts type). + testImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '10.0.10' + testImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '10.0.10' + testImplementation group: 'org.eclipse.jetty.websocket', name: 'websocket-javax-server', version: '10.0.10' testImplementation project(':dd-java-agent:appsec:appsec-test-fixtures') testImplementation testFixtures(project(":dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0")) testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0')) @@ -63,7 +68,7 @@ dependencies { testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-7.0') testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-8.1.3') testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.2') - testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.3') + testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.4') // Include all websocket instrumentation modules for testing. Only the version-compatible module will apply at runtime. testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:javax-websocket-1.0') testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:jakarta-websocket-2.0') @@ -72,14 +77,42 @@ dependencies { latestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '10.+' latestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '10.+' latestDepTestImplementation group: 'org.eclipse.jetty.websocket', name: 'websocket-javax-server', version: '10.+' - latestDepTestImplementation project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.3') + latestDepTestImplementation project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.4') latestDepTestImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0')) latestDepForkedTestImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '10.+' latestDepForkedTestImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '10.+' latestDepForkedTestImplementation group: 'org.eclipse.jetty.websocket', name: 'websocket-javax-server', version: '10.+' - latestDepForkedTestImplementation project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.3') + latestDepForkedTestImplementation project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.4') latestDepForkedTestImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0')) + + // Early Jetty 10 (10.0.0–10.0.9): _multiParts is MultiPartFormInputStream, not MultiParts. + earlyDep10ForkedTestImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '10.0.9' + earlyDep10ForkedTestImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '10.0.9' + earlyDep10ForkedTestImplementation group: 'org.eclipse.jetty.websocket', name: 'websocket-javax-server', version: '10.0.9' + earlyDep10ForkedTestImplementation project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.4') + earlyDep10ForkedTestImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0')) +} + +tasks.named('earlyDep10ForkedTest', Test) { + systemProperty 'test.dd.earlyJetty10', 'true' +} + +// Force Jetty 10.0.9 for the early suite: earlyDep10ForkedTestImplementation extends +// testImplementation (which pins 10.0.10), so without this force Gradle would pick 10.0.10 +// and never exercise the MultiPartFormInputStream path. +['earlyDep10ForkedTestCompileClasspath', 'earlyDep10ForkedTestRuntimeClasspath'].each { conf -> + configurations.named(conf) { + resolutionStrategy.eachDependency { DependencyResolveDetails details -> + if (details.requested.group == 'org.eclipse.jetty' || + details.requested.group == 'org.eclipse.jetty.websocket') { + if (details.requested.version.startsWith('10.')) { + details.useVersion '10.0.9' + details.because 'earlyDep10ForkedTest must stay on Jetty 10.0.9 to exercise MultiPartFormInputStream path' + } + } + } + } } configurations.named('latestDepForkedTestRuntimeClasspath') { diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/gradle.lockfile index 9c9d14ad4b2..7f7a5e4feb4 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/gradle.lockfile @@ -1,64 +1,63 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -ch.qos.logback:logback-classic:1.2.13=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -ch.qos.logback:logback-core:1.2.13=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq.okhttp3:okhttp:3.12.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq.okio:okio:1.17.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:java-dogstatsd-client:4.4.5=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.datadoghq:sketches-java:0.8.3=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +cafe.cryptography:curve25519-elisabeth:0.1.0=earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +cafe.cryptography:ed25519-elisabeth:0.1.0=earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +ch.qos.logback:logback-classic:1.2.13=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +ch.qos.logback:logback-core:1.2.13=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq.okhttp3:okhttp:3.12.15=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq.okio:okio:1.17.6=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:java-dogstatsd-client:4.4.5=earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.datadoghq:sketches-java:0.8.3=earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.jnr:jffi:1.3.15=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-a64asm:1.0.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-constants:0.10.4=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-enxio:0.32.20=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-ffi:2.2.19=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-posix:3.1.22=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-unixsocket:0.38.25=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-x86asm:1.0.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.jnr:jffi:1.3.15=earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-a64asm:1.0.0=earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-constants:0.10.4=earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-enxio:0.32.20=earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-ffi:2.2.19=earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-posix:3.1.22=earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-unixsocket:0.38.25=earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-x86asm:1.0.2=earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs -com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath -com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.auto:auto-common:1.2.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,earlyDep10ForkedTestAnnotationProcessor,earlyDep10ForkedTestCompileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath +com.google.auto.service:auto-service:1.1.1=annotationProcessor,earlyDep10ForkedTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.auto:auto-common:1.2.1=annotationProcessor,earlyDep10ForkedTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,earlyDep10ForkedTestAnnotationProcessor,earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs -com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,earlyDep10ForkedTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.squareup.okhttp3:okhttp:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.squareup.okio:okio:1.17.5=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.1=annotationProcessor,earlyDep10ForkedTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:20.0=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:32.0.1-jre=annotationProcessor,earlyDep10ForkedTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,earlyDep10ForkedTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,earlyDep10ForkedTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.re2j:re2j:1.7=earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.squareup.moshi:moshi:1.11.0=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.squareup.okhttp3:logging-interceptor:3.12.12=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.squareup.okhttp3:okhttp:3.12.12=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.squareup.okio:okio:1.17.5=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.thoughtworks.qdox:qdox:1.12.1=codenarc -commons-fileupload:commons-fileupload:1.5=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -commons-io:commons-io:2.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-fileupload:commons-fileupload:1.5=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-io:commons-io:2.11.0=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath commons-io:commons-io:2.20.0=spotbugs -de.thetaphi:forbiddenapis:3.10=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -io.leangen.geantyref:geantyref:1.3.16=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:17.3.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -jakarta.annotation:jakarta.annotation-api:1.3.5=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -jakarta.transaction:jakarta.transaction-api:1.3.2=testCompileClasspath,testRuntimeClasspath -jakarta.transaction:jakarta.transaction-api:1.3.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -javax.websocket:javax.websocket-api:1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +de.thetaphi:forbiddenapis:3.10=compileClasspath,earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +io.leangen.geantyref:geantyref:1.3.16=earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:17.3.0=earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +jakarta.annotation:jakarta.annotation-api:1.3.5=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.transaction:jakarta.transaction-api:1.3.3=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +javax.servlet:javax.servlet-api:3.1.0=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +javax.websocket:javax.websocket-api:1.0=earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath jaxen:jaxen:2.0.0=spotbugs -junit:junit:4.13.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.java.dev.jna:jna-platform:5.8.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -net.java.dev.jna:jna:5.8.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +junit:junit:4.13.2=earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.java.dev.jna:jna-platform:5.8.0=earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +net.java.dev.jna:jna:5.8.0=earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.9=spotbugs org.apache.ant:ant-antlr:1.10.14=codenarc org.apache.ant:ant-junit:1.10.14=codenarc @@ -67,109 +66,137 @@ org.apache.commons:commons-lang3:3.19.0=spotbugs org.apache.commons:commons-text:1.14.0=spotbugs org.apache.logging.log4j:log4j-api:2.25.2=spotbugs org.apache.logging.log4j:log4j-core:2.25.2=spotbugs -org.apiguardian:apiguardian-api:1.1.2=latestDepForkedTestCompileClasspath,latestDepTestCompileClasspath,testCompileClasspath -org.checkerframework:checker-qual:3.33.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +org.apiguardian:apiguardian-api:1.1.2=earlyDep10ForkedTestCompileClasspath,latestDepForkedTestCompileClasspath,latestDepTestCompileClasspath,testCompileClasspath +org.checkerframework:checker-qual:3.33.0=annotationProcessor,earlyDep10ForkedTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor org.codehaus.groovy:groovy-ant:3.0.23=codenarc org.codehaus.groovy:groovy-docgenerator:3.0.23=codenarc org.codehaus.groovy:groovy-groovydoc:3.0.23=codenarc org.codehaus.groovy:groovy-json:3.0.23=codenarc -org.codehaus.groovy:groovy-json:3.0.25=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-json:3.0.25=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.groovy:groovy-templates:3.0.23=codenarc org.codehaus.groovy:groovy-xml:3.0.23=codenarc org.codehaus.groovy:groovy:3.0.23=codenarc -org.codehaus.groovy:groovy:3.0.25=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy:3.0.25=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.codenarc:CodeNarc:3.7.0=codenarc org.dom4j:dom4j:2.2.0=spotbugs -org.eclipse.jetty.toolchain:jetty-javax-websocket-api:1.1.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.5=main_java11CompileClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.eclipse.jetty.websocket:websocket-core-client:10.0.0=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.toolchain:jetty-javax-websocket-api:1.1.2=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.5=main_java11CompileClasspath +org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.websocket:websocket-core-client:10.0.10=testCompileClasspath,testRuntimeClasspath org.eclipse.jetty.websocket:websocket-core-client:10.0.26=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.eclipse.jetty.websocket:websocket-core-common:10.0.0=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.websocket:websocket-core-client:10.0.9=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath +org.eclipse.jetty.websocket:websocket-core-common:10.0.10=testCompileClasspath,testRuntimeClasspath org.eclipse.jetty.websocket:websocket-core-common:10.0.26=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.eclipse.jetty.websocket:websocket-core-server:10.0.0=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.websocket:websocket-core-common:10.0.9=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath +org.eclipse.jetty.websocket:websocket-core-server:10.0.10=testCompileClasspath,testRuntimeClasspath org.eclipse.jetty.websocket:websocket-core-server:10.0.26=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.eclipse.jetty.websocket:websocket-javax-client:10.0.0=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.websocket:websocket-core-server:10.0.9=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath +org.eclipse.jetty.websocket:websocket-javax-client:10.0.10=testCompileClasspath,testRuntimeClasspath org.eclipse.jetty.websocket:websocket-javax-client:10.0.26=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.eclipse.jetty.websocket:websocket-javax-common:10.0.0=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.websocket:websocket-javax-client:10.0.9=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath +org.eclipse.jetty.websocket:websocket-javax-common:10.0.10=testCompileClasspath,testRuntimeClasspath org.eclipse.jetty.websocket:websocket-javax-common:10.0.26=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.eclipse.jetty.websocket:websocket-javax-server:10.0.0=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.websocket:websocket-javax-common:10.0.9=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath +org.eclipse.jetty.websocket:websocket-javax-server:10.0.10=testCompileClasspath,testRuntimeClasspath org.eclipse.jetty.websocket:websocket-javax-server:10.0.26=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.eclipse.jetty.websocket:websocket-servlet:10.0.0=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.websocket:websocket-javax-server:10.0.9=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath +org.eclipse.jetty.websocket:websocket-servlet:10.0.10=testCompileClasspath,testRuntimeClasspath org.eclipse.jetty.websocket:websocket-servlet:10.0.26=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:10.0.0=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.websocket:websocket-servlet:10.0.9=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath +org.eclipse.jetty:jetty-alpn-client:10.0.10=testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-alpn-client:10.0.26=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.eclipse.jetty:jetty-annotations:10.0.0=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-client:10.0.9=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath +org.eclipse.jetty:jetty-annotations:10.0.10=testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-annotations:10.0.26=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.eclipse.jetty:jetty-client:10.0.0=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-annotations:10.0.9=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath +org.eclipse.jetty:jetty-client:10.0.10=testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-client:10.0.26=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.eclipse.jetty:jetty-http:10.0.0=main_java11CompileClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-client:10.0.9=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath +org.eclipse.jetty:jetty-http:10.0.0=main_java11CompileClasspath +org.eclipse.jetty:jetty-http:10.0.10=testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-http:10.0.26=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.eclipse.jetty:jetty-io:10.0.0=main_java11CompileClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-http:10.0.9=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath +org.eclipse.jetty:jetty-io:10.0.0=main_java11CompileClasspath +org.eclipse.jetty:jetty-io:10.0.10=testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-io:10.0.26=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.eclipse.jetty:jetty-jndi:10.0.0=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-io:10.0.9=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath +org.eclipse.jetty:jetty-jndi:10.0.10=testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-jndi:10.0.26=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.eclipse.jetty:jetty-plus:10.0.0=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-jndi:10.0.9=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath +org.eclipse.jetty:jetty-plus:10.0.10=testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-plus:10.0.26=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.eclipse.jetty:jetty-security:10.0.0=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-plus:10.0.9=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath +org.eclipse.jetty:jetty-security:10.0.10=testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-security:10.0.26=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.eclipse.jetty:jetty-server:10.0.0=main_java11CompileClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-security:10.0.9=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath +org.eclipse.jetty:jetty-server:10.0.0=main_java11CompileClasspath +org.eclipse.jetty:jetty-server:10.0.10=testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-server:10.0.26=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.eclipse.jetty:jetty-servlet:10.0.0=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-server:10.0.9=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath +org.eclipse.jetty:jetty-servlet:10.0.10=testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-servlet:10.0.26=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.eclipse.jetty:jetty-util:10.0.0=main_java11CompileClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-servlet:10.0.9=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath +org.eclipse.jetty:jetty-util:10.0.0=main_java11CompileClasspath +org.eclipse.jetty:jetty-util:10.0.10=testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-util:10.0.26=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.eclipse.jetty:jetty-webapp:10.0.0=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-util:10.0.9=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath +org.eclipse.jetty:jetty-webapp:10.0.10=testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-webapp:10.0.26=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.eclipse.jetty:jetty-xml:10.0.0=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-webapp:10.0.9=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath +org.eclipse.jetty:jetty-xml:10.0.10=testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-xml:10.0.26=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.eclipse.jetty:jetty-xml:10.0.9=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath org.gmetrics:GMetrics:2.1.0=codenarc -org.hamcrest:hamcrest-core:1.3=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -org.hamcrest:hamcrest:3.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jctools:jctools-core-jdk11:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -org.jctools:jctools-core:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-launcher:1.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-runner:1.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-suite-api:1.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-suite-commons:1.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.hamcrest:hamcrest-core:1.3=earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.hamcrest:hamcrest:3.0=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jctools:jctools-core-jdk11:4.0.6=earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jctools:jctools-core:4.0.6=earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.14.1=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.14.1=earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-params:5.14.1=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter:5.14.1=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.14.1=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.14.1=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-launcher:1.14.1=earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-runner:1.14.1=earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-suite-api:1.14.1=earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-suite-commons:1.14.1=earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.0=spotbugs -org.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.mockito:mockito-core:4.4.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -org.objenesis:objenesis:3.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.opentest4j:opentest4j:1.3.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.ow2.asm:asm-analysis:9.0=testCompileClasspath -org.ow2.asm:asm-analysis:9.7.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.junit:junit-bom:5.14.1=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.mockito:mockito-core:4.4.0=earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.objenesis:objenesis:3.3=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.opentest4j:opentest4j:1.3.0=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.ow2.asm:asm-analysis:9.2=earlyDep10ForkedTestCompileClasspath +org.ow2.asm:asm-analysis:9.3=testCompileClasspath +org.ow2.asm:asm-analysis:9.7.1=earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:9.9=spotbugs -org.ow2.asm:asm-commons:9.0=testCompileClasspath +org.ow2.asm:asm-commons:9.2=earlyDep10ForkedTestCompileClasspath +org.ow2.asm:asm-commons:9.3=testCompileClasspath org.ow2.asm:asm-commons:9.8=latestDepForkedTestCompileClasspath,latestDepTestCompileClasspath org.ow2.asm:asm-commons:9.9=spotbugs -org.ow2.asm:asm-commons:9.9.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -org.ow2.asm:asm-tree:9.0=testCompileClasspath +org.ow2.asm:asm-commons:9.9.1=earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.ow2.asm:asm-tree:9.2=earlyDep10ForkedTestCompileClasspath +org.ow2.asm:asm-tree:9.3=testCompileClasspath org.ow2.asm:asm-tree:9.8=latestDepForkedTestCompileClasspath,latestDepTestCompileClasspath org.ow2.asm:asm-tree:9.9=spotbugs -org.ow2.asm:asm-tree:9.9.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -org.ow2.asm:asm-util:9.7.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.ow2.asm:asm-tree:9.9.1=earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.ow2.asm:asm-util:9.7.1=earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.ow2.asm:asm-util:9.9=spotbugs org.ow2.asm:asm:9.9=spotbugs -org.ow2.asm:asm:9.9.1=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.slf4j:jcl-over-slf4j:1.7.30=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.slf4j:jul-to-slf4j:1.7.30=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.slf4j:log4j-over-slf4j:1.7.30=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.ow2.asm:asm:9.9.1=buildTimeInstrumentationPlugin,compileClasspath,earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:jcl-over-slf4j:1.7.30=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:jul-to-slf4j:1.7.30=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:log4j-over-slf4j:1.7.30=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-api:1.7.30=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestRuntimeClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath -org.slf4j:slf4j-api:2.0.0-alpha1=main_java11CompileClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:2.0.0-alpha1=main_java11CompileClasspath +org.slf4j:slf4j-api:2.0.0-alpha6=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-api:2.0.13=latestDepForkedTestCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.slf4j:slf4j-api:2.0.17=spotbugs,spotbugsSlf4j org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j -org.snakeyaml:snakeyaml-engine:2.9=buildTimeInstrumentationPlugin,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -org.spockframework:spock-bom:2.4-groovy-3.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.spockframework:spock-core:2.4-groovy-3.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.tabletest:tabletest-junit:1.2.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.tabletest:tabletest-parser:1.2.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.snakeyaml:snakeyaml-engine:2.9=buildTimeInstrumentationPlugin,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath +org.spockframework:spock-bom:2.4-groovy-3.0=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.spockframework:spock-core:2.4-groovy-3.0=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.tabletest:tabletest-junit:1.2.1=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.tabletest:tabletest-parser:1.2.0=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.xmlresolver:xmlresolver:5.3.3=spotbugs -empty=main_java11AnnotationProcessor,spotbugsPlugins +empty=earlyDep10TestAnnotationProcessor,earlyDep10TestCompileOnly,earlyDep10TestImplementation,earlyDep10TestRuntimeOnly,main_java11AnnotationProcessor,spotbugsPlugins diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/test/groovy/datadog/trace/instrumentation/jetty10/Jetty10EarlyDepForkedTest.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/test/groovy/datadog/trace/instrumentation/jetty10/Jetty10EarlyDepForkedTest.java new file mode 100644 index 00000000000..47cbde9736c --- /dev/null +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/test/groovy/datadog/trace/instrumentation/jetty10/Jetty10EarlyDepForkedTest.java @@ -0,0 +1,58 @@ +package datadog.trace.instrumentation.jetty10; + +import datadog.trace.agent.test.naming.TestingGenericHttpNamingConventions; +import org.junit.jupiter.api.condition.EnabledIfSystemProperty; + +/** + * Exercises jetty-appsec-9.4's "early_10_series" muzzle pass ([10.0.0, 10.0.10)) where {@code + * _multiParts} is {@code MultiPartFormInputStream} instead of {@code MultiParts}. The OR-muzzle + * reference in jetty-appsec-9.4 covers both field types; this suite verifies the advice actually + * applies and fires AppSec events on the older field type. + * + *

Guarded by the {@code test.dd.earlyJetty10} system property so these classes only run in the + * {@code earlyDep10ForkedTest} Gradle task (Jetty 10.0.9). + */ +@EnabledIfSystemProperty(named = "test.dd.earlyJetty10", matches = ".+") +class Jetty10EarlyDepV0ForkedTest extends Jetty10Test + implements TestingGenericHttpNamingConventions.ServerV0 { + + @Override + public int version() { + return 0; + } + + @Override + public String service() { + return null; + } + + @Override + public String operation() { + return "servlet.request"; + } +} + +@EnabledIfSystemProperty(named = "test.dd.earlyJetty10", matches = ".+") +class Jetty10EarlyDepV1ForkedTest extends Jetty10Test + implements TestingGenericHttpNamingConventions.ServerV1 { + + @Override + public int version() { + return 1; + } + + @Override + public String service() { + return null; + } + + @Override + public String operation() { + return "http.server.request"; + } + + @Override + protected boolean useWebsocketPojoEndpoint() { + return false; + } +} diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/test/groovy/datadog/trace/instrumentation/jetty10/Jetty10Test.groovy b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/test/groovy/datadog/trace/instrumentation/jetty10/Jetty10Test.groovy index 7dec61c223f..2726574ec83 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/test/groovy/datadog/trace/instrumentation/jetty10/Jetty10Test.groovy +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/test/groovy/datadog/trace/instrumentation/jetty10/Jetty10Test.groovy @@ -85,6 +85,21 @@ abstract class Jetty10Test extends HttpServerTest { true } + @Override + boolean testBodyFilenames() { + true + } + + @Override + boolean testBodyFilenamesCalledOnce() { + true + } + + @Override + boolean testBodyFilenamesCalledOnceCombined() { + true + } + @Override boolean testSessionId() { true diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/build.gradle index 119dd38ea12..ae74abe7d1b 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/build.gradle +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/build.gradle @@ -47,7 +47,7 @@ dependencies { testImplementation ("org.eclipse.jetty.websocket:websocket-jakarta-server:11.0.0") { exclude group: 'org.slf4j', module: 'slf4j-api' } - testImplementation(project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.3')) + testImplementation(project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-11.0')) testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:jakarta-servlet-5.0')) testImplementation project(':dd-java-agent:appsec:appsec-test-fixtures') testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0') diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/test/groovy/Jetty11Test.groovy b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/test/groovy/Jetty11Test.groovy index f4da48aaaf3..80afb31077a 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/test/groovy/Jetty11Test.groovy +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/test/groovy/Jetty11Test.groovy @@ -67,6 +67,21 @@ abstract class Jetty11Test extends HttpServerTest { true } + @Override + boolean testBodyFilenames() { + true + } + + @Override + boolean testBodyFilenamesCalledOnce() { + true + } + + @Override + boolean testBodyFilenamesCalledOnceCombined() { + true + } + @Override boolean testBlocking() { true diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/test/groovy/JettyAsyncHandlerTest.groovy b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/test/groovy/JettyAsyncHandlerTest.groovy index 38f5b1449ab..799a7d392b1 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/test/groovy/JettyAsyncHandlerTest.groovy +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/test/groovy/JettyAsyncHandlerTest.groovy @@ -25,6 +25,21 @@ class JettyAsyncHandlerTest extends Jetty11Test implements TestingGenericHttpNam false } + @Override + boolean testBodyFilenames() { + false + } + + @Override + boolean testBodyFilenamesCalledOnce() { + false + } + + @Override + boolean testBodyFilenamesCalledOnceCombined() { + false + } + static class ContinuationTestHandler implements Handler { @Delegate private final Handler delegate diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/build.gradle index d2346ef072a..25b4cd11e3f 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/build.gradle +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/build.gradle @@ -67,6 +67,8 @@ dependencies { } testImplementation(project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.3')) + testRuntimeOnly(project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.4')) + testRuntimeOnly(project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-11.0')) testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:jakarta-servlet-5.0')) testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0')) testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:javax-websocket-1.0') diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/build.gradle index 613f00a4f3e..0b34ae39684 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/build.gradle +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/build.gradle @@ -20,6 +20,11 @@ configurations.testRuntimeOnly { exclude group: 'javax.servlet', module: 'javax.servlet-api' } +tasks.named('latestDepForkedTest', Test) { + // Signal that we are running against Jetty 8.x so Jetty8*LatestDepForkedTest activates. + systemProperty 'test.dd.filenames', 'true' +} + dependencies { compileOnly group: 'org.eclipse.jetty', name: 'jetty-server', version: '7.6.0.v20120127' implementation project(':dd-java-agent:instrumentation:jetty:jetty-common') @@ -34,8 +39,14 @@ dependencies { testImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '7.6.0.v20120127' testImplementation group: 'org.eclipse.jetty', name: 'jetty-continuation', version: '7.6.0.v20120127' testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0')) + // Needed to compile Jetty8LatestDepForkedTest (provides MultipartConfigElement). + // Uses the Orbit repackaging so it is not caught by the javax.servlet:javax.servlet-api exclusion. + // Compile-only: the Orbit jar is provided at runtime by Jetty 8.x in the latestDepForkedTest. + testCompileOnly group: 'org.eclipse.jetty.orbit', name: 'javax.servlet', version: '3.0.0.v201112011016' testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-2.2') testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-7.0') + // Activated only on Jetty 8.x (muzzle rejects it for 7.6) + testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-8.1.3') latestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '8.+' latestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '8.+' diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/gradle.lockfile index c26dd0d003e..b84f6f3c511 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/gradle.lockfile @@ -76,7 +76,7 @@ org.codehaus.groovy:groovy:3.0.23=codenarc org.codehaus.groovy:groovy:3.0.25=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.codenarc:CodeNarc:3.7.0=codenarc org.dom4j:dom4j:2.2.0=spotbugs -org.eclipse.jetty.orbit:javax.servlet:3.0.0.v201112011016=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestImplementation +org.eclipse.jetty.orbit:javax.servlet:3.0.0.v201112011016=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestImplementation,testCompileClasspath org.eclipse.jetty:jetty-continuation:7.6.0.v20120127=compileClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-continuation:8.2.0.v20160908=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestImplementation org.eclipse.jetty:jetty-http:7.6.0.v20120127=compileClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/test/groovy/Jetty8LatestDepForkedTest.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/test/groovy/Jetty8LatestDepForkedTest.java new file mode 100644 index 00000000000..b852aa3a184 --- /dev/null +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/test/groovy/Jetty8LatestDepForkedTest.java @@ -0,0 +1,133 @@ +import datadog.trace.agent.test.base.HttpServerTest; +import datadog.trace.agent.test.naming.TestingGenericHttpNamingConventions; +import java.io.IOException; +import javax.servlet.MultipartConfigElement; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.eclipse.jetty.server.Request; +import org.eclipse.jetty.server.handler.AbstractHandler; +import org.junit.jupiter.api.condition.EnabledIfSystemProperty; + +/** + * Integration tests for multipart filename extraction on Jetty 8.x. + * + *

Jetty 8.x introduced Servlet 3.0 and {@code getParts()}, which is the only entry point for + * multipart processing in this version range (there is no {@code extractContentParameters()} + * instrumentation like in 9.3+). The handler must therefore call {@code getParts()} explicitly + * before {@code getParameterMap()} so that multipart form fields are visible to the servlet. + * + *

Only activated for the {@code latestDepForkedTest} Gradle task (Jetty 8.x). The {@code + * test.dd.filenames} system property gates execution, preventing these tests from running against + * Jetty 7.6 where {@code getParts()} does not exist. + */ +abstract class Jetty8LatestDepForkedTest extends Jetty76Test { + + @Override + public AbstractHandler handler() { + return new Jetty8TestHandler(); + } + + @Override + public boolean testBodyMultipart() { + return true; + } + + @Override + public boolean testBodyFilenames() { + return true; + } + + @Override + public boolean testBodyFilenamesCalledOnce() { + // Jetty 8.x has no _multiParts field guard; getParts() called multiple times + // (BODY_MULTIPART_REPEATED) fires the event more than once. + return false; + } + + @Override + public boolean testBodyFilenamesCalledOnceCombined() { + // Jetty 8.x has no _contentParameters field guard; BODY_MULTIPART_COMBINED + // fires the event on the getParts() call regardless of prior parameterMap access. + return false; + } + + static class Jetty8TestHandler extends AbstractHandler { + private static final MultipartConfigElement MULTIPART_CONFIG = + new MultipartConfigElement(System.getProperty("java.io.tmpdir")); + + @Override + public void handle( + String target, + Request baseRequest, + HttpServletRequest request, + HttpServletResponse response) + throws IOException, ServletException { + if (!baseRequest.getDispatcherType().name().equals("ERROR")) { + // Enable Servlet 3.0 multipart processing for all requests. + request.setAttribute("org.eclipse.jetty.multipartConfig", MULTIPART_CONFIG); + request.setAttribute("org.eclipse.multipartConfig", MULTIPART_CONFIG); + + // Jetty 8.x does not populate getParameterMap() from multipart form fields without a + // prior getParts() call (unlike 9.3+ where extractContentParameters() does this). + // Pre-call getParts() for BODY_MULTIPART so the servlet can read form fields via + // getParameterMap(). Skip for BODY_MULTIPART_REPEATED and BODY_MULTIPART_COMBINED, + // which call getParts() themselves and rely on the first call triggering filenames. + HttpServerTest.ServerEndpoint endpoint = + HttpServerTest.ServerEndpoint.forPath(request.getRequestURI()); + if (endpoint == HttpServerTest.ServerEndpoint.BODY_MULTIPART) { + try { + request.getParts(); + } catch (IOException | ServletException ignored) { + } + } + + Jetty76Test.TestHandler.handleRequest(baseRequest, response); + baseRequest.setHandled(true); + } else { + ((AbstractHandler) Jetty76Test.getErrorHandler()) + .handle(target, baseRequest, request, response); + } + } + } +} + +@EnabledIfSystemProperty(named = "test.dd.filenames", matches = ".+") +class Jetty8V0LatestDepForkedTest extends Jetty8LatestDepForkedTest + implements TestingGenericHttpNamingConventions.ServerV0 { + + @Override + public int version() { + return 0; + } + + @Override + public String service() { + return null; + } + + @Override + public String operation() { + return "servlet.request"; + } +} + +@EnabledIfSystemProperty(named = "test.dd.filenames", matches = ".+") +class Jetty8V1LatestDepForkedTest extends Jetty8LatestDepForkedTest + implements TestingGenericHttpNamingConventions.ServerV1 { + + @Override + public int version() { + return 1; + } + + @Override + public String service() { + return null; + } + + @Override + public String operation() { + return "http.server.request"; + } +} diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/build.gradle index d10301bebad..c341a6447fe 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/build.gradle +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/build.gradle @@ -12,6 +12,10 @@ apply from: "$rootDir/gradle/java.gradle" addTestSuiteForDir("latestDepTest", "test") addTestSuiteExtendingForDir("latestDepForkedTest", "latestDepTest", "test") +tasks.named('latestDepForkedTest', Test) { + systemProperty 'test.dd.jetty92', 'true' +} + // Exclude servlet 3.x API (coming from dd-java-agent:testing) to ensure servlet 2.x instrumentation applies. // Using testRuntimeClasspath instead of testImplementation because exclusions on testImplementation // propagate to latestDep* configurations, which need servlet 3.1 API for Jetty 9.2.x. diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty92LatestDepForkedTest.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty92LatestDepForkedTest.java new file mode 100644 index 00000000000..dd9e65e8b72 --- /dev/null +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty92LatestDepForkedTest.java @@ -0,0 +1,77 @@ +package datadog.trace.instrumentation.jetty9; + +import datadog.trace.agent.test.naming.TestingGenericHttpNamingConventions; +import org.junit.jupiter.api.condition.EnabledIfSystemProperty; + +/** + * Integration tests for multipart filename extraction on Jetty 9.2.x. + * + *

Jetty 9.2 introduces Servlet 3.1 and {@link javax.servlet.http.Part#getSubmittedFileName()}, + * which is used by the {@code jetty-appsec-9.2} instrumentation to report filenames to the WAF. + * + *

Only activated for the {@code latestDepForkedTest} Gradle task (Jetty 9.2.x). The {@code + * test.dd.jetty92} system property gates execution, preventing these tests from running against + * Jetty 9.0.4 where {@code getSubmittedFileName()} does not exist. + */ +abstract class Jetty92LatestDepForkedTest extends Jetty9Test { + + @Override + public boolean testBodyMultipart() { + return true; + } + + @Override + public boolean testBodyFilenames() { + return true; + } + + @Override + public boolean testBodyFilenamesCalledOnce() { + return true; + } + + @Override + public boolean testBodyFilenamesCalledOnceCombined() { + return true; + } +} + +@EnabledIfSystemProperty(named = "test.dd.jetty92", matches = ".+") +class Jetty92V0LatestDepForkedTest extends Jetty92LatestDepForkedTest + implements TestingGenericHttpNamingConventions.ServerV0 { + + @Override + public int version() { + return 0; + } + + @Override + public String service() { + return null; + } + + @Override + public String operation() { + return "servlet.request"; + } +} + +@EnabledIfSystemProperty(named = "test.dd.jetty92", matches = ".+") +class Jetty92V1LatestDepForkedTest extends Jetty92LatestDepForkedTest + implements TestingGenericHttpNamingConventions.ServerV1 { + + @Override + public int version() { + return 1; + } + + @Override + public String service() { + return null; + } + + @Override + public String operation() { + return "http.server.request"; + } +} diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty9InactiveAppSecTest.groovy b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty9InactiveAppSecTest.groovy index b54000a00ec..3a1e9bdf844 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty9InactiveAppSecTest.groovy +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty9InactiveAppSecTest.groovy @@ -9,4 +9,12 @@ class Jetty9InactiveAppSecTest extends AppSecInactiveHttpServerTest { HttpServer server() { new JettyServer(TestHandler.INSTANCE) } + + // jetty-appsec-8.1.3 covers [8.1.3, 9.2.0.RC0) which includes Jetty 9.0.x. + // It instruments extractContentParameters() but calls ParameterCollector.put(String, String) + // which does not exist in Jetty 9.0.x → HTTP 500 on multipart requests. + @Override + protected boolean supportsMultipart() { + false + } } diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty9Test.groovy b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty9Test.groovy index 38eb20340c6..36faf0b24a9 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty9Test.groovy +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty9Test.groovy @@ -82,7 +82,10 @@ abstract class Jetty9Test extends HttpServerTest { @Override boolean testBodyMultipart() { - true + // jetty-appsec-8.1.3 covers [8.1.3, 9.2.0.RC0) which includes Jetty 9.0.x. + // Its extractContentParameters() advice calls ParameterCollector.put(String, String) + // which does not exist in Jetty 9.0.x → HTTP 500 on multipart requests. + false } @Override diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty9InactiveAppSecTest.groovy b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty9InactiveAppSecTest.groovy index b54000a00ec..3a1e9bdf844 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty9InactiveAppSecTest.groovy +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty9InactiveAppSecTest.groovy @@ -9,4 +9,12 @@ class Jetty9InactiveAppSecTest extends AppSecInactiveHttpServerTest { HttpServer server() { new JettyServer(TestHandler.INSTANCE) } + + // jetty-appsec-8.1.3 covers [8.1.3, 9.2.0.RC0) which includes Jetty 9.0.x. + // It instruments extractContentParameters() but calls ParameterCollector.put(String, String) + // which does not exist in Jetty 9.0.x → HTTP 500 on multipart requests. + @Override + protected boolean supportsMultipart() { + false + } } diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty9Test.groovy b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty9Test.groovy index 32a1b300c28..848f551bf29 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty9Test.groovy +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty9Test.groovy @@ -81,7 +81,10 @@ abstract class Jetty9Test extends HttpServerTest { @Override boolean testBodyMultipart() { - true + // jetty-appsec-8.1.3 covers [8.1.3, 9.2.0.RC0) which includes Jetty 9.0.x. + // Its extractContentParameters() advice calls ParameterCollector.put(String, String) + // which does not exist in Jetty 9.0.x → HTTP 500 on multipart requests. + false } @Override diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.3/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.3/build.gradle index 5d08c44f4c9..736630c640e 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.3/build.gradle +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.3/build.gradle @@ -41,6 +41,7 @@ dependencies { testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-8.1.3') testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.2') testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.3') + testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.4') latestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.4.20.v20190813' latestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '9.4.20.v20190813' diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.3/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty9Test.groovy b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.3/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty9Test.groovy index 32a1b300c28..9bdc9e1e469 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.3/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty9Test.groovy +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.3/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty9Test.groovy @@ -84,6 +84,21 @@ abstract class Jetty9Test extends HttpServerTest { true } + @Override + boolean testBodyFilenames() { + true + } + + @Override + boolean testBodyFilenamesCalledOnce() { + true + } + + @Override + boolean testBodyFilenamesCalledOnceCombined() { + true + } + @Override boolean testSessionId() { true diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.4.21/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.4.21/build.gradle index d9ef585146e..144358e05f5 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.4.21/build.gradle +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.4.21/build.gradle @@ -42,7 +42,7 @@ dependencies { testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-7.0') testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-8.1.3') testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.2') - testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.3') + testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.4') latestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.+' latestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '9.+' diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.4.21/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty9Test.groovy b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.4.21/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty9Test.groovy index 38eb20340c6..8a18ccbc652 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.4.21/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty9Test.groovy +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.4.21/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty9Test.groovy @@ -85,6 +85,21 @@ abstract class Jetty9Test extends HttpServerTest { true } + @Override + boolean testBodyFilenames() { + true + } + + @Override + boolean testBodyFilenamesCalledOnce() { + true + } + + @Override + boolean testBodyFilenamesCalledOnceCombined() { + true + } + @Override boolean testSessionId() { true diff --git a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/testFixtures/groovy/datadog/trace/instrumentation/servlet5/TestServlet5.groovy b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/testFixtures/groovy/datadog/trace/instrumentation/servlet5/TestServlet5.groovy index 51e7c974f6d..93060644456 100644 --- a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/testFixtures/groovy/datadog/trace/instrumentation/servlet5/TestServlet5.groovy +++ b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/testFixtures/groovy/datadog/trace/instrumentation/servlet5/TestServlet5.groovy @@ -11,6 +11,8 @@ import java.lang.reflect.Field import java.lang.reflect.Modifier import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_MULTIPART +import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_MULTIPART_COMBINED +import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_MULTIPART_REPEATED import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_URLENCODED import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.CREATED import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.CREATED_IS @@ -68,6 +70,22 @@ class TestServlet5 extends HttpServlet { resp.status = endpoint.status resp.writer.print(req.getHeader("x-forwarded-for")) break + case BODY_MULTIPART_REPEATED: + resp.status = endpoint.status + // Call getParts() 3 times to verify the filenames callback fires only once + req.getParts() + req.getParts() + req.getParts() + resp.writer.print(endpoint.body) + break + case BODY_MULTIPART_COMBINED: + resp.status = endpoint.status + // Call getParameterMap() first (exercises GetFilenamesFromMultiPartAdvice via extractContentParameters), + // then getParts() explicitly (GetFilenamesAdvice must not double-fire since map is already set) + req.parameterMap + req.getParts() + resp.writer.print(endpoint.body) + break case BODY_MULTIPART: case BODY_URLENCODED: resp.status = endpoint.status diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/testFixtures/groovy/datadog/trace/instrumentation/servlet3/TestServlet3.groovy b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/testFixtures/groovy/datadog/trace/instrumentation/servlet3/TestServlet3.groovy index 4b0b9df85d4..98a5983a36d 100644 --- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/testFixtures/groovy/datadog/trace/instrumentation/servlet3/TestServlet3.groovy +++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/testFixtures/groovy/datadog/trace/instrumentation/servlet3/TestServlet3.groovy @@ -15,6 +15,8 @@ import java.lang.reflect.Modifier import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_URLENCODED import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_MULTIPART +import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_MULTIPART_COMBINED +import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_MULTIPART_REPEATED import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.CREATED import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.CREATED_IS import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.CUSTOM_EXCEPTION @@ -95,6 +97,22 @@ class TestServlet3 { resp.status = endpoint.status resp.writer.print(endpoint.bodyForQuery(req.queryString)) break + case BODY_MULTIPART_REPEATED: + resp.status = endpoint.status + // Call getParts() 3 times to verify the filenames callback fires only once + req.getParts() + req.getParts() + req.getParts() + resp.writer.print(endpoint.body) + break + case BODY_MULTIPART_COMBINED: + resp.status = endpoint.status + // Call getParameterMap() first (exercises GetFilenamesFromMultiPartAdvice via extractContentParameters), + // then getParts() explicitly (GetFilenamesAdvice must not double-fire since map is already set) + req.parameterMap + req.getParts() + resp.writer.print(endpoint.body) + break case BODY_URLENCODED: case BODY_MULTIPART: resp.status = endpoint.status diff --git a/settings.gradle.kts b/settings.gradle.kts index 3f203fcf86c..0647382920a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -429,6 +429,8 @@ include( ":dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-8.1.3", ":dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.2", ":dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.3", + ":dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.4", + ":dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-11.0", ":dd-java-agent:instrumentation:jetty:jetty-client:jetty-client-10.0", ":dd-java-agent:instrumentation:jetty:jetty-client:jetty-client-12.0", ":dd-java-agent:instrumentation:jetty:jetty-client:jetty-client-9.1", From 11c9d4855fc5a45630354785a7713d09cc6b92be Mon Sep 17 00:00:00 2001 From: Brice Dutheil Date: Mon, 22 Jun 2026 15:46:58 +0200 Subject: [PATCH 017/139] feat: Expand the jar checks to stricter agent jar validation (#11684) feat: Expand the jar checks to stricter agent jar validation * Maintains the size check. * Verify some required entries * Ensure there's a minimum number of classes in the whole jar * Ensure products are correctly included and have at least one class * Light size check on the indexes * Fixed list of packages that should not appear in the jar * Run checks as part of the build job, to catch issues earlier Co-authored-by: brice.dutheil --- .gitlab-ci.yml | 2 +- dd-java-agent/build.gradle | 113 ++++++++++++++++++++++++++++++++++--- 2 files changed, 107 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1e1f5102db5..cf1cb6d91b5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -336,7 +336,7 @@ build: script: - if [ $CI_PIPELINE_SOURCE == "schedule" ] ; then ./gradlew resolveAndLockAll --write-locks $GRADLE_ARGS; fi - ./gradlew --version - - ./gradlew clean :dd-java-agent:shadowJar :dd-trace-api:jar :dd-trace-ot:shadowJar -PskipTests $GRADLE_ARGS + - ./gradlew clean :dd-java-agent:shadowJar :dd-java-agent:check :dd-trace-api:jar :dd-trace-ot:shadowJar -PskipTests -x spotlessCheck $GRADLE_ARGS - echo UPSTREAM_TRACER_VERSION=$(java -jar workspace/dd-java-agent/build/libs/*.jar) >> upstream.env - echo "BUILD_JOB_NAME=$CI_JOB_NAME" >> build.env - echo "BUILD_JOB_ID=$CI_JOB_ID" >> build.env diff --git a/dd-java-agent/build.gradle b/dd-java-agent/build.gradle index a2001cb4ee8..ae78df4410c 100644 --- a/dd-java-agent/build.gradle +++ b/dd-java-agent/build.gradle @@ -1,5 +1,6 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import java.util.concurrent.atomic.AtomicBoolean +import java.util.jar.JarFile plugins { id 'com.gradleup.shadow' @@ -19,6 +20,10 @@ configurations { def includedAgentDir = project.layout.buildDirectory.dir("generated/included") def includedJarFileTree = fileTree(includedAgentDir) +// Populated automatically by includeShadowJar for every product dir registered in this build. +// Used by verifyAgentJarContents to check that all included products land in the assembled jar. +ext.includedProductPrefixes = objects.setProperty(String) + def pomPropertiesDir = project.layout.buildDirectory.dir("generated/maven-metadata") def pomPropertiesFileTree = fileTree(pomPropertiesDir) @@ -183,6 +188,8 @@ def generalShadowJarConfig(ShadowJar shadowJarTask) { } def includeShadowJar(TaskProvider includedShadowJarTask, String agentDir, FileTree includedJarFileTree) { + includedProductPrefixes.add(agentDir) + def expandTask = project.tasks.register("expandAgentShadowJar${agentDir.capitalize()}", Sync) { it.group = LifecycleBasePlugin.BUILD_GROUP it.description = "Expand the included shadow jar into the agent jar under ${agentDir}" @@ -468,16 +475,108 @@ tasks.withType(Test).configureEach { dependsOn "shadowJar" } -tasks.register('checkAgentJarSize') { +tasks.register('verifyAgentJarContents') { + group = LifecycleBasePlugin.VERIFICATION_GROUP + description = 'Verify the agent jar contains required entries and meets structural invariants' + + def jarProvider = tasks.named('shadowJar', ShadowJar).flatMap { it.archiveFile } + inputs.file(jarProvider) + inputs.property('productPrefixes', includedProductPrefixes) + outputs.file(project.layout.buildDirectory.file("tmp/${it.name}/.verified")) + doLast { - // Arbitrary limit to prevent unintentional increases to the agent jar size - // Raise or lower as required - assert tasks.named("shadowJar", ShadowJar).get().archiveFile.get().getAsFile().length() <= 33 * 1024 * 1024 - } + File jarFile = jarProvider.get().asFile + List failures = [] + Map entries = [:] + + // Jar size ceiling — raise only when the growth is intentional + def sizeCeiling = 33L * 1024 * 1024 + if (jarFile.length() > sizeCeiling) { + failures << "Jar size ${jarFile.length()} B exceeds ceiling ${sizeCeiling} B (33 MiB)" + } - dependsOn "shadowJar" + // Inspect jar content + new JarFile(jarFile).withCloseable { jf -> + jf.entries().each { ze -> entries[ze.name] = ze.size } + } + + // Required entries + [ + // Runtime index, loaded at startup to resolve classdata paths + // Generated by :dd-java-agent:generateAgentJarIndex + 'dd-java-agent.index', + // Premain-Class: Java 6 pre check + 'datadog/trace/bootstrap/AgentPreCheck.class', + // Agent-Class: main bootstrap entry point + 'datadog/trace/bootstrap/AgentBootstrap.class', + // Additional checks for Java 11 + 'datadog/trace/bootstrap/AdvancedAgentChecks.class', + // Instrumentation indexes + // * :dd-java-agent:instrumentation:generateInstrumenterIndex + // * :dd-java-agent:instrumentation:generateKnownTypesIndex + // Without instrumenter.index, zero instrumentations load at runtime. + 'inst/instrumenter.index', + 'inst/known-types.index', + // OTel drop-in support, embedded via otel-bootstrap + otel-shim shadowInclude + 'datadog/trace/bootstrap/otel/api/', + 'datadog/trace/bootstrap/otel/context/', + 'datadog/trace/bootstrap/otel/shim/', + 'META-INF/maven/com.datadoghq/dd-java-agent/pom.properties', + ].each { required -> + if (!entries.containsKey(required)) { + failures << "Missing required entry: ${required}" + } + } + + // Sanity check on the minimum number of classes; update as needed. Set to about 98% of that number. + def classCount = entries.keySet().count { it.endsWith('.class') || it.endsWith('.classdata') } + def classFloor = 17_000 // a bit moe than 98% of 17,279 at time of writing + if (classCount < classFloor) { + failures << "Class count ${classCount} is below floor ${classFloor}" + } + + // Each registered product must contribute at least one .classdata entry. + // Catches a product wired into the build but producing no classes. + def classdataPrefixes = entries.keySet() + .findAll { it.endsWith('.classdata') } + .collect { it.split('/')[0] } + .toSet() + includedProductPrefixes.get().each { dir -> + if (!classdataPrefixes.contains(dir)) { + failures << "Product '${dir}' has no .classdata entries in the assembled jar" + } + } + + // All *.index files in the jar must be non-empty + entries.findAll { name, size -> name.endsWith('.index') && size == 0 }.each { name, _ -> + failures << "Empty index file: ${name}" + } + + // Packages that must not appear anywhere in the jar after relocation. + // NOTE: Hardcoded to catch accidental removal of relocate() calls in generalShadowJarConfig or in a nested shadow jar. + def productPrefixes = includedProductPrefixes.get() + ['org/slf4j/', 'org/jctools/', 'net/jpountz/', 'org/objectweb/asm/', 'io/airlift/'].each { pkg -> + def leaked = entries.keySet().findAll { entry -> + entry.startsWith(pkg) || productPrefixes.any { prefix -> entry.startsWith("${prefix}/${pkg}") } + } + if (!leaked.empty) { + def sample = leaked.take(3).toString() + failures << "Unrelocated package '${pkg}': ${sample}${leaked.size() > 3 ? ' ...' : ''}" + } + } + + if (!failures.empty) { + throw new GradleException( + "Agent jar verification failed (${failures.size()} issue(s)):\n" + + failures.collect { " - ${it}" }.join('\n')) + } + + def marker = outputs.files.singleFile + marker.parentFile.mkdirs() + marker.text = 'verified' + } } tasks.named('check') { - dependsOn 'checkAgentJarSize' + dependsOn 'verifyAgentJarContents' } From 04754caf5a59acaecc4b66349b6de34ba9a9e54b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Gonz=C3=A1lez=20Garc=C3=ADa?= Date: Mon, 22 Jun 2026 16:35:37 +0200 Subject: [PATCH 018/139] Fix waf.updates metric success:N/A tag from sequential counter metric values (#11604) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix: waf.init and waf.updates metrics emit per-event count 1 instead of sequential counters Removes wafInitCounter and wafUpdatesCounter AtomicInteger fields from WafMetricCollector. Both wafInit() and wafUpdates() now use literal 1L, matching RFC semantics (COUNT-1-per-event). The old sequential counters (1, 2, 3, ...) caused success:N/A when the rawMetricsQueue was full and a metric was dropped — the counter advanced but the offer() silently failed, creating gaps the backend interpreted as success:N/A. Also updates currentRuleVersion from e.wafDiagnostics.rulesetVersion in the InvalidRuleSetException catch block of handleWafUpdateResultReport(), so wafUpdates() emits with the correct event_rules_version even on partial WAF config errors. Raises log level from debug to warn. fix: only update statsReporter rule version when rules were actually loaded on error On InvalidRuleSetException, always update currentRuleVersion and setRuleVersion() on modules so wafUpdates() emits with the correct event_rules_version. But only update statsReporter (trace tagging) if rules.getLoaded() is non-empty, mirroring the success path guard. This avoids tagging traces with a version whose rules failed to load. Co-authored-by: devflow.devflow-routing-intake --- .../config/AppSecConfigServiceImpl.java | 16 +++++-- ...ppSecConfigServiceImplSpecification.groovy | 44 +++++++++++++++++++ .../api/telemetry/WafMetricCollector.java | 10 +---- .../telemetry/WafMetricCollectorTest.groovy | 2 +- ...afMetricPeriodicActionSpecification.groovy | 2 +- 5 files changed, 61 insertions(+), 13 deletions(-) diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/config/AppSecConfigServiceImpl.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/config/AppSecConfigServiceImpl.java index aaa177335a7..dc450baeff1 100644 --- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/config/AppSecConfigServiceImpl.java +++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/config/AppSecConfigServiceImpl.java @@ -320,15 +320,25 @@ private void handleWafUpdateResultReport(String configKey, Map r } } } catch (InvalidRuleSetException e) { - log.debug( + log.warn( "Invalid rule during waf config update for config key {}: {}", configKey, e.wafDiagnostics); if (e.wafDiagnostics.getNumConfigError() > 0) { WafMetricCollector.get().addWafConfigError(e.wafDiagnostics.getNumConfigError()); } - // TODO: Propagate diagostics back to remote config apply_error - + // TODO: Propagate diagnostics back to remote config apply_error + if (e.wafDiagnostics.rulesetVersion != null + && !e.wafDiagnostics.rulesetVersion.isEmpty() + && (!defaultConfigActivated || currentRuleVersion == null)) { + currentRuleVersion = e.wafDiagnostics.rulesetVersion; + if (!e.wafDiagnostics.rules.getLoaded().isEmpty()) { + statsReporter.setRulesVersion(currentRuleVersion); + } + if (modulesToUpdateVersionIn != null) { + modulesToUpdateVersionIn.forEach(module -> module.setRuleVersion(currentRuleVersion)); + } + } initReporter.setReportForPublication(e.wafDiagnostics); throw new RuntimeException(e); } catch (UnclassifiedWafException e) { diff --git a/dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/config/AppSecConfigServiceImplSpecification.groovy b/dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/config/AppSecConfigServiceImplSpecification.groovy index e42b82a4b7d..cc650c3c7e6 100644 --- a/dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/config/AppSecConfigServiceImplSpecification.groovy +++ b/dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/config/AppSecConfigServiceImplSpecification.groovy @@ -1,5 +1,6 @@ package com.datadog.appsec.config +import com.datadog.appsec.AppSecModule import com.datadog.appsec.AppSecSystem import com.datadog.appsec.util.AbortStartupException import static datadog.remoteconfig.Capabilities.CAPABILITY_ASM_EXTENDED_DATA_COLLECTION @@ -703,6 +704,49 @@ class AppSecConfigServiceImplSpecification extends DDSpecification { noExceptionThrown() } + void 'currentRuleVersion is updated from diagnostics when InvalidRuleSetException is thrown on RC update'() { + setup: + final key = new ParsedConfigKey('Test', '1234', 1, 'ASM_DD', 'ID') + final service = new AppSecConfigServiceImpl(config, poller, reconf) + AppSecSystem.active = true + config.getAppSecActivation() >> ProductActivation.FULLY_ENABLED + AppSecModule wafModule = Mock() + wafModule.isWafBuilderSet() >> false + service.modulesToUpdateVersionIn([wafModule]) + + when: + service.maybeSubscribeConfigPolling() + + then: + 1 * poller.addListener(Product.ASM_DD, _) >> { + listeners.savedWafDataChangesListener = it[1] + } + + when: + listeners.savedWafDataChangesListener.accept( + key, + '''{ + "version": "2.2", + "metadata": {"rules_version": "1.99.0"}, + "rules": [{ + "id": "invalid-rule", + "name": "Invalid Rule", + "tags": {"type": "attack_attempt", "category": "attack_attempt"}, + "conditions": [{ + "operator": "invalid_operator", + "parameters": {"inputs": [{"address": "server.request.query"}]} + }] + }] + }'''.getBytes(), + NOOP) + + then: + thrown RuntimeException + service.getCurrentRuleVersion() == '1.99.0' + 1 * wafModule.setWafBuilder(_) + 1 * wafModule.setRuleVersion('1.99.0') + } + void 'config keys are added and removed to the set when receiving ASM_DD payloads'() { setup: final key = new ParsedConfigKey('Test', '1234', 1, 'ASM_DD', 'ID') diff --git a/internal-api/src/main/java/datadog/trace/api/telemetry/WafMetricCollector.java b/internal-api/src/main/java/datadog/trace/api/telemetry/WafMetricCollector.java index 032212a7f1a..5d6914a4b1e 100644 --- a/internal-api/src/main/java/datadog/trace/api/telemetry/WafMetricCollector.java +++ b/internal-api/src/main/java/datadog/trace/api/telemetry/WafMetricCollector.java @@ -33,9 +33,6 @@ private WafMetricCollector() { private static final BlockingQueue rawMetricsQueue = new ArrayBlockingQueue<>(RAW_QUEUE_SIZE); - private static final AtomicInteger wafInitCounter = new AtomicInteger(); - private static final AtomicInteger wafUpdatesCounter = new AtomicInteger(); - private static final int WAF_REQUEST_COMBINATIONS = 128; // 2^7 private final AtomicLongArray wafRequestCounter = new AtomicLongArray(WAF_REQUEST_COMBINATIONS); @@ -80,14 +77,11 @@ private WafMetricCollector() { public void wafInit(final String wafVersion, final String rulesVersion, final boolean success) { WafMetricCollector.wafVersion = wafVersion; WafMetricCollector.rulesVersion = rulesVersion; - rawMetricsQueue.offer( - new WafInitRawMetric(wafInitCounter.incrementAndGet(), wafVersion, rulesVersion, success)); + rawMetricsQueue.offer(new WafInitRawMetric(1L, wafVersion, rulesVersion, success)); } public void wafUpdates(final String rulesVersion, final boolean success) { - rawMetricsQueue.offer( - new WafUpdatesRawMetric( - wafUpdatesCounter.incrementAndGet(), wafVersion, rulesVersion, success)); + rawMetricsQueue.offer(new WafUpdatesRawMetric(1L, wafVersion, rulesVersion, success)); // Flush request metrics to get the new version. if (rulesVersion != null diff --git a/internal-api/src/test/groovy/datadog/trace/api/telemetry/WafMetricCollectorTest.groovy b/internal-api/src/test/groovy/datadog/trace/api/telemetry/WafMetricCollectorTest.groovy index 251bdb4baef..0ee8ed04e6e 100644 --- a/internal-api/src/test/groovy/datadog/trace/api/telemetry/WafMetricCollectorTest.groovy +++ b/internal-api/src/test/groovy/datadog/trace/api/telemetry/WafMetricCollectorTest.groovy @@ -67,7 +67,7 @@ class WafMetricCollectorTest extends DDSpecification { def updateMetric2 = (WafMetricCollector.WafUpdatesRawMetric) metrics[2] updateMetric2.type == 'count' - updateMetric2.value == 2 + updateMetric2.value == 1 updateMetric2.namespace == 'appsec' updateMetric2.metricName == 'waf.updates' updateMetric2.tags.toSet() == ['waf_version:waf_ver1', 'event_rules_version:rules.3', 'success:false'].toSet() diff --git a/telemetry/src/test/groovy/datadog/telemetry/metric/WafMetricPeriodicActionSpecification.groovy b/telemetry/src/test/groovy/datadog/telemetry/metric/WafMetricPeriodicActionSpecification.groovy index 4d5459edcae..b14a10e431f 100644 --- a/telemetry/src/test/groovy/datadog/telemetry/metric/WafMetricPeriodicActionSpecification.groovy +++ b/telemetry/src/test/groovy/datadog/telemetry/metric/WafMetricPeriodicActionSpecification.groovy @@ -34,7 +34,7 @@ class WafMetricPeriodicActionSpecification extends DDSpecification { 1 * telemetryService.addMetric( { Metric metric -> metric.namespace == 'appsec' && metric.metric == 'waf.updates' && - metric.points[0][1] == 2 && + metric.points[0][1] == 1 && metric.tags == ['waf_version:0.0.0', 'event_rules_version:rules_ver_3', 'success:true'] } ) 0 * _._ From 269ff67096adebc529ff125570d471c8a6cc62c8 Mon Sep 17 00:00:00 2001 From: Brice Dutheil Date: Mon, 22 Jun 2026 20:26:50 +0200 Subject: [PATCH 019/139] fix: Forbid OkHostnameVerifier to prevent accidental use, CVE-2021-0341 (#11694) fix: Forbid OkHostnameVerifier to prevent accidental use, CVE-2021-0341 See #11631 Co-authored-by: brice.dutheil --- gradle/forbiddenApiFilters/main.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gradle/forbiddenApiFilters/main.txt b/gradle/forbiddenApiFilters/main.txt index 4890a46b094..d8ddd91df36 100644 --- a/gradle/forbiddenApiFilters/main.txt +++ b/gradle/forbiddenApiFilters/main.txt @@ -56,3 +56,10 @@ java.lang.invoke.MethodHandles.Lookup#unreflectSetter(java.lang.reflect.Field) # avoid Java deserialization entrypoint - see warning in https://docs.oracle.com/en/java/javase/25/docs/api/java.base/java/io/ObjectInputStream.html java.io.ObjectInputStream#readObject() + +# CVE-2021-0341: The internal OkHostnameVerifier.verify(String, SSLSession) does not restrict hostnames to ASCII, +# allowing crafted unicode hostnames to bypass validation. Use the normal (public API) OkHttp connection flow via +# HttpUrl instead, which ensures only ASCII characters reach the verifier. +@defaultMessage Do not use OkHostnameVerifier directly — it is an internal OkHttp class. Use the normal OkHttp connection flow via HttpUrl (CVE-2021-0341) +okhttp3.internal.tls.OkHostnameVerifier +datadog.okhttp3.internal.tls.OkHostnameVerifier From 319ed20bc79d6e5fbb2a479feea77fbf81ded73a Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Mon, 22 Jun 2026 14:27:54 -0400 Subject: [PATCH 020/139] Cleanup of Spotbugs annotations. Removed Spotbugs from test scope. (#11693) Cleanup of Spotbugs annotations. Removed Spotbugs from test scope. Fixed review. Co-authored-by: alexey.kuznetsov --- .../build.gradle.kts | 4 ++-- .../csi/impl/AsmSpecificationBuilderTest.java | 2 -- .../java/datadog/communication/util/IOUtils.java | 12 ++++++------ .../instrumentation/decorator/SampleJavaClass.java | 3 --- .../trace/civisibility/git/tree/GitDiffParser.java | 4 ++-- .../java/datadog/crashtracking/CrashUploader.java | 6 +++--- .../com/datadog/debugger/el/ProbeCondition.java | 4 ++-- .../opentelemetry/shim/trace/OtelSpanEvent.java | 4 ++-- .../agent/tooling/iast/TaintableEnumeration.java | 14 +++++++------- .../datastax/cassandra4/TracingSession.java | 2 +- .../opentelemetry/opentelemetry-0.3/build.gradle | 2 -- .../datadog/smoketest/MoshiConfigTestHelper.java | 4 ++-- .../common/writer/ddintake/DDEvpProxyApi.java | 6 +++--- .../src/main/java/datadog/trace/core/DDSpan.java | 3 +-- gradle/libs.versions.toml | 2 ++ gradle/spotbugs.gradle | 12 +----------- .../metric/CiVisibilityMetricPeriodicAction.java | 4 ++-- .../ConfigInversionMetricPeriodicAction.java | 4 ++-- .../metric/CoreMetricsPeriodicAction.java | 4 ++-- .../telemetry/metric/IastMetricPeriodicAction.java | 4 ++-- .../metric/LLMObsMetricPeriodicAction.java | 4 ++-- .../telemetry/metric/MetricPeriodicAction.java | 4 ++-- .../metric/OtelEnvMetricPeriodicAction.java | 4 ++-- .../metric/OtelSpiMetricPeriodicAction.java | 4 ++-- .../telemetry/metric/WafMetricPeriodicAction.java | 4 ++-- .../metric/MetricPeriodicActionTest.groovy | 6 +++--- .../junit/utils/config/WithConfigExtension.java | 4 ++-- 27 files changed, 57 insertions(+), 73 deletions(-) diff --git a/buildSrc/call-site-instrumentation-plugin/build.gradle.kts b/buildSrc/call-site-instrumentation-plugin/build.gradle.kts index 562ab980e91..0667e21e1c9 100644 --- a/buildSrc/call-site-instrumentation-plugin/build.gradle.kts +++ b/buildSrc/call-site-instrumentation-plugin/build.gradle.kts @@ -25,19 +25,19 @@ apply { } dependencies { - compileOnly("com.google.code.findbugs", "jsr305", "3.0.2") + compileOnly(libs.jsr305) implementation("org.freemarker", "freemarker", "2.3.30") implementation(libs.asm) implementation(libs.asm.tree) implementation(libs.javaparser.symbol.solver) + testCompileOnly(libs.jsr305) testImplementation(libs.bytebuddy) testImplementation(libs.bundles.junit5) testRuntimeOnly(libs.junit.platform.launcher) testImplementation(libs.bundles.mockito) testImplementation("javax.servlet", "javax.servlet-api", "3.0.1") - testImplementation(libs.spotbugs.annotations) } sourceSets { diff --git a/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/AsmSpecificationBuilderTest.java b/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/AsmSpecificationBuilderTest.java index ec37662ff58..14ad65bfb0b 100644 --- a/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/AsmSpecificationBuilderTest.java +++ b/buildSrc/call-site-instrumentation-plugin/src/test/java/datadog/trace/plugin/csi/impl/AsmSpecificationBuilderTest.java @@ -15,7 +15,6 @@ import datadog.trace.plugin.csi.impl.CallSiteSpecification.AroundSpecification; import datadog.trace.plugin.csi.impl.CallSiteSpecification.BeforeSpecification; import datadog.trace.plugin.csi.util.Types; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.File; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; @@ -558,7 +557,6 @@ static class TestWithOtherAnnotations { @CallSite.Around("java.lang.StringBuilder java.lang.StringBuilder.append(java.lang.Object)") @CallSite.Around("java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.Object)") @Nonnull - @SuppressFBWarnings("NP_PARAMETER_MUST_BE_NONNULL_BUT_MARKED_AS_NULLABLE") static Appendable aroundAppend( @CallSite.This @Nullable Appendable self, @CallSite.Argument(0) @Nullable Object param) throws Throwable { diff --git a/communication/src/main/java/datadog/communication/util/IOUtils.java b/communication/src/main/java/datadog/communication/util/IOUtils.java index 23b41fd6c4d..819e4bb3e18 100644 --- a/communication/src/main/java/datadog/communication/util/IOUtils.java +++ b/communication/src/main/java/datadog/communication/util/IOUtils.java @@ -1,6 +1,5 @@ package datadog.communication.util; -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.BufferedReader; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -16,6 +15,7 @@ import java.nio.file.attribute.BasicFileAttributes; import java.util.ArrayList; import java.util.List; +import javax.annotation.Nonnull; public abstract class IOUtils { @@ -23,11 +23,11 @@ public abstract class IOUtils { private IOUtils() {} - public static @NonNull String readFully(InputStream input) throws IOException { + public static @Nonnull String readFully(InputStream input) throws IOException { return readFully(input, Charset.defaultCharset()); } - public static @NonNull String readFully(InputStream input, Charset charset) throws IOException { + public static @Nonnull String readFully(InputStream input, Charset charset) throws IOException { ByteArrayOutputStream output = new ByteArrayOutputStream(); readFully(input, output); return new String(output.toByteArray(), charset); @@ -41,17 +41,17 @@ public static void readFully(InputStream input, OutputStream output) throws IOEx } } - public static @NonNull List readLines(final InputStream input) throws IOException { + public static @Nonnull List readLines(final InputStream input) throws IOException { return readLines(input, Charset.defaultCharset()); } - public static @NonNull List readLines(final InputStream input, final Charset charset) + public static @Nonnull List readLines(final InputStream input, final Charset charset) throws IOException { final InputStreamReader reader = new InputStreamReader(input, charset); return readLines(reader); } - public static @NonNull List readLines(final Reader input) throws IOException { + public static @Nonnull List readLines(final Reader input) throws IOException { final BufferedReader reader = new BufferedReader(input, DEFAULT_BUFFER_SIZE); final List list = new ArrayList<>(); String line = reader.readLine(); diff --git a/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/SampleJavaClass.java b/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/SampleJavaClass.java index 7a2f61f2923..7897cd83037 100644 --- a/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/SampleJavaClass.java +++ b/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/SampleJavaClass.java @@ -1,13 +1,10 @@ package datadog.trace.bootstrap.instrumentation.decorator; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - /** * Used by {@link BaseDecoratorTest}. Groovy with Java 10+ doesn't seem to treat it properly as an * anonymous class, so use a Java class instead. */ public class SampleJavaClass { - @SuppressFBWarnings("DM_NEW_FOR_GETCLASS") public static Class anonymousClass = new Runnable() { diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitDiffParser.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitDiffParser.java index 374e3a75f6b..e1f8aefdb73 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitDiffParser.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitDiffParser.java @@ -1,7 +1,6 @@ package datadog.trace.civisibility.git.tree; import datadog.trace.civisibility.diff.LineDiff; -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; @@ -12,6 +11,7 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; +import javax.annotation.Nonnull; public class GitDiffParser { @@ -20,7 +20,7 @@ public class GitDiffParser { private static final Pattern CHANGED_LINES_PATTERN = Pattern.compile("^@@ -\\d+(,\\d+)? \\+(?\\d+)(,(?\\d+))? @@"); - public static @NonNull LineDiff parse(InputStream input) throws IOException { + public static @Nonnull LineDiff parse(InputStream input) throws IOException { Map linesByRelativePath = new HashMap<>(); BufferedReader bufferedReader = diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/CrashUploader.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/CrashUploader.java index 5c37b7c5908..6b0a9b388a5 100644 --- a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/CrashUploader.java +++ b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/CrashUploader.java @@ -29,8 +29,8 @@ import datadog.trace.util.AgentThreadFactory; import datadog.trace.util.PidHelper; import de.thetaphi.forbiddenapis.SuppressForbidden; -import edu.umd.cs.findbugs.annotations.NonNull; -import java.io.*; +import java.io.IOException; +import java.io.PrintStream; import java.nio.charset.Charset; import java.nio.file.Files; import java.nio.file.Path; @@ -130,7 +130,7 @@ public CrashUploader(@Nonnull final ConfigManager.StoredConfig storedConfig) { } CrashUploader( - @NonNull final Config config, @Nonnull final ConfigManager.StoredConfig storedConfig) { + @Nonnull final Config config, @Nonnull final ConfigManager.StoredConfig storedConfig) { this.config = config; this.storedConfig = storedConfig; this.uploaderSettings = storedConfig.toCrashUploaderSettings(); diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/ProbeCondition.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/ProbeCondition.java index 8ded283ec93..f81c92a8b19 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/ProbeCondition.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/ProbeCondition.java @@ -9,8 +9,8 @@ import com.squareup.moshi.JsonWriter; import datadog.trace.bootstrap.debugger.el.DebuggerScript; import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver; -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.IOException; +import javax.annotation.Nonnull; /** Implements expression language for probe condition */ public final class ProbeCondition implements DebuggerScript { @@ -48,7 +48,7 @@ public ProbeCondition fromJson(JsonReader reader) throws IOException { } @Override - public void toJson(@NonNull JsonWriter jsonWriter, ProbeCondition value) throws IOException { + public void toJson(@Nonnull JsonWriter jsonWriter, ProbeCondition value) throws IOException { if (value == null) { jsonWriter.nullValue(); return; diff --git a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelSpanEvent.java b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelSpanEvent.java index 6bd1802aebb..a49cab4b877 100644 --- a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelSpanEvent.java +++ b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelSpanEvent.java @@ -2,7 +2,6 @@ import datadog.trace.api.time.SystemTimeSource; import datadog.trace.api.time.TimeSource; -import edu.umd.cs.findbugs.annotations.NonNull; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.common.AttributesBuilder; @@ -12,6 +11,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; +import javax.annotation.Nonnull; public class OtelSpanEvent { public static final String EXCEPTION_SPAN_EVENT_NAME = "exception"; @@ -43,7 +43,7 @@ public OtelSpanEvent(String name, Attributes attributes, long timestamp, TimeUni this.timestamp = unit.toNanos(timestamp); } - @NonNull + @Nonnull public static String toTag(List events) { StringBuilder builder = new StringBuilder("["); for (OtelSpanEvent event : events) { diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/iast/TaintableEnumeration.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/iast/TaintableEnumeration.java index f1d67e3a8a0..bf53c00c341 100644 --- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/iast/TaintableEnumeration.java +++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/iast/TaintableEnumeration.java @@ -3,8 +3,8 @@ import datadog.trace.api.iast.IastContext; import datadog.trace.api.iast.propagation.PropagationModule; import datadog.trace.util.stacktrace.StackUtils; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Enumeration; +import javax.annotation.Nonnull; import javax.annotation.Nullable; public class TaintableEnumeration implements Enumeration { @@ -25,8 +25,8 @@ public class TaintableEnumeration implements Enumeration { private TaintableEnumeration( final IastContext ctx, - @NonNull final Enumeration delegate, - @NonNull final PropagationModule module, + @Nonnull final Enumeration delegate, + @Nonnull final PropagationModule module, final byte origin, @Nullable final CharSequence name, final boolean useValueAsName) { @@ -78,8 +78,8 @@ private static boolean nonTaintableEnumerationStack(final StackTraceElement elem public static Enumeration wrap( final IastContext ctx, - @NonNull final Enumeration delegate, - @NonNull final PropagationModule module, + @Nonnull final Enumeration delegate, + @Nonnull final PropagationModule module, final byte origin, @Nullable final CharSequence name) { return new TaintableEnumeration(ctx, delegate, module, origin, name, false); @@ -87,8 +87,8 @@ public static Enumeration wrap( public static Enumeration wrap( final IastContext ctx, - @NonNull final Enumeration delegate, - @NonNull final PropagationModule module, + @Nonnull final Enumeration delegate, + @Nonnull final PropagationModule module, final byte origin, boolean useValueAsName) { return new TaintableEnumeration(ctx, delegate, module, origin, null, useValueAsName); diff --git a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/TracingSession.java b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/TracingSession.java index 090f6983310..9b9dc069420 100644 --- a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/TracingSession.java +++ b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/TracingSession.java @@ -21,12 +21,12 @@ import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.InstrumentationTags; import datadog.trace.util.AgentThreadFactory; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.concurrent.CompletionException; import java.util.concurrent.CompletionStage; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import javax.annotation.Nonnull; +import javax.annotation.Nullable; public class TracingSession extends SessionWrapper implements CqlSession { private static final ExecutorService EXECUTOR_SERVICE = diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/build.gradle b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/build.gradle index 61a3cf66caf..40024727e01 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/build.gradle +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/build.gradle @@ -17,8 +17,6 @@ addTestSuiteForDir('latestDepTest', 'test') dependencies { compileOnly group: 'io.opentelemetry', name: 'opentelemetry-api', version: otelVersion - - compileOnly group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2' compileOnly group: 'com.google.auto.value', name: 'auto-value-annotations', version: '1.6.6' testImplementation group: 'io.opentelemetry', name: 'opentelemetry-api', version: otelVersion diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/MoshiConfigTestHelper.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/MoshiConfigTestHelper.java index ce702c585b3..a19c5833212 100644 --- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/MoshiConfigTestHelper.java +++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/MoshiConfigTestHelper.java @@ -40,8 +40,8 @@ import com.squareup.moshi.JsonWriter; import com.squareup.moshi.Moshi; import datadog.trace.bootstrap.debugger.el.DebuggerScript; -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.IOException; +import javax.annotation.Nonnull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -61,7 +61,7 @@ public static Moshi createMoshiConfig() { private static class ProbeConditionJsonAdapter extends ProbeCondition.ProbeConditionJsonAdapter { @Override - public void toJson(@NonNull JsonWriter jsonWriter, ProbeCondition value) throws IOException { + public void toJson(@Nonnull JsonWriter jsonWriter, ProbeCondition value) throws IOException { if (value == null) { jsonWriter.nullValue(); return; diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddintake/DDEvpProxyApi.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/ddintake/DDEvpProxyApi.java index 8926d17e200..e911a980c31 100644 --- a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddintake/DDEvpProxyApi.java +++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/ddintake/DDEvpProxyApi.java @@ -10,11 +10,11 @@ import datadog.trace.api.intake.TrackType; import datadog.trace.common.writer.Payload; import datadog.trace.common.writer.RemoteApi; -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.IOException; import java.net.ConnectException; import java.util.Locale; import java.util.concurrent.TimeUnit; +import javax.annotation.Nonnull; import okhttp3.HttpUrl; import okhttp3.OkHttpClient; import okhttp3.Request; @@ -36,7 +36,7 @@ public static DDEvpProxyApiBuilder builder() { public static class DDEvpProxyApiBuilder { private String apiVersion = DEFAULT_INTAKE_VERSION; - @NonNull private TrackType trackType = TrackType.NOOP; + @Nonnull private TrackType trackType = TrackType.NOOP; private long timeoutMillis = TimeUnit.SECONDS.toMillis(DEFAULT_INTAKE_TIMEOUT); HttpUrl agentUrl = null; @@ -44,7 +44,7 @@ public static class DDEvpProxyApiBuilder { String evpProxyEndpoint; boolean compressionEnabled; - public DDEvpProxyApiBuilder trackType(@NonNull final TrackType trackType) { + public DDEvpProxyApiBuilder trackType(@Nonnull final TrackType trackType) { this.trackType = trackType; return this; } diff --git a/dd-trace-core/src/main/java/datadog/trace/core/DDSpan.java b/dd-trace-core/src/main/java/datadog/trace/core/DDSpan.java index 8ffcc77b49c..213f27825bf 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/DDSpan.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/DDSpan.java @@ -32,7 +32,6 @@ import datadog.trace.bootstrap.instrumentation.api.ResourceNamePriorities; import datadog.trace.bootstrap.instrumentation.api.SpanWrapper; import datadog.trace.core.util.StackTraces; -import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.Collections; import java.util.List; @@ -876,7 +875,7 @@ public String toString() { } @Override - public void attachWrapper(@NonNull SpanWrapper wrapper) { + public void attachWrapper(@Nonnull SpanWrapper wrapper) { WRAPPER_FIELD_UPDATER.compareAndSet(this, null, wrapper); } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 79ec4ba3b45..601f72be16e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,6 +5,7 @@ develocity = "4.4.1" forbiddenapis = "3.10" gradle-tooling-api = "8.14.5" +jsr305 = "3.0.2" spotbugs_annotations = "4.9.8" # DataDog libs and forks @@ -80,6 +81,7 @@ testcontainers = "1.21.4" develocity = { module = "com.gradle:develocity-gradle-plugin", version.ref = "develocity" } forbiddenapis = { module = "de.thetaphi:forbiddenapis", version.ref = "forbiddenapis" } gradle-tooling-api = { module = "org.gradle:gradle-tooling-api", version.ref = "gradle-tooling-api" } +jsr305 = { module = "com.google.code.findbugs:jsr305", version.ref = "jsr305" } spotbugs-annotations = { module = "com.github.spotbugs:spotbugs-annotations", version.ref = "spotbugs_annotations" } # DataDog libs and forks diff --git a/gradle/spotbugs.gradle b/gradle/spotbugs.gradle index 2fea20bcdcf..a69304a7728 100644 --- a/gradle/spotbugs.gradle +++ b/gradle/spotbugs.gradle @@ -60,15 +60,5 @@ tasks.matching { it.name.startsWith('spotbugs') }.configureEach { dependencies { compileOnly(libs.spotbugs.annotations) - - testImplementation(libs.spotbugs.annotations) { - // Exclude conflicting JUnit5. - exclude group: 'org.junit' - exclude group: 'org.junit.jupiter' - exclude group: 'org.junit.platform' - // Exclude conflicting logback. - exclude group: 'ch.qos.logback' - // Exclude conflicting log4j. - exclude group: 'org.apache.logging.log4j' - } + testImplementation(libs.jsr305) } diff --git a/telemetry/src/main/java/datadog/telemetry/metric/CiVisibilityMetricPeriodicAction.java b/telemetry/src/main/java/datadog/telemetry/metric/CiVisibilityMetricPeriodicAction.java index 2638f609d83..15d40436a89 100644 --- a/telemetry/src/main/java/datadog/telemetry/metric/CiVisibilityMetricPeriodicAction.java +++ b/telemetry/src/main/java/datadog/telemetry/metric/CiVisibilityMetricPeriodicAction.java @@ -2,10 +2,10 @@ import datadog.trace.api.civisibility.InstrumentationBridge; import datadog.trace.api.telemetry.MetricCollector; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public class CiVisibilityMetricPeriodicAction extends MetricPeriodicAction { - @NonNull + @Nonnull @Override public MetricCollector collector() { return InstrumentationBridge.getMetricCollector(); diff --git a/telemetry/src/main/java/datadog/telemetry/metric/ConfigInversionMetricPeriodicAction.java b/telemetry/src/main/java/datadog/telemetry/metric/ConfigInversionMetricPeriodicAction.java index d1d526fb2e9..d115aa9abeb 100644 --- a/telemetry/src/main/java/datadog/telemetry/metric/ConfigInversionMetricPeriodicAction.java +++ b/telemetry/src/main/java/datadog/telemetry/metric/ConfigInversionMetricPeriodicAction.java @@ -2,11 +2,11 @@ import datadog.trace.api.telemetry.ConfigInversionMetricCollectorImpl; import datadog.trace.api.telemetry.MetricCollector; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public class ConfigInversionMetricPeriodicAction extends MetricPeriodicAction { @Override - @NonNull + @Nonnull public MetricCollector collector() { return ConfigInversionMetricCollectorImpl.getInstance(); } diff --git a/telemetry/src/main/java/datadog/telemetry/metric/CoreMetricsPeriodicAction.java b/telemetry/src/main/java/datadog/telemetry/metric/CoreMetricsPeriodicAction.java index 83ee04c661c..f7475929ba7 100644 --- a/telemetry/src/main/java/datadog/telemetry/metric/CoreMetricsPeriodicAction.java +++ b/telemetry/src/main/java/datadog/telemetry/metric/CoreMetricsPeriodicAction.java @@ -2,10 +2,10 @@ import datadog.trace.api.telemetry.CoreMetricCollector; import datadog.trace.api.telemetry.MetricCollector; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public class CoreMetricsPeriodicAction extends MetricPeriodicAction { - @NonNull + @Nonnull @Override public MetricCollector collector() { return CoreMetricCollector.getInstance(); diff --git a/telemetry/src/main/java/datadog/telemetry/metric/IastMetricPeriodicAction.java b/telemetry/src/main/java/datadog/telemetry/metric/IastMetricPeriodicAction.java index f45889a753c..a4f434f5b82 100644 --- a/telemetry/src/main/java/datadog/telemetry/metric/IastMetricPeriodicAction.java +++ b/telemetry/src/main/java/datadog/telemetry/metric/IastMetricPeriodicAction.java @@ -2,12 +2,12 @@ import datadog.trace.api.iast.telemetry.IastMetricCollector; import datadog.trace.api.telemetry.MetricCollector; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public class IastMetricPeriodicAction extends MetricPeriodicAction { @Override - @NonNull + @Nonnull public MetricCollector collector() { return IastMetricCollector.get(); } diff --git a/telemetry/src/main/java/datadog/telemetry/metric/LLMObsMetricPeriodicAction.java b/telemetry/src/main/java/datadog/telemetry/metric/LLMObsMetricPeriodicAction.java index 7b4e65ff713..91e3cb69eec 100644 --- a/telemetry/src/main/java/datadog/telemetry/metric/LLMObsMetricPeriodicAction.java +++ b/telemetry/src/main/java/datadog/telemetry/metric/LLMObsMetricPeriodicAction.java @@ -2,10 +2,10 @@ import datadog.trace.api.telemetry.LLMObsMetricCollector; import datadog.trace.api.telemetry.MetricCollector; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public class LLMObsMetricPeriodicAction extends MetricPeriodicAction { - @NonNull + @Nonnull @Override public MetricCollector collector() { return LLMObsMetricCollector.get(); diff --git a/telemetry/src/main/java/datadog/telemetry/metric/MetricPeriodicAction.java b/telemetry/src/main/java/datadog/telemetry/metric/MetricPeriodicAction.java index c3088907a00..579eb6c761d 100644 --- a/telemetry/src/main/java/datadog/telemetry/metric/MetricPeriodicAction.java +++ b/telemetry/src/main/java/datadog/telemetry/metric/MetricPeriodicAction.java @@ -5,11 +5,11 @@ import datadog.telemetry.api.DistributionSeries; import datadog.telemetry.api.Metric; import datadog.trace.api.telemetry.MetricCollector; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.Map; +import javax.annotation.Nonnull; public abstract class MetricPeriodicAction implements TelemetryRunnable.TelemetryPeriodicAction { @Override @@ -23,7 +23,7 @@ public final void doIteration(final TelemetryService service) { toDistributionSeries(rawDistributionSeriesPoints).forEach(service::addDistributionSeries); } - @NonNull + @Nonnull public abstract MetricCollector collector(); private Collection toTelemetryMetrics(final Collection metrics) { diff --git a/telemetry/src/main/java/datadog/telemetry/metric/OtelEnvMetricPeriodicAction.java b/telemetry/src/main/java/datadog/telemetry/metric/OtelEnvMetricPeriodicAction.java index 6a9999ff5a3..2729d48ff2d 100644 --- a/telemetry/src/main/java/datadog/telemetry/metric/OtelEnvMetricPeriodicAction.java +++ b/telemetry/src/main/java/datadog/telemetry/metric/OtelEnvMetricPeriodicAction.java @@ -2,11 +2,11 @@ import datadog.trace.api.telemetry.MetricCollector; import datadog.trace.api.telemetry.OtelEnvMetricCollectorImpl; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public class OtelEnvMetricPeriodicAction extends MetricPeriodicAction { @Override - @NonNull + @Nonnull public MetricCollector collector() { return OtelEnvMetricCollectorImpl.getInstance(); } diff --git a/telemetry/src/main/java/datadog/telemetry/metric/OtelSpiMetricPeriodicAction.java b/telemetry/src/main/java/datadog/telemetry/metric/OtelSpiMetricPeriodicAction.java index bbdd9bfc89c..6016f71d195 100644 --- a/telemetry/src/main/java/datadog/telemetry/metric/OtelSpiMetricPeriodicAction.java +++ b/telemetry/src/main/java/datadog/telemetry/metric/OtelSpiMetricPeriodicAction.java @@ -2,11 +2,11 @@ import datadog.trace.api.telemetry.MetricCollector; import datadog.trace.api.telemetry.OtelSpiCollector; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public class OtelSpiMetricPeriodicAction extends MetricPeriodicAction { @Override - @NonNull + @Nonnull public MetricCollector collector() { return OtelSpiCollector.getInstance(); } diff --git a/telemetry/src/main/java/datadog/telemetry/metric/WafMetricPeriodicAction.java b/telemetry/src/main/java/datadog/telemetry/metric/WafMetricPeriodicAction.java index 6f3d10ba794..90dcedc9f97 100644 --- a/telemetry/src/main/java/datadog/telemetry/metric/WafMetricPeriodicAction.java +++ b/telemetry/src/main/java/datadog/telemetry/metric/WafMetricPeriodicAction.java @@ -2,12 +2,12 @@ import datadog.trace.api.telemetry.MetricCollector; import datadog.trace.api.telemetry.WafMetricCollector; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public class WafMetricPeriodicAction extends MetricPeriodicAction { @Override - @NonNull + @Nonnull public MetricCollector collector() { return WafMetricCollector.get(); } diff --git a/telemetry/src/test/groovy/datadog/telemetry/metric/MetricPeriodicActionTest.groovy b/telemetry/src/test/groovy/datadog/telemetry/metric/MetricPeriodicActionTest.groovy index 0bc65695f55..649260c38d9 100644 --- a/telemetry/src/test/groovy/datadog/telemetry/metric/MetricPeriodicActionTest.groovy +++ b/telemetry/src/test/groovy/datadog/telemetry/metric/MetricPeriodicActionTest.groovy @@ -5,9 +5,9 @@ import datadog.telemetry.TelemetryService import datadog.telemetry.api.DistributionSeries import datadog.telemetry.api.Metric import datadog.trace.api.telemetry.MetricCollector -import edu.umd.cs.findbugs.annotations.NonNull import groovy.transform.NamedDelegate import groovy.transform.NamedVariant +import javax.annotation.Nonnull import spock.lang.Specification class MetricPeriodicActionTest extends Specification { @@ -159,12 +159,12 @@ class MetricPeriodicActionTest extends Specification { private final MetricCollector collector - DefaultMetricPeriodicAction(@NonNull final MetricCollector collector) { + DefaultMetricPeriodicAction(@Nonnull final MetricCollector collector) { this.collector = collector } @Override - @NonNull + @Nonnull MetricCollector collector() { return collector } diff --git a/utils/junit-utils/src/main/java/datadog/trace/junit/utils/config/WithConfigExtension.java b/utils/junit-utils/src/main/java/datadog/trace/junit/utils/config/WithConfigExtension.java index 4c1108f5f58..6b9fe8a1039 100644 --- a/utils/junit-utils/src/main/java/datadog/trace/junit/utils/config/WithConfigExtension.java +++ b/utils/junit-utils/src/main/java/datadog/trace/junit/utils/config/WithConfigExtension.java @@ -2,7 +2,6 @@ import datadog.environment.EnvironmentVariables; import de.thetaphi.forbiddenapis.SuppressForbidden; -import edu.umd.cs.findbugs.annotations.NonNull; import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.Modifier; @@ -11,6 +10,7 @@ import java.util.List; import java.util.Map; import java.util.Properties; +import javax.annotation.Nonnull; import org.junit.jupiter.api.extension.AfterAllCallback; import org.junit.jupiter.api.extension.AfterEachCallback; import org.junit.jupiter.api.extension.BeforeAllCallback; @@ -267,7 +267,7 @@ public static class TestEnvironmentVariables } @Override - public String get(@NonNull String name) { + public String get(@Nonnull String name) { return env.get(name); } From 3ea05a00965cb4c047d2a64d47c436b51dc28461 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Mon, 22 Jun 2026 14:30:40 -0400 Subject: [PATCH 021/139] Add missing repositories to Update Gradle dependencies workflow (#11696) Add missing repositories to Update Gradle dependencies workflow Co-authored-by: sarah.chen --- .github/scripts/dependency_age.py | 2 ++ .github/workflows/update-gradle-dependencies.yaml | 3 +++ 2 files changed, 5 insertions(+) diff --git a/.github/scripts/dependency_age.py b/.github/scripts/dependency_age.py index d67f1fdcffa..ff3a46adde4 100644 --- a/.github/scripts/dependency_age.py +++ b/.github/scripts/dependency_age.py @@ -551,6 +551,8 @@ def build_validation_summary( blocks.append( "### :warning: Cannot verify age, reverted\n\n" "The age of these dependencies could not be verified, so the lockfiles were reverted. " + "This likely means that the following dependencies are published to a repo not yet configured in the workflow. " + "If this is the case, add the missing repository as a `--repo-url` in the `Validate changed lock files` step of `.github/workflows/update-gradle-dependencies.yaml`. " "**This needs to be resolved manually.**\n\n" + "\n".join(sorted(unverified)) ) diff --git a/.github/workflows/update-gradle-dependencies.yaml b/.github/workflows/update-gradle-dependencies.yaml index 8ba0fc12fda..7b8edebd7b5 100644 --- a/.github/workflows/update-gradle-dependencies.yaml +++ b/.github/workflows/update-gradle-dependencies.yaml @@ -68,6 +68,9 @@ jobs: --min-age-hours "${MIN_DEPENDENCY_AGE_HOURS}" \ --repo-url "https://repo1.maven.org/maven2" \ --repo-url "https://repo.akka.io/${AKKA_REPO_TOKEN}/secure" \ + --repo-url "https://packages.confluent.io/maven" \ + --repo-url "https://repository.mulesoft.org/releases" \ + --repo-url "https://repository.mulesoft.org/nexus/content/repositories/public" \ --github-output "$GITHUB_OUTPUT" - name: Save instrumentation lock files From ea827ba0c4d74b196074c4359aecb1746295a330 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Mon, 22 Jun 2026 15:54:41 -0400 Subject: [PATCH 022/139] Add SCA benchmark gitlab config (#11697) Add SCA benchmark gitlab config Co-authored-by: sarah.chen --- .gitlab/java-benchmark-configs.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab/java-benchmark-configs.yml b/.gitlab/java-benchmark-configs.yml index b984847c6a0..8df9511b52d 100644 --- a/.gitlab/java-benchmark-configs.yml +++ b/.gitlab/java-benchmark-configs.yml @@ -50,6 +50,10 @@ linux-java-spring-petclinic-load-parallel: needs: ["publish-artifacts-to-s3"] rules: *parallel_benchmark_rules +linux-java-spring-petclinic-sca-load-parallel: + needs: ["publish-artifacts-to-s3"] + rules: *parallel_benchmark_rules + linux-java-insecure-bank-startup-parallel: needs: ["publish-artifacts-to-s3"] rules: *parallel_startup_benchmark_rules From e3a0877769bea9392883fa0a1979ef432c2d243d Mon Sep 17 00:00:00 2001 From: Douglas Q Hawkins Date: Mon, 22 Jun 2026 20:35:27 -0400 Subject: [PATCH 023/139] Pre-construct TagMap.Entry objects in InternalTagsAdder (#11555) Pre-construct TagMap.Entry objects in InternalTagsAdder InternalTagsAdder set base.service / version via TagMap.set(tag, value), allocating a fresh TagMap.Entry per span. Both values are fixed for the life of the tracer, and TagMap.Entry objects are safe to share across maps (the OptimizedTagMap collision design relies on it), so build the two Entry objects once in the constructor and reuse them via set(entry). A JFR profile of petclinic (2026-06-03) attributed ~52 allocation samples to InternalTagsAdder.processTags (one Entry per span); this drops them to zero. Re-applies the change from the stale PR #10965 (415 commits behind master, drifted signature) onto current master. Co-Authored-By: Claude Opus 4.8 (1M context) Fix empty-DD_SERVICE version drop; migrate test to JUnit 5 Addresses the Codex review comment on #11555: pre-building the base.service Entry must not change behavior for an explicitly-empty DD_SERVICE. Entry.create rejects empty values, so baseServiceEntry is null in that case; the processTags branch now falls back to set(BASE_SERVICE, ddService) to preserve byte-identical behavior, and the version branch is still reached when the span service also matches the empty configured service. Migrate InternalTagsAdderTest from Groovy/Spock to JUnit 5 (parameterized with @MethodSource) and add regression coverage for the empty-DD_SERVICE case (9 migrated cases + 2 new = 11). Co-Authored-By: Claude Opus 4.8 (1M context) Trim verbose generated comments in InternalTagsAdder per review feedback Co-Authored-By: Claude Sonnet 4.6 Resolve merge conflict: keep @TableTest structure from master, add regression test Preserves the @TableTest versions of the two existing tests that landed on master, and adds the empty-DD_SERVICE regression test (from the PR) as a plain @Test. Co-Authored-By: Claude Sonnet 4.6 Fix empty-ddService: exit early + drop redundant Entry.create guard - Extend the processTags null guard to also exit when ddService.length()==0, which prevents writing _dd.base_service="" via the TagMap.set path that has no empty-value guard (unlike Entry.create). Empty ddService now behaves the same as null/unset. - Remove the manual null+length>0 pre-check before TagMap.Entry.create in the constructor; Entry.create already returns null for null or empty values, so the guard was redundant. - Update the regression test to assert the new early-return behavior. Co-Authored-By: Claude Sonnet 4.6 Merge branch 'master' into dougqh/preconstruct-internal-tags Accept review feedback: @NonNull ddService, drop empty guard and regression test Config.getServiceName() always returns a non-null non-empty string (defaults to "unnamed-java-app"), so the null/@empty guard in processTags and the corresponding regression test for empty DD_SERVICE are unnecessary. Replaced @Nullable with @Nonnull on the constructor param to document the actual contract. Co-Authored-By: Claude Sonnet 4.6 Merge branch 'master' into dougqh/preconstruct-internal-tags Co-authored-by: devflow.devflow-routing-intake --- .../core/tagprocessor/InternalTagsAdder.java | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/InternalTagsAdder.java b/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/InternalTagsAdder.java index 68b13d19faf..34588dc9da4 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/InternalTagsAdder.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/InternalTagsAdder.java @@ -7,32 +7,40 @@ import datadog.trace.bootstrap.instrumentation.api.AppendableSpanLinks; import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString; import datadog.trace.core.DDSpanContext; +import javax.annotation.Nonnull; import javax.annotation.Nullable; public final class InternalTagsAdder extends TagsPostProcessor { private final UTF8BytesString ddService; - private final UTF8BytesString version; - public InternalTagsAdder(@Nullable final String ddService, @Nullable final String version) { - this.ddService = ddService != null ? UTF8BytesString.create(ddService) : null; - this.version = version != null && !version.isEmpty() ? UTF8BytesString.create(version) : null; + // Prebuilt once to avoid per-span Entry allocation. + private final TagMap.Entry baseServiceEntry; + @Nullable private final TagMap.Entry versionEntry; + + public InternalTagsAdder(@Nonnull final String ddService, @Nullable final String version) { + this.ddService = UTF8BytesString.create(ddService); + this.baseServiceEntry = TagMap.Entry.create(DDTags.BASE_SERVICE, this.ddService); + this.versionEntry = + version != null && !version.isEmpty() + ? TagMap.Entry.create(VERSION, UTF8BytesString.create(version)) + : null; } @Override public void processTags( TagMap unsafeTags, DDSpanContext spanContext, AppendableSpanLinks spanLinks) { - if (spanContext == null || ddService == null) { + if (spanContext == null) { return; } if (!ddService.toString().equalsIgnoreCase(spanContext.getServiceName())) { - // service name != DD_SERVICE - unsafeTags.set(DDTags.BASE_SERVICE, ddService); + // service name != DD_SERVICE + unsafeTags.set(baseServiceEntry); } else { // as per config consistency, the version tag is added across tracers only if // the service name is DD_SERVICE and version tag is not manually set - if (version != null && !unsafeTags.containsKey(VERSION)) { - unsafeTags.set(VERSION, version); + if (versionEntry != null && !unsafeTags.containsKey(VERSION)) { + unsafeTags.set(versionEntry); } } } From a72342457dd69749da69758449eeb83665492bca Mon Sep 17 00:00:00 2001 From: "dd-octo-sts[bot]" <200755185+dd-octo-sts[bot]@users.noreply.github.com> Date: Tue, 23 Jun 2026 01:04:24 +0000 Subject: [PATCH 024/139] Update instrumentation Gradle dependencies (#11700) chore: Update instrumentation Gradle dependencies Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Rolled back armeria 1.40.0 to pass the build on GitLab. Co-authored-by: AlexeyKuznetsov-DD --- .../aerospike-4.0/gradle.lockfile | 3 +- .../akka/akka-actor-2.5/gradle.lockfile | 3 +- .../akka-http/akka-http-10.0/gradle.lockfile | 3 +- .../akka-http-10.2-iast/gradle.lockfile | 3 +- .../akka-http/akka-http-10.6/gradle.lockfile | 3 +- .../gradle.lockfile | 3 +- .../apache-httpclient-4.0/gradle.lockfile | 3 +- .../apache-httpclient-5.0/gradle.lockfile | 3 +- .../apache-httpcore-4.0/gradle.lockfile | 3 +- .../apache-httpcore-5.0/gradle.lockfile | 3 +- .../armeria/armeria-grpc-0.84/gradle.lockfile | 3 +- .../armeria-jetty-1.24/gradle.lockfile | 71 ++++---- .../avro-1.11.3/gradle.lockfile | 3 +- .../aws-java/aws-java-common/gradle.lockfile | 3 +- .../aws-java-dynamodb-2.0/gradle.lockfile | 57 ++++--- .../aws-java-eventbridge-2.0/gradle.lockfile | 57 ++++--- .../gradle.lockfile | 3 +- .../aws-java/aws-java-s3-2.0/gradle.lockfile | 63 +++---- .../aws-java-sdk-1.11/gradle.lockfile | 3 +- .../aws-java/aws-java-sdk-2.2/gradle.lockfile | 67 ++++---- .../aws-java/aws-java-sfn-2.0/gradle.lockfile | 57 ++++--- .../aws-java/aws-java-sns-1.0/gradle.lockfile | 3 +- .../aws-java/aws-java-sns-2.0/gradle.lockfile | 57 ++++--- .../aws-java/aws-java-sqs-1.0/gradle.lockfile | 3 +- .../aws-java/aws-java-sqs-2.0/gradle.lockfile | 3 +- .../instrumentation/axis2-1.3/gradle.lockfile | 3 +- .../axway-api-7.5/gradle.lockfile | 3 +- .../azure-functions-1.2.2/gradle.lockfile | 3 +- .../caffeine-1.0/gradle.lockfile | 3 +- .../instrumentation/cdi-1.2/gradle.lockfile | 3 +- .../instrumentation/cics-9.1/gradle.lockfile | 3 +- .../commons-codec-1.1/gradle.lockfile | 3 +- .../commons-fileupload-1.5/gradle.lockfile | 3 +- .../commons-httpclient-2.0/gradle.lockfile | 3 +- .../commons-lang-2.1/gradle.lockfile | 3 +- .../commons-lang-3.5/gradle.lockfile | 3 +- .../commons-text-1.0/gradle.lockfile | 3 +- .../gradle.lockfile | 35 ++-- .../couchbase/couchbase-2.0/gradle.lockfile | 3 +- .../couchbase/couchbase-2.6/gradle.lockfile | 3 +- .../couchbase/couchbase-3.1/gradle.lockfile | 3 +- .../couchbase/couchbase-3.2/gradle.lockfile | 3 +- .../cucumber-5.4/gradle.lockfile | 3 +- .../instrumentation/cxf-2.1/gradle.lockfile | 3 +- .../asm/iast-instrumenter/gradle.lockfile | 3 +- .../span-origin/gradle.lockfile | 3 +- .../gradle.lockfile | 3 +- .../exception-profiling/gradle.lockfile | 3 +- .../tracing/trace-annotation/gradle.lockfile | 3 +- .../datanucleus-4.0.5/gradle.lockfile | 3 +- .../datastax-cassandra-3.0/gradle.lockfile | 3 +- .../datastax-cassandra-3.8/gradle.lockfile | 3 +- .../datastax-cassandra-4.0/gradle.lockfile | 4 +- .../drools/drools-6.0/gradle.lockfile | 3 +- .../dropwizard/dropwizard-0.8/gradle.lockfile | 3 +- .../dropwizard-views-0.7/gradle.lockfile | 3 +- .../elasticsearch-common/gradle.lockfile | 3 +- .../elasticsearch-rest-5.0/gradle.lockfile | 3 +- .../elasticsearch-rest-6.4/gradle.lockfile | 3 +- .../elasticsearch-rest-7.0/gradle.lockfile | 3 +- .../gradle.lockfile | 3 +- .../gradle.lockfile | 3 +- .../gradle.lockfile | 3 +- .../gradle.lockfile | 3 +- .../gradle.lockfile | 3 +- .../gradle.lockfile | 3 +- .../finatra-2.9/gradle.lockfile | 3 +- .../freemarker-2.3.24/gradle.lockfile | 3 +- .../freemarker-2.3.9/gradle.lockfile | 3 +- .../instrumentation/gax-1.4/gradle.lockfile | 160 ++++++++++++++++++ .../glassfish-3.0/gradle.lockfile | 3 +- .../google-http-client-1.19/gradle.lockfile | 3 +- .../google-pubsub-1.116/gradle.lockfile | 3 +- .../graal-native-image-20.0/gradle.lockfile | 3 +- .../instrumentation/graal/gradle.lockfile | 3 +- .../gradle-testing-5.1/gradle.lockfile | 3 +- dd-java-agent/instrumentation/gradle.lockfile | 3 +- .../gradle/gradle-3.0/gradle.lockfile | 3 +- .../gradle/gradle-8.3/gradle.lockfile | 3 +- .../graphql-java-14.0/gradle.lockfile | 3 +- .../graphql-java-20.0/gradle.lockfile | 3 +- .../graphql-java-common/gradle.lockfile | 3 +- .../grizzly/grizzly-2.0/gradle.lockfile | 3 +- .../grizzly-client-1.9/gradle.lockfile | 3 +- .../grizzly-http-2.3.20/gradle.lockfile | 3 +- .../instrumentation/grpc-1.5/gradle.lockfile | 3 +- .../instrumentation/gson-1.6/gradle.lockfile | 3 +- .../guava-10.0/gradle.lockfile | 3 +- .../hazelcast/hazelcast-3.6/gradle.lockfile | 3 +- .../hazelcast/hazelcast-3.9/gradle.lockfile | 3 +- .../hazelcast/hazelcast-4.0/gradle.lockfile | 3 +- .../hibernate-common/gradle.lockfile | 3 +- .../hibernate-core-3.3/gradle.lockfile | 3 +- .../hibernate-core-4.0/gradle.lockfile | 3 +- .../hibernate-core-4.3/gradle.lockfile | 3 +- .../hystrix-1.4/gradle.lockfile | 3 +- .../ignite-2.0/gradle.lockfile | 3 +- .../jackson-core-1.9.13/gradle.lockfile | 3 +- .../jackson-core-2.0/gradle.lockfile | 3 +- .../jackson-core-2.12/gradle.lockfile | 3 +- .../jackson-core-2.16/gradle.lockfile | 3 +- .../jackson-core-2.6/gradle.lockfile | 3 +- .../jackson-core-2.8/gradle.lockfile | 3 +- .../jackson-core-common/gradle.lockfile | 3 +- .../jacoco-0.8.9/gradle.lockfile | 3 +- .../java-concurrent-1.8/gradle.lockfile | 3 +- .../java-concurrent-21.0/gradle.lockfile | 3 +- .../java-concurrent-25.0/gradle.lockfile | 3 +- .../java/java-io-1.8/gradle.lockfile | 3 +- .../java-lang/java-lang-1.8/gradle.lockfile | 3 +- .../java-lang/java-lang-11.0/gradle.lockfile | 3 +- .../java-lang/java-lang-15.0/gradle.lockfile | 3 +- .../java-lang/java-lang-17.0/gradle.lockfile | 3 +- .../java-lang/java-lang-21.0/gradle.lockfile | 3 +- .../java-lang/java-lang-22.0/gradle.lockfile | 3 +- .../java-lang/java-lang-9.0/gradle.lockfile | 3 +- .../gradle.lockfile | 27 +-- .../java-net/java-net-1.8/gradle.lockfile | 3 +- .../java-net/java-net-11.0/gradle.lockfile | 3 +- .../java/java-nio-1.8/gradle.lockfile | 3 +- .../java/java-rmi-1.1/gradle.lockfile | 3 +- .../java/java-security-1.8/gradle.lockfile | 3 +- .../java/java-util-1.8/gradle.lockfile | 3 +- .../javax-naming-1.0/gradle.lockfile | 3 +- .../javax-xml-1.4/gradle.lockfile | 3 +- .../jboss-logmanager-1.1/gradle.lockfile | 3 +- .../jboss/jboss-modules-1.3/gradle.lockfile | 3 +- .../instrumentation/jdbc/gradle.lockfile | 5 +- .../jdbc/scalikejdbc-3.5/gradle.lockfile | 3 +- .../jedis/jedis-1.4/gradle.lockfile | 3 +- .../jedis/jedis-3.0/gradle.lockfile | 3 +- .../jedis/jedis-4.0/gradle.lockfile | 3 +- .../jersey/jersey-2.0/gradle.lockfile | 3 +- .../jersey/jersey-client-2.0/gradle.lockfile | 3 +- .../jersey/jersey-filter-2.0/gradle.lockfile | 3 +- .../jetty-appsec-11.0/gradle.lockfile | 37 ++-- .../jetty-appsec-7.0/gradle.lockfile | 3 +- .../jetty-appsec-8.1.3/gradle.lockfile | 18 +- .../jetty-appsec-9.2/gradle.lockfile | 6 +- .../jetty-appsec-9.3/gradle.lockfile | 6 +- .../jetty-appsec-9.4/gradle.lockfile | 26 +-- .../jetty-client-10.0/gradle.lockfile | 3 +- .../jetty-client-12.0/gradle.lockfile | 3 +- .../jetty-client-9.1/gradle.lockfile | 3 +- .../jetty-client-common/gradle.lockfile | 3 +- .../jetty/jetty-common/gradle.lockfile | 3 +- .../jetty-server-10.0/gradle.lockfile | 3 +- .../jetty-server-11.0/gradle.lockfile | 3 +- .../jetty-server-12.0/gradle.lockfile | 3 +- .../jetty-server-7.0/gradle.lockfile | 3 +- .../jetty-server-7.6/gradle.lockfile | 3 +- .../jetty-server-9.0.4/gradle.lockfile | 3 +- .../jetty-server-9.0/gradle.lockfile | 3 +- .../jetty-server-9.3/gradle.lockfile | 3 +- .../jetty-server-9.4.21/gradle.lockfile | 3 +- .../jetty/jetty-util-9.4.31/gradle.lockfile | 3 +- .../jms/jakarta-jms-3.0/gradle.lockfile | 3 +- .../jms/javax-jms-1.1/gradle.lockfile | 3 +- .../jose-jwt-4.0/gradle.lockfile | 3 +- .../instrumentation/jsp-2.3/gradle.lockfile | 3 +- .../junit-4-cucumber-5.4/gradle.lockfile | 3 +- .../junit-4-munit-0.7.28/gradle.lockfile | 3 +- .../junit/junit-4/junit-4.10/gradle.lockfile | 3 +- .../junit/junit-4/junit-4.13/gradle.lockfile | 3 +- .../junit-5-cucumber-5.4/gradle.lockfile | 3 +- .../junit-5/junit-5-spock-2.0/gradle.lockfile | 3 +- .../junit/junit-5/junit-5.3/gradle.lockfile | 3 +- .../junit/junit-5/junit-5.8/gradle.lockfile | 3 +- .../kafka/kafka-clients-0.11/gradle.lockfile | 3 +- .../kafka/kafka-clients-3.8/gradle.lockfile | 3 +- .../kafka/kafka-common/gradle.lockfile | 3 +- .../kafka/kafka-connect-0.11/gradle.lockfile | 3 +- .../kafka/kafka-streams-0.11/gradle.lockfile | 3 +- .../kafka/kafka-streams-1.0/gradle.lockfile | 3 +- .../karate-1.0/gradle.lockfile | 3 +- .../kotlin-coroutines-1.3/gradle.lockfile | 3 +- .../lettuce/lettuce-4.0/gradle.lockfile | 3 +- .../lettuce/lettuce-5.0/gradle.lockfile | 3 +- .../liberty/liberty-20.0/gradle.lockfile | 3 +- .../liberty/liberty-23.0/gradle.lockfile | 3 +- .../log4j/log4j-1.2.4/gradle.lockfile | 3 +- .../log4j/log4j-2.0/gradle.lockfile | 3 +- .../log4j/log4j-2.7/gradle.lockfile | 3 +- .../logback-1.0/gradle.lockfile | 3 +- .../mail/jakarta-mail-2.0.1/gradle.lockfile | 3 +- .../mail/javax-mail-1.4.4/gradle.lockfile | 3 +- .../maven/maven-3.2.1/gradle.lockfile | 3 +- .../maven/maven-surefire-3.0/gradle.lockfile | 3 +- .../gradle.lockfile | 5 +- .../gradle.lockfile | 3 +- .../gradle.lockfile | 3 +- .../gradle.lockfile | 3 +- .../mongo/mongo-common/gradle.lockfile | 3 +- .../mongo-driver-3.1/gradle.lockfile | 3 +- .../mongo-driver-3.4/gradle.lockfile | 3 +- .../mongo-driver-3.6/gradle.lockfile | 3 +- .../mongo-driver-3.8/gradle.lockfile | 3 +- .../mongo-driver-4.0/gradle.lockfile | 3 +- .../mongo-test-async-3.3/gradle.lockfile | 3 +- .../mongo-test-core-3.1/gradle.lockfile | 3 +- .../mongo-test-core-3.7/gradle.lockfile | 3 +- .../mongo-test-sync-3.10/gradle.lockfile | 3 +- .../instrumentation/mule-4.5/gradle.lockfile | 24 +-- .../netty/netty-3.8/gradle.lockfile | 3 +- .../netty/netty-4.0/gradle.lockfile | 3 +- .../netty/netty-4.1/gradle.lockfile | 7 +- .../netty/netty-buffer-4.0/gradle.lockfile | 3 +- .../netty/netty-common/gradle.lockfile | 3 +- .../netty-concurrent-4.0/gradle.lockfile | 3 +- .../netty/netty-promise-4.0/gradle.lockfile | 3 +- .../ognl-appsec-3.3.2/gradle.lockfile | 3 +- .../okhttp/okhttp-2.2/gradle.lockfile | 3 +- .../okhttp/okhttp-3.0/gradle.lockfile | 3 +- .../openai-java-3.0/gradle.lockfile | 9 +- .../opensearch-common/gradle.lockfile | 3 +- .../opensearch-rest-1.0/gradle.lockfile | 3 +- .../opensearch-transport-1.0/gradle.lockfile | 3 +- .../opentelemetry/gradle.lockfile | 3 +- .../opentelemetry-0.3/gradle.lockfile | 3 +- .../opentelemetry-1.27/gradle.lockfile | 3 +- .../opentelemetry-1.4/gradle.lockfile | 3 +- .../opentelemetry-1.47/gradle.lockfile | 3 +- .../gradle.lockfile | 11 +- .../gradle.lockfile | 3 +- .../opentracing-0.31/gradle.lockfile | 3 +- .../opentracing-0.32/gradle.lockfile | 3 +- .../opentracing-common/gradle.lockfile | 3 +- .../org-json-20230227/gradle.lockfile | 3 +- .../instrumentation/osgi-4.3/gradle.lockfile | 3 +- .../owasp-esapi-2.1/gradle.lockfile | 3 +- .../pekko-concurrent-1.0/gradle.lockfile | 3 +- .../pekko/pekko-http-1.0/gradle.lockfile | 3 +- .../play-ws/play-ws-1.0/gradle.lockfile | 3 +- .../play-ws/play-ws-2.0/gradle.lockfile | 3 +- .../play-ws/play-ws-2.1/gradle.lockfile | 3 +- .../play-ws/play-ws-common/gradle.lockfile | 3 +- .../play/play-2.3/gradle.lockfile | 3 +- .../play/play-2.4/gradle.lockfile | 3 +- .../play/play-2.6/gradle.lockfile | 3 +- .../play/play-appsec-2.5/gradle.lockfile | 3 +- .../play/play-appsec-2.6/gradle.lockfile | 3 +- .../play/play-appsec-2.7/gradle.lockfile | 3 +- .../play/play-appsec-common/gradle.lockfile | 3 +- .../protobuf-3.0/gradle.lockfile | 3 +- .../quartz-2.0/gradle.lockfile | 3 +- .../rabbitmq-amqp-2.7/gradle.lockfile | 27 +-- .../ratpack-1.5/gradle.lockfile | 3 +- .../reactive-streams-1.0/gradle.lockfile | 3 +- .../reactor-core-3.1/gradle.lockfile | 3 +- .../reactor-netty-1.0/gradle.lockfile | 3 +- .../rediscala-1.8/gradle.lockfile | 3 +- .../redisson/redisson-2.0.0/gradle.lockfile | 3 +- .../redisson/redisson-2.3.0/gradle.lockfile | 3 +- .../redisson/redisson-3.10.3/gradle.lockfile | 3 +- .../renaissance-0.7/gradle.lockfile | 3 +- .../resilience4j-2.0/gradle.lockfile | 3 +- .../resilience4j-reactor-2.0/gradle.lockfile | 3 +- .../filter-resteasy-3.0/gradle.lockfile | 3 +- .../filter-resteasy-3.1/gradle.lockfile | 3 +- .../resteasy/resteasy-3.0/gradle.lockfile | 3 +- .../restlet-2.2/gradle.lockfile | 3 +- .../gradle.lockfile | 3 +- .../jax-rs-annotations-1.1.1/gradle.lockfile | 3 +- .../jax-rs-annotations-2.0/gradle.lockfile | 3 +- .../jax-rs-client-1.1/gradle.lockfile | 3 +- .../jax-rs-client-2.0/gradle.lockfile | 3 +- .../rxjava/rxjava-1.0/gradle.lockfile | 3 +- .../rxjava/rxjava-2.0/gradle.lockfile | 3 +- .../scala/scala-2.10.7/gradle.lockfile | 3 +- .../scala-concurrent-2.8/gradle.lockfile | 3 +- .../scala-promise-2.10/gradle.lockfile | 3 +- .../scala-promise-2.13/gradle.lockfile | 3 +- .../scala-promise-common/gradle.lockfile | 3 +- .../scalatest-3.0.8/gradle.lockfile | 3 +- .../selenium-3.13/gradle.lockfile | 81 +++++---- .../servicetalk-0.42.0/gradle.lockfile | 3 +- .../servicetalk-0.42.56/gradle.lockfile | 3 +- .../jakarta-servlet-5.0/gradle.lockfile | 3 +- .../javax-servlet-2.2/gradle.lockfile | 3 +- .../javax-servlet-3.0/gradle.lockfile | 3 +- .../javax-servlet-common/gradle.lockfile | 3 +- .../javax-servlet-iast/gradle.lockfile | 3 +- .../instrumentation/slick-3.2/gradle.lockfile | 3 +- .../snakeyaml-1.33/gradle.lockfile | 3 +- .../sofarpc/sofarpc-5.0/gradle.lockfile | 45 ++--- .../spark-executor-common/gradle.lockfile | 3 +- .../spark/sparkjava-2.3/gradle.lockfile | 3 +- .../instrumentation/spray-1.3/gradle.lockfile | 3 +- .../spring/spring-beans-3.1/gradle.lockfile | 3 +- .../spring/spring-boot-1.3/gradle.lockfile | 3 +- .../spring-cloud-zuul-2.0/gradle.lockfile | 3 +- .../spring/spring-core-3.2.2/gradle.lockfile | 3 +- .../spring/spring-data-1.8/gradle.lockfile | 3 +- .../spring/spring-jms-3.1/gradle.lockfile | 3 +- .../spring-messaging-4.0/gradle.lockfile | 3 +- .../spring/spring-rabbit-1.5/gradle.lockfile | 3 +- .../spring-scheduling-3.1/gradle.lockfile | 3 +- .../spring-security-5.0/gradle.lockfile | 3 +- .../spring-security-6.0/gradle.lockfile | 3 +- .../spring-webflux-5.0/gradle.lockfile | 3 +- .../spring-webflux-6.0/gradle.lockfile | 3 +- .../spring-webmvc-3.1/gradle.lockfile | 3 +- .../spring-webmvc-5.3/gradle.lockfile | 3 +- .../spring-webmvc-6.0/gradle.lockfile | 3 +- .../spring/spring-ws-2.0/gradle.lockfile | 3 +- .../spymemcached-2.10/gradle.lockfile | 3 +- .../synapse-3.0/gradle.lockfile | 3 +- .../testng/testng-6.4/gradle.lockfile | 3 +- .../testng/testng-7.0/gradle.lockfile | 3 +- .../testng/testng-common/gradle.lockfile | 3 +- .../thymeleaf-3.0/gradle.lockfile | 3 +- .../tibco-businessworks-5.14/gradle.lockfile | 3 +- .../tibco-businessworks-6.5/gradle.lockfile | 3 +- .../tibco-businessworks-stubs/gradle.lockfile | 3 +- .../tinylog-2.0/gradle.lockfile | 3 +- .../tomcat/tomcat-5.5/gradle.lockfile | 9 +- .../tomcat/tomcat-9.0/gradle.lockfile | 3 +- .../tomcat-appsec-5.5/gradle.lockfile | 3 +- .../tomcat-appsec-6.0/gradle.lockfile | 3 +- .../tomcat-appsec-7.0/gradle.lockfile | 3 +- .../tomcat/tomcat-common/gradle.lockfile | 3 +- .../twilio-0.0.1/gradle.lockfile | 3 +- .../unbescape-1.1/gradle.lockfile | 3 +- .../undertow/undertow-2.0/gradle.lockfile | 3 +- .../undertow/undertow-2.2/gradle.lockfile | 3 +- .../undertow/undertow-common/gradle.lockfile | 3 +- .../valkey-java-5.3/gradle.lockfile | 3 +- .../velocity-1.5/gradle.lockfile | 3 +- .../vertx-mysql-client-3.9/gradle.lockfile | 3 +- .../vertx-mysql-client-4.0/gradle.lockfile | 3 +- .../vertx-mysql-client-4.4.2/gradle.lockfile | 3 +- .../vertx-pg-client-4.0/gradle.lockfile | 3 +- .../vertx-pg-client-4.4.2/gradle.lockfile | 3 +- .../vertx-redis-client-3.9/gradle.lockfile | 3 +- .../vertx-redis-client-stubs/gradle.lockfile | 3 +- .../vertx/vertx-rx-3.5/gradle.lockfile | 3 +- .../vertx-sql-client-3.9/gradle.lockfile | 3 +- .../vertx-web/vertx-web-3.4/gradle.lockfile | 3 +- .../vertx-web/vertx-web-3.5/gradle.lockfile | 3 +- .../vertx-web/vertx-web-3.9/gradle.lockfile | 3 +- .../vertx-web/vertx-web-4.0/gradle.lockfile | 3 +- .../vertx-web/vertx-web-5.0/gradle.lockfile | 3 +- .../weaver-0.9/gradle.lockfile | 3 +- .../jakarta-websocket-2.0/gradle.lockfile | 3 +- .../javax-websocket-1.0/gradle.lockfile | 3 +- .../jetty-websocket-10.0/gradle.lockfile | 3 +- .../jetty-websocket-11.0/gradle.lockfile | 3 +- .../jetty-websocket-12.0/gradle.lockfile | 3 +- .../websphere-jmx-8.5/gradle.lockfile | 3 +- .../wildfly-9.0/gradle.lockfile | 39 ++--- .../gradle.lockfile | 3 +- .../jax-ws-annotations-1.1/gradle.lockfile | 3 +- .../jax-ws-annotations-2.0/gradle.lockfile | 3 +- .../zio/zio-2.0/gradle.lockfile | 3 +- .../apm-tracing-disabled/gradle.lockfile | 3 +- dd-smoke-tests/appsec/gradle.lockfile | 3 +- .../appsec/spring-tomcat7/gradle.lockfile | 3 +- .../appsec/springboot-graphql/gradle.lockfile | 3 +- .../appsec/springboot-grpc/gradle.lockfile | 3 +- .../springboot-security/gradle.lockfile | 3 +- .../appsec/springboot/gradle.lockfile | 3 +- dd-smoke-tests/armeria-grpc/gradle.lockfile | 3 +- dd-smoke-tests/backend-mock/gradle.lockfile | 3 +- dd-smoke-tests/cli/gradle.lockfile | 3 +- .../concurrent/java-21/gradle.lockfile | 3 +- .../concurrent/java-25/gradle.lockfile | 3 +- .../concurrent/java-8/gradle.lockfile | 3 +- dd-smoke-tests/crashtracking/gradle.lockfile | 3 +- .../custom-systemloader/gradle.lockfile | 3 +- .../kafkaschemaregistry/gradle.lockfile | 3 +- .../gradle.lockfile | 3 +- dd-smoke-tests/dynamic-config/gradle.lockfile | 3 +- .../field-injection/gradle.lockfile | 3 +- dd-smoke-tests/gradle.lockfile | 3 +- dd-smoke-tests/gradle/gradle.lockfile | 3 +- dd-smoke-tests/grpc-1.5/gradle.lockfile | 3 +- .../iast-propagation/gradle.lockfile | 3 +- dd-smoke-tests/iast-util/gradle.lockfile | 3 +- .../iast-util/iast-util-11/gradle.lockfile | 3 +- .../iast-util/iast-util-17/gradle.lockfile | 3 +- dd-smoke-tests/java9-modules/gradle.lockfile | 3 +- dd-smoke-tests/jboss-modules/gradle.lockfile | 3 +- dd-smoke-tests/jdk-tool-abort/gradle.lockfile | 3 +- dd-smoke-tests/jersey-2/gradle.lockfile | 3 +- dd-smoke-tests/jersey-3/gradle.lockfile | 3 +- dd-smoke-tests/junit-console/gradle.lockfile | 3 +- dd-smoke-tests/kafka-2/gradle.lockfile | 3 +- dd-smoke-tests/kafka-3/gradle.lockfile | 3 +- dd-smoke-tests/lib-injection/gradle.lockfile | 3 +- dd-smoke-tests/log-injection/gradle.lockfile | 3 +- dd-smoke-tests/maven/gradle.lockfile | 3 +- dd-smoke-tests/openfeature/gradle.lockfile | 3 +- dd-smoke-tests/opentelemetry/gradle.lockfile | 3 +- dd-smoke-tests/opentracing/gradle.lockfile | 3 +- dd-smoke-tests/osgi/gradle.lockfile | 3 +- dd-smoke-tests/play-2.4/gradle.lockfile | 3 +- dd-smoke-tests/play-2.5/gradle.lockfile | 3 +- dd-smoke-tests/play-2.6/gradle.lockfile | 3 +- dd-smoke-tests/play-2.7/gradle.lockfile | 3 +- dd-smoke-tests/play-2.8-otel/gradle.lockfile | 3 +- .../play-2.8-split-routes/gradle.lockfile | 3 +- dd-smoke-tests/play-2.8/gradle.lockfile | 3 +- .../gradle.lockfile | 3 +- dd-smoke-tests/quarkus-native/gradle.lockfile | 3 +- dd-smoke-tests/quarkus/gradle.lockfile | 3 +- dd-smoke-tests/ratpack-1.5/gradle.lockfile | 3 +- dd-smoke-tests/resteasy/gradle.lockfile | 3 +- dd-smoke-tests/rum/gradle.lockfile | 3 +- dd-smoke-tests/rum/tomcat-10/gradle.lockfile | 3 +- dd-smoke-tests/rum/tomcat-11/gradle.lockfile | 3 +- dd-smoke-tests/rum/tomcat-9/gradle.lockfile | 3 +- dd-smoke-tests/rum/wildfly-15/gradle.lockfile | 3 +- dd-smoke-tests/sample-trace/gradle.lockfile | 3 +- .../gradle.lockfile | 3 +- .../spring-boot-2.4-webflux/gradle.lockfile | 3 +- .../spring-boot-2.5-webflux/gradle.lockfile | 3 +- .../spring-boot-2.6-webflux/gradle.lockfile | 3 +- .../spring-boot-2.6-webmvc/gradle.lockfile | 3 +- .../spring-boot-2.7-webflux/gradle.lockfile | 3 +- .../spring-boot-3.0-native/gradle.lockfile | 3 +- .../spring-boot-3.0-webflux/gradle.lockfile | 3 +- .../spring-boot-3.0-webmvc/gradle.lockfile | 3 +- .../spring-boot-3.3-webmvc/gradle.lockfile | 3 +- .../spring-boot-rabbit/gradle.lockfile | 3 +- .../spring-security/gradle.lockfile | 3 +- .../springboot-freemarker/gradle.lockfile | 3 +- .../springboot-grpc/gradle.lockfile | 3 +- .../springboot-java-11/gradle.lockfile | 3 +- .../springboot-java-17/gradle.lockfile | 3 +- .../springboot-jetty-jsp/gradle.lockfile | 3 +- dd-smoke-tests/springboot-jpa/gradle.lockfile | 3 +- .../springboot-mongo/gradle.lockfile | 3 +- .../springboot-openliberty-20/gradle.lockfile | 3 +- .../springboot-openliberty-23/gradle.lockfile | 3 +- .../springboot-thymeleaf/gradle.lockfile | 3 +- .../springboot-tomcat-jsp/gradle.lockfile | 3 +- .../springboot-tomcat/gradle.lockfile | 3 +- .../springboot-velocity/gradle.lockfile | 3 +- dd-smoke-tests/springboot/gradle.lockfile | 3 +- dd-smoke-tests/tracer-flare/gradle.lockfile | 3 +- dd-smoke-tests/vertx-3.4/gradle.lockfile | 3 +- .../vertx-3.9-resteasy/gradle.lockfile | 3 +- dd-smoke-tests/vertx-3.9/gradle.lockfile | 3 +- dd-smoke-tests/vertx-4.2/gradle.lockfile | 3 +- dd-smoke-tests/websphere-jmx/gradle.lockfile | 3 +- dd-smoke-tests/wildfly/gradle.lockfile | 3 +- 446 files changed, 1440 insertions(+), 827 deletions(-) create mode 100644 dd-java-agent/instrumentation/gax-1.4/gradle.lockfile diff --git a/dd-java-agent/instrumentation/aerospike-4.0/gradle.lockfile b/dd-java-agent/instrumentation/aerospike-4.0/gradle.lockfile index 46ba9f886a4..74855324d82 100644 --- a/dd-java-agent/instrumentation/aerospike-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/aerospike-4.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:aerospike-4.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latest7DepForkedTestRuntimeClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latest7DepForkedTestRuntimeClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -28,7 +29,7 @@ com.github.jnr:jnr-ffi:2.2.19=latest7DepForkedTestRuntimeClasspath,latest7DepTes com.github.jnr:jnr-posix:3.1.22=latest7DepForkedTestRuntimeClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latest7DepForkedTestRuntimeClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latest7DepForkedTestRuntimeClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latest7DepForkedTestAnnotationProcessor,latest7DepForkedTestCompileClasspath,latest7DepTestAnnotationProcessor,latest7DepTestCompileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/akka/akka-actor-2.5/gradle.lockfile b/dd-java-agent/instrumentation/akka/akka-actor-2.5/gradle.lockfile index b9105cc77b6..ca4900b4cab 100644 --- a/dd-java-agent/instrumentation/akka/akka-actor-2.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/akka/akka-actor-2.5/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:akka:akka-actor-2.5:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=akka23TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=akka23TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -25,7 +26,7 @@ com.github.jnr:jnr-ffi:2.2.19=akka23TestRuntimeClasspath,latestDepTestRuntimeCla com.github.jnr:jnr-posix:3.1.22=akka23TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=akka23TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=akka23TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=akka23TestCompileClasspath,akka23TestRuntimeClasspath,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=akka23TestAnnotationProcessor,akka23TestCompileClasspath,annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/gradle.lockfile b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/gradle.lockfile index 37962d41ea5..f058df4fe33 100644 --- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:akka:akka-http:akka-http-10.0:dependencies --write-locks aopalliance:aopalliance:1.0=lagomTestCompileClasspath,lagomTestRuntimeClasspath cafe.cryptography:curve25519-elisabeth:0.1.0=baseForkedTestRuntimeClasspath,baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=baseForkedTestRuntimeClasspath,baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath @@ -47,7 +48,7 @@ com.github.jnr:jnr-ffi:2.2.19=baseForkedTestRuntimeClasspath,baseTestRuntimeClas com.github.jnr:jnr-posix:3.1.22=baseForkedTestRuntimeClasspath,baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=baseForkedTestRuntimeClasspath,baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=baseForkedTestRuntimeClasspath,baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath,csiCompileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,baseForkedTestAnnotationProcessor,baseForkedTestCompileClasspath,baseTestAnnotationProcessor,baseTestCompileClasspath,compileClasspath,csiCompileClasspath,iastTestAnnotationProcessor,iastTestCompileClasspath,lagomTestAnnotationProcessor,lagomTestCompileClasspath,latestDepIastTestAnnotationProcessor,latestDepIastTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath,version101ForkedTestAnnotationProcessor,version101ForkedTestCompileClasspath,version101IastTestAnnotationProcessor,version101IastTestCompileClasspath,version101TestAnnotationProcessor,version101TestCompileClasspath,version102IastTestAnnotationProcessor,version102IastTestCompileClasspath,version102Scala213TestAnnotationProcessor,version102Scala213TestCompileClasspath diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.2-iast/gradle.lockfile b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.2-iast/gradle.lockfile index 5062e4ac324..79becd64aad 100644 --- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.2-iast/gradle.lockfile +++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.2-iast/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:akka:akka-http:akka-http-10.2-iast:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -25,7 +26,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/gradle.lockfile b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/gradle.lockfile index d663479551d..eebd276ea6c 100644 --- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/gradle.lockfile +++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:akka:akka-http:akka-http-10.6:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -33,7 +34,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/gradle.lockfile b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/gradle.lockfile index 9df627b4cf9..9d864666ac8 100644 --- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:apache-httpclient:apache-httpasyncclient-4.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/gradle.lockfile b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/gradle.lockfile index baae93a64bb..e9f98903eac 100644 --- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=iastIntegrationTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=iastIntegrationTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=iastIntegrationTestCompileClasspath,iastIntegrationTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,v41IastIntegrationTestCompileClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestCompileClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestCompileClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestCompileClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestCompileClasspath,v45IastIntegrationTestRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=iastIntegrationTestRuntimeClasspath,latestDepTestR com.github.jnr:jnr-posix:3.1.22=iastIntegrationTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=iastIntegrationTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=iastIntegrationTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,iastIntegrationTestCompileClasspath,iastIntegrationTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath,v41IastIntegrationTestCompileClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestCompileClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestCompileClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestCompileClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestCompileClasspath,v45IastIntegrationTestRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,iastIntegrationTestAnnotationProcessor,iastIntegrationTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath,v41IastIntegrationTestAnnotationProcessor,v41IastIntegrationTestCompileClasspath,v42IastIntegrationTestAnnotationProcessor,v42IastIntegrationTestCompileClasspath,v43IastIntegrationTestAnnotationProcessor,v43IastIntegrationTestCompileClasspath,v44IastIntegrationTestAnnotationProcessor,v44IastIntegrationTestCompileClasspath,v45IastIntegrationTestAnnotationProcessor,v45IastIntegrationTestCompileClasspath diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/gradle.lockfile b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/gradle.lockfile index ff15ad62627..4275fbcc028 100644 --- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-5.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-4.0/gradle.lockfile b/dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-4.0/gradle.lockfile index a8ffb8648f8..bf5a45a7ceb 100644 --- a/dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-4.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:apache-httpcore:apache-httpcore-4.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-5.0/gradle.lockfile b/dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-5.0/gradle.lockfile index cfc84e6df59..6f490f0cfb9 100644 --- a/dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-5.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-5.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:apache-httpcore:apache-httpcore-5.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/gradle.lockfile b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/gradle.lockfile index 866d8eb2b1f..9c75ab5e886 100644 --- a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/gradle.lockfile +++ b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:armeria:armeria-grpc-0.84:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath @@ -35,7 +36,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepForkedTestCompileProtoPath,latestDepForke com.github.jnr:jnr-posix:3.1.22=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,compileProtoPath,latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,compileProtoPath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.android:annotations:4.1.1.4=compileClasspath,compileProtoPath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/gradle.lockfile b/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/gradle.lockfile index 6044930725e..a0ff0e083b0 100644 --- a/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/gradle.lockfile +++ b/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:armeria:armeria-jetty-1.24:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=jetty11LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=jetty11LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -17,17 +18,17 @@ com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compil com.datadoghq:java-dogstatsd-client:4.4.5=jetty11LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=jetty11LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.15.2=compileClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath -com.fasterxml.jackson.core:jackson-annotations:2.21=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.22=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath com.fasterxml.jackson.core:jackson-core:2.15.2=compileClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.21.3=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.22.0=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath com.fasterxml.jackson.core:jackson-databind:2.15.2=compileClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath -com.fasterxml.jackson.core:jackson-databind:2.21.3=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.22.0=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.15.2=compileClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath -com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.21.3=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.22.0=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2=compileClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath -com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.21.3=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.22.0=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath com.fasterxml.jackson:jackson-bom:2.15.2=compileClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath -com.fasterxml.jackson:jackson-bom:2.21.3=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.22.0=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc com.github.jnr:jffi:1.3.15=jetty11LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-a64asm:1.0.0=jetty11LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -37,7 +38,7 @@ com.github.jnr:jnr-ffi:2.2.19=jetty11LatestDepTestRuntimeClasspath,jetty11TestRu com.github.jnr:jnr-posix:3.1.22=jetty11LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=jetty11LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=jetty11LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,jetty11LatestDepTestAnnotationProcessor,jetty11LatestDepTestCompileClasspath,jetty11TestAnnotationProcessor,jetty11TestCompileClasspath,jetty9LatestDepTestAnnotationProcessor,jetty9LatestDepTestCompileClasspath,jetty9TestAnnotationProcessor,jetty9TestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath @@ -54,11 +55,11 @@ com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=anno com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,jetty11LatestDepTestAnnotationProcessor,jetty11TestAnnotationProcessor,jetty9LatestDepTestAnnotationProcessor,jetty9TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.re2j:re2j:1.7=jetty11LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.linecorp.armeria:armeria-jetty11:1.24.0=jetty11TestCompileClasspath,jetty11TestRuntimeClasspath -com.linecorp.armeria:armeria-jetty11:1.39.1=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath +com.linecorp.armeria:armeria-jetty11:1.40.0=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath com.linecorp.armeria:armeria-jetty9:1.24.0=compileClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath -com.linecorp.armeria:armeria-jetty9:1.39.1=jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +com.linecorp.armeria:armeria-jetty9:1.40.0=jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath com.linecorp.armeria:armeria:1.24.0=compileClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath -com.linecorp.armeria:armeria:1.39.1=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +com.linecorp.armeria:armeria:1.40.0=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath com.squareup.moshi:moshi:1.11.0=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -71,56 +72,56 @@ de.thetaphi:forbiddenapis:3.10=compileClasspath,jetty11LatestDepTestCompileClass io.leangen.geantyref:geantyref:1.3.16=jetty11LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath io.micrometer:context-propagation:1.2.1=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath io.micrometer:micrometer-commons:1.11.1=compileClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath -io.micrometer:micrometer-commons:1.16.5=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +io.micrometer:micrometer-commons:1.17.0=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath io.micrometer:micrometer-core:1.11.1=compileClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath -io.micrometer:micrometer-core:1.16.5=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +io.micrometer:micrometer-core:1.17.0=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath io.micrometer:micrometer-observation:1.11.1=compileClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath -io.micrometer:micrometer-observation:1.16.5=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +io.micrometer:micrometer-observation:1.17.0=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath io.netty:netty-buffer:4.1.93.Final=compileClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath -io.netty:netty-buffer:4.2.13.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath -io.netty:netty-codec-base:4.2.13.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath -io.netty:netty-codec-compression:4.2.13.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +io.netty:netty-buffer:4.2.15.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +io.netty:netty-codec-base:4.2.15.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +io.netty:netty-codec-compression:4.2.15.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath io.netty:netty-codec-dns:4.1.93.Final=compileClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath -io.netty:netty-codec-dns:4.2.13.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +io.netty:netty-codec-dns:4.2.15.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath io.netty:netty-codec-haproxy:4.1.93.Final=compileClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath -io.netty:netty-codec-haproxy:4.2.13.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +io.netty:netty-codec-haproxy:4.2.15.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath io.netty:netty-codec-http2:4.1.93.Final=compileClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath -io.netty:netty-codec-http2:4.2.13.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +io.netty:netty-codec-http2:4.2.15.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath io.netty:netty-codec-http:4.1.93.Final=compileClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath -io.netty:netty-codec-http:4.2.13.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +io.netty:netty-codec-http:4.2.15.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath io.netty:netty-codec-socks:4.1.93.Final=jetty11TestRuntimeClasspath,jetty9TestRuntimeClasspath -io.netty:netty-codec-socks:4.2.13.Final=jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath +io.netty:netty-codec-socks:4.2.15.Final=jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath io.netty:netty-codec:4.1.93.Final=compileClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath io.netty:netty-common:4.1.93.Final=compileClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath -io.netty:netty-common:4.2.13.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +io.netty:netty-common:4.2.15.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath io.netty:netty-handler-proxy:4.1.93.Final=jetty11TestRuntimeClasspath,jetty9TestRuntimeClasspath -io.netty:netty-handler-proxy:4.2.13.Final=jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath +io.netty:netty-handler-proxy:4.2.15.Final=jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath io.netty:netty-handler:4.1.93.Final=compileClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath -io.netty:netty-handler:4.2.13.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +io.netty:netty-handler:4.2.15.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath io.netty:netty-resolver-dns-classes-macos:4.1.93.Final=jetty11TestRuntimeClasspath,jetty9TestRuntimeClasspath -io.netty:netty-resolver-dns-classes-macos:4.2.13.Final=jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath +io.netty:netty-resolver-dns-classes-macos:4.2.15.Final=jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath io.netty:netty-resolver-dns-native-macos:4.1.93.Final=jetty11TestRuntimeClasspath,jetty9TestRuntimeClasspath -io.netty:netty-resolver-dns-native-macos:4.2.13.Final=jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath +io.netty:netty-resolver-dns-native-macos:4.2.15.Final=jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath io.netty:netty-resolver-dns:4.1.93.Final=compileClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath -io.netty:netty-resolver-dns:4.2.13.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +io.netty:netty-resolver-dns:4.2.15.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath io.netty:netty-resolver:4.1.93.Final=compileClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath -io.netty:netty-resolver:4.2.13.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +io.netty:netty-resolver:4.2.15.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath io.netty:netty-tcnative-boringssl-static:2.0.61.Final=jetty11TestRuntimeClasspath,jetty9TestRuntimeClasspath io.netty:netty-tcnative-boringssl-static:2.0.77.Final=jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath io.netty:netty-tcnative-classes:2.0.61.Final=jetty11TestRuntimeClasspath,jetty9TestRuntimeClasspath io.netty:netty-tcnative-classes:2.0.77.Final=jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath io.netty:netty-transport-classes-epoll:4.1.93.Final=jetty11TestRuntimeClasspath,jetty9TestRuntimeClasspath -io.netty:netty-transport-classes-epoll:4.2.13.Final=jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath +io.netty:netty-transport-classes-epoll:4.2.15.Final=jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath io.netty:netty-transport-classes-kqueue:4.1.93.Final=jetty11TestRuntimeClasspath,jetty9TestRuntimeClasspath -io.netty:netty-transport-classes-kqueue:4.2.13.Final=jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath +io.netty:netty-transport-classes-kqueue:4.2.15.Final=jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath io.netty:netty-transport-native-epoll:4.1.93.Final=jetty11TestRuntimeClasspath,jetty9TestRuntimeClasspath -io.netty:netty-transport-native-epoll:4.2.13.Final=jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath +io.netty:netty-transport-native-epoll:4.2.15.Final=jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath io.netty:netty-transport-native-kqueue:4.1.93.Final=jetty11TestRuntimeClasspath,jetty9TestRuntimeClasspath -io.netty:netty-transport-native-kqueue:4.2.13.Final=jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath +io.netty:netty-transport-native-kqueue:4.2.15.Final=jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath io.netty:netty-transport-native-unix-common:4.1.93.Final=compileClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath -io.netty:netty-transport-native-unix-common:4.2.13.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.2.15.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath io.netty:netty-transport:4.1.93.Final=compileClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath -io.netty:netty-transport:4.2.13.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +io.netty:netty-transport:4.2.15.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath io.sqreen:libsqreen:17.3.0=jetty11LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath jakarta.websocket:jakarta.websocket-client-api:2.0.0=jetty11LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=compileClasspath,jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -199,7 +200,7 @@ org.junit.platform:junit-platform-suite-api:1.14.1=jetty11LatestDepTestRuntimeCl org.junit.platform:junit-platform-suite-commons:1.14.1=jetty11LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.0=spotbugs org.junit:junit-bom:5.14.1=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.latencyutils:LatencyUtils:2.0.3=jetty11LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestRuntimeClasspath +org.latencyutils:LatencyUtils:2.0.3=jetty11TestRuntimeClasspath,jetty9TestRuntimeClasspath org.mockito:mockito-core:4.4.0=jetty11LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/avro-1.11.3/gradle.lockfile b/dd-java-agent/instrumentation/avro-1.11.3/gradle.lockfile index 028e9fa6b86..0d9e1861590 100644 --- a/dd-java-agent/instrumentation/avro-1.11.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/avro-1.11.3/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:avro-1.11.3:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTest8RuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTest8RuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTest8CompileClasspath,latestDepTest8RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -37,7 +38,7 @@ com.github.jnr:jnr-posix:3.1.22=latestDepTest8RuntimeClasspath,latestDepTestRunt com.github.jnr:jnr-unixsocket:0.38.25=latestDepTest8RuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTest8RuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.luben:zstd-jni:1.5.5-5=compileClasspath,latestDepTest8CompileClasspath,latestDepTest8RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTest8CompileClasspath,latestDepTest8RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTest8AnnotationProcessor,latestDepTest8CompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-common/gradle.lockfile b/dd-java-agent/instrumentation/aws-java/aws-java-common/gradle.lockfile index 971ba344154..df3897de20b 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/aws-java/aws-java-common/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:aws-java:aws-java-common:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/gradle.lockfile b/dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/gradle.lockfile index e6530302c19..01b9d8e0195 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:aws-java:aws-java-dynamodb-2.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -25,7 +26,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepForkedTestRuntimeClasspath,latestDepTestR com.github.jnr:jnr-posix:3.1.22=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath @@ -157,57 +158,57 @@ org.testcontainers:localstack:1.21.4=latestDepForkedTestCompileClasspath,latestD org.testcontainers:testcontainers:1.21.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.xmlresolver:xmlresolver:5.3.3=spotbugs software.amazon.awssdk:annotations:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:annotations:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:annotations:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:apache-client:2.30.22=testRuntimeClasspath -software.amazon.awssdk:apache5-client:2.46.9=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:apache5-client:2.46.15=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:auth:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:auth:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:auth:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-core:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:aws-core:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:aws-core:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-json-protocol:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:aws-json-protocol:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:aws-json-protocol:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:checksums-spi:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:checksums-spi:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:checksums-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:checksums:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:checksums:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:checksums:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:dynamodb:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:dynamodb:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:dynamodb:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:endpoints-spi:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:endpoints-spi:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:endpoints-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth-aws-eventstream:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth-aws-eventstream:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws-eventstream:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth-aws:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth-aws:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth-spi:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth-spi:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-client-spi:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-client-spi:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-client-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:identity-spi:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:identity-spi:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:identity-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:json-utils:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:json-utils:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:json-utils:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:metrics-spi:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:metrics-spi:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:metrics-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.30.22=testRuntimeClasspath -software.amazon.awssdk:netty-nio-client:2.46.9=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:netty-nio-client:2.46.15=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:profiles:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:profiles:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:profiles:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:protocol-core:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:protocol-core:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:protocol-core:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:regions:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:regions:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:regions:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:retries-spi:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:retries-spi:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:retries-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:retries:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:retries:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:retries:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sdk-core:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:sdk-core:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:sdk-core:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:third-party-jackson-core:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:third-party-jackson-core:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:utils-lite:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:third-party-jackson-core:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:utils-lite:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:utils:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:utils:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:utils:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.eventstream:eventstream:1.0.1=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath empty=spotbugsPlugins diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/gradle.lockfile b/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/gradle.lockfile index 5a6e5e4b8be..df7a96bb70c 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:aws-java:aws-java-eventbridge-2.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -25,7 +26,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepForkedTestRuntimeClasspath,latestDepTestR com.github.jnr:jnr-posix:3.1.22=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath @@ -158,83 +159,83 @@ org.testcontainers:testcontainers:1.21.4=latestDepForkedTestCompileClasspath,lat org.xmlresolver:xmlresolver:5.3.3=spotbugs software.amazon.awssdk:annotations:2.27.19=compileClasspath software.amazon.awssdk:annotations:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:annotations:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:annotations:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:apache-client:2.27.23=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -software.amazon.awssdk:apache5-client:2.46.9=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:apache5-client:2.46.15=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:auth:2.27.19=compileClasspath software.amazon.awssdk:auth:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:auth:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:auth:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-core:2.27.19=compileClasspath software.amazon.awssdk:aws-core:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:aws-core:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:aws-core:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-json-protocol:2.27.19=compileClasspath software.amazon.awssdk:aws-json-protocol:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:aws-json-protocol:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:aws-json-protocol:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-query-protocol:2.27.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:checksums-spi:2.27.19=compileClasspath software.amazon.awssdk:checksums-spi:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:checksums-spi:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:checksums-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:checksums:2.27.19=compileClasspath software.amazon.awssdk:checksums:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:checksums:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:checksums:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:endpoints-spi:2.27.19=compileClasspath software.amazon.awssdk:endpoints-spi:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:endpoints-spi:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:endpoints-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:eventbridge:2.27.19=compileClasspath software.amazon.awssdk:eventbridge:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:eventbridge:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:eventbridge:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth-aws-eventstream:2.27.19=compileClasspath software.amazon.awssdk:http-auth-aws-eventstream:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth-aws-eventstream:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws-eventstream:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth-aws:2.27.19=compileClasspath software.amazon.awssdk:http-auth-aws:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth-aws:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth-spi:2.27.19=compileClasspath software.amazon.awssdk:http-auth-spi:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth-spi:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth:2.27.19=compileClasspath software.amazon.awssdk:http-auth:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-client-spi:2.27.19=compileClasspath software.amazon.awssdk:http-client-spi:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-client-spi:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-client-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:identity-spi:2.27.19=compileClasspath software.amazon.awssdk:identity-spi:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:identity-spi:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:identity-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:json-utils:2.27.19=compileClasspath software.amazon.awssdk:json-utils:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:json-utils:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:json-utils:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:metrics-spi:2.27.19=compileClasspath software.amazon.awssdk:metrics-spi:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:metrics-spi:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:metrics-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.27.23=testRuntimeClasspath -software.amazon.awssdk:netty-nio-client:2.46.9=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:netty-nio-client:2.46.15=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:profiles:2.27.19=compileClasspath software.amazon.awssdk:profiles:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:profiles:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:profiles:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:protocol-core:2.27.19=compileClasspath software.amazon.awssdk:protocol-core:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:protocol-core:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:protocol-core:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:regions:2.27.19=compileClasspath software.amazon.awssdk:regions:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:regions:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:regions:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:retries-spi:2.27.19=compileClasspath software.amazon.awssdk:retries-spi:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:retries-spi:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:retries-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:retries:2.27.19=compileClasspath software.amazon.awssdk:retries:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:retries:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:retries:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sdk-core:2.27.19=compileClasspath software.amazon.awssdk:sdk-core:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:sdk-core:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:sdk-core:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sns:2.27.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:sqs:2.27.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:third-party-jackson-core:2.27.19=compileClasspath software.amazon.awssdk:third-party-jackson-core:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:third-party-jackson-core:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:utils-lite:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:third-party-jackson-core:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:utils-lite:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:utils:2.27.19=compileClasspath software.amazon.awssdk:utils:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:utils:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:utils:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.eventstream:eventstream:1.0.1=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath empty=spotbugsPlugins diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/gradle.lockfile b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/gradle.lockfile index f74fa664cc8..29cadc6c9c1 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:aws-java:aws-java-lambda-handler-1.2:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -22,7 +23,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-s3-2.0/gradle.lockfile b/dd-java-agent/instrumentation/aws-java/aws-java-s3-2.0/gradle.lockfile index 6cc19cad103..b168bfec03c 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-s3-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/aws-java/aws-java-s3-2.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:aws-java:aws-java-s3-2.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -25,7 +26,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepForkedTestRuntimeClasspath,latestDepTestR com.github.jnr:jnr-posix:3.1.22=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath @@ -157,63 +158,63 @@ org.testcontainers:localstack:1.21.4=latestDepForkedTestCompileClasspath,latestD org.testcontainers:testcontainers:1.21.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.xmlresolver:xmlresolver:5.3.3=spotbugs software.amazon.awssdk:annotations:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:annotations:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:annotations:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:apache-client:2.29.26=testRuntimeClasspath -software.amazon.awssdk:apache5-client:2.46.9=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:apache5-client:2.46.15=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:arns:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:arns:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:arns:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:auth:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:auth:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:auth:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-core:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:aws-core:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:aws-core:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-query-protocol:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:aws-query-protocol:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:aws-query-protocol:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-xml-protocol:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:aws-xml-protocol:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:aws-xml-protocol:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:checksums-spi:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:checksums-spi:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:checksums-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:checksums:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:checksums:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:checksums:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:crt-core:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:crt-core:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:crt-core:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:endpoints-spi:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:endpoints-spi:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:endpoints-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth-aws-eventstream:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth-aws-eventstream:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws-eventstream:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth-aws:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth-aws:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth-spi:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth-spi:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-client-spi:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-client-spi:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-client-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:identity-spi:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:identity-spi:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:identity-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:json-utils:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:json-utils:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:json-utils:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:metrics-spi:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:metrics-spi:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:metrics-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.29.26=testRuntimeClasspath -software.amazon.awssdk:netty-nio-client:2.46.9=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:netty-nio-client:2.46.15=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:profiles:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:profiles:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:profiles:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:protocol-core:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:protocol-core:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:protocol-core:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:regions:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:regions:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:regions:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:retries-spi:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:retries-spi:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:retries-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:retries:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:retries:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:retries:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:s3:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:s3:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:s3:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sdk-core:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:sdk-core:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:sdk-core:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:third-party-jackson-core:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:third-party-jackson-core:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:utils-lite:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:third-party-jackson-core:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:utils-lite:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:utils:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:utils:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:utils:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.eventstream:eventstream:1.0.1=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath empty=spotbugsPlugins diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/gradle.lockfile b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/gradle.lockfile index 64d7502d563..246b57aa520 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/gradle.lockfile +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:aws-java:aws-java-sdk-1.11:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath ch.qos.logback:logback-classic:1.2.13=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath @@ -73,7 +74,7 @@ com.github.jnr:jnr-ffi:2.2.19=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClassp com.github.jnr:jnr-posix:3.1.22=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,dsmForkedTestAnnotationProcessor,dsmForkedTestCompileClasspath,dsmTestAnnotationProcessor,dsmTestCompileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDsmForkedTestAnnotationProcessor,latestDsmForkedTestCompileClasspath,latestDsmTestAnnotationProcessor,latestDsmTestCompileClasspath,testAnnotationProcessor,testCompileClasspath,test_before_1_11_106AnnotationProcessor,test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestAnnotationProcessor,test_before_1_11_106ForkedTestCompileClasspath diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/gradle.lockfile b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/gradle.lockfile index b780978b293..a3fea8173e3 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:aws-java:aws-java-sdk-2.2:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -29,7 +30,7 @@ com.github.jnr:jnr-ffi:2.2.19=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClassp com.github.jnr:jnr-posix:3.1.22=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,dsmForkedTestAnnotationProcessor,dsmForkedTestCompileClasspath,dsmTestAnnotationProcessor,dsmTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDsmForkedTestAnnotationProcessor,latestDsmForkedTestCompileClasspath,latestDsmTestAnnotationProcessor,latestDsmTestCompileClasspath,latestPayloadTaggingForkedTestAnnotationProcessor,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingTestAnnotationProcessor,latestPayloadTaggingTestCompileClasspath,payloadTaggingForkedTestAnnotationProcessor,payloadTaggingForkedTestCompileClasspath,payloadTaggingTestAnnotationProcessor,payloadTaggingTestCompileClasspath,testAnnotationProcessor,testCompileClasspath @@ -212,14 +213,14 @@ software.amazon.awssdk:annotations:2.19.0=payloadTaggingForkedTestCompileClasspa software.amazon.awssdk:annotations:2.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:annotations:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:annotations:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:annotations:2.46.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:annotations:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:apache-client:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath software.amazon.awssdk:apache-client:2.19.0=payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:apache-client:2.2.0=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingTestCompileClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingTestCompileClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:apache-client:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:apache-client:2.25.40=latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:apache-client:2.46.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath -software.amazon.awssdk:apache5-client:2.46.9=latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:apache-client:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:apache5-client:2.46.15=latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:apigateway:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:apigateway:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:apigateway:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath @@ -230,35 +231,35 @@ software.amazon.awssdk:auth:2.19.0=payloadTaggingForkedTestCompileClasspath,payl software.amazon.awssdk:auth:2.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:auth:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:auth:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:auth:2.46.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:auth:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:aws-cbor-protocol:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:aws-cbor-protocol:2.2.0=testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:aws-cbor-protocol:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:aws-cbor-protocol:2.46.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:aws-cbor-protocol:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:aws-core:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath software.amazon.awssdk:aws-core:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:aws-core:2.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:aws-core:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-core:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:aws-core:2.46.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:aws-core:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:aws-json-protocol:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath software.amazon.awssdk:aws-json-protocol:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:aws-json-protocol:2.2.0=testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:aws-json-protocol:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-json-protocol:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:aws-json-protocol:2.46.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:aws-json-protocol:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:aws-query-protocol:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:aws-query-protocol:2.2.0=testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:aws-query-protocol:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-query-protocol:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:aws-query-protocol:2.46.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:aws-query-protocol:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:aws-xml-protocol:2.18.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:aws-xml-protocol:2.2.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:aws-xml-protocol:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:checksums-spi:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:checksums-spi:2.46.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:checksums-spi:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:checksums:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:checksums:2.46.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:checksums:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:crt-core:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:dynamodb:2.2.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:dynamodb:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -268,57 +269,57 @@ software.amazon.awssdk:endpoints-spi:2.18.40=dsmForkedTestCompileClasspath,dsmFo software.amazon.awssdk:endpoints-spi:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:endpoints-spi:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:endpoints-spi:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:endpoints-spi:2.46.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:endpoints-spi:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:eventbridge:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:eventbridge:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath software.amazon.awssdk:eventbridge:2.7.4=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath -software.amazon.awssdk:http-auth-aws-eventstream:2.46.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws-eventstream:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:http-auth-aws:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:http-auth-aws:2.46.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:http-auth-spi:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:http-auth-spi:2.46.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:http-auth-spi:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:http-auth:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:http-auth:2.46.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:http-auth:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:http-client-spi:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath software.amazon.awssdk:http-client-spi:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:http-client-spi:2.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:http-client-spi:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-client-spi:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:http-client-spi:2.46.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:http-client-spi:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:identity-spi:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:identity-spi:2.46.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:identity-spi:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:json-utils:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath software.amazon.awssdk:json-utils:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:json-utils:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:json-utils:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:json-utils:2.46.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:json-utils:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:kinesis:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:kinesis:2.2.0=testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:kinesis:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:kinesis:2.46.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:kinesis:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:metrics-spi:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath software.amazon.awssdk:metrics-spi:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:metrics-spi:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:metrics-spi:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:metrics-spi:2.46.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:metrics-spi:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.19.0=payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.2.0=testRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.20.33=latestDepTestRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.25.40=latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:netty-nio-client:2.46.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:netty-nio-client:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:profiles:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath software.amazon.awssdk:profiles:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:profiles:2.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:profiles:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:profiles:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:profiles:2.46.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:profiles:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:protocol-core:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath software.amazon.awssdk:protocol-core:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:protocol-core:2.2.0=testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:protocol-core:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:protocol-core:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:protocol-core:2.46.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:protocol-core:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:rds:2.2.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:rds:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:regions:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath @@ -326,9 +327,9 @@ software.amazon.awssdk:regions:2.19.0=payloadTaggingForkedTestCompileClasspath,p software.amazon.awssdk:regions:2.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:regions:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:regions:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:regions:2.46.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath -software.amazon.awssdk:retries-spi:2.46.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath -software.amazon.awssdk:retries:2.46.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:regions:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:retries-spi:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:retries:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:s3:2.18.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:s3:2.2.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:s3:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -337,12 +338,12 @@ software.amazon.awssdk:sdk-core:2.19.0=payloadTaggingForkedTestCompileClasspath, software.amazon.awssdk:sdk-core:2.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:sdk-core:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sdk-core:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:sdk-core:2.46.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:sdk-core:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:sns:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:sns:2.2.0=testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:sns:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sns:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:sns:2.46.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:sns:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:sqs:2.18.40=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:sqs:2.2.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:sqs:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -351,17 +352,17 @@ software.amazon.awssdk:third-party-jackson-core:2.18.40=dsmForkedTestCompileClas software.amazon.awssdk:third-party-jackson-core:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:third-party-jackson-core:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:third-party-jackson-core:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:third-party-jackson-core:2.46.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:third-party-jackson-core:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:third-party-jackson-dataformat-cbor:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:third-party-jackson-dataformat-cbor:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:third-party-jackson-dataformat-cbor:2.46.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath -software.amazon.awssdk:utils-lite:2.46.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:third-party-jackson-dataformat-cbor:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:utils-lite:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:utils:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath software.amazon.awssdk:utils:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:utils:2.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:utils:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:utils:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:utils:2.46.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:utils:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.eventstream:eventstream:1.0.1=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon:flow:1.7=compileClasspath,testCompileClasspath,testRuntimeClasspath empty=spotbugsPlugins diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sfn-2.0/gradle.lockfile b/dd-java-agent/instrumentation/aws-java/aws-java-sfn-2.0/gradle.lockfile index b322e160725..01e581d2017 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sfn-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sfn-2.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:aws-java:aws-java-sfn-2.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -28,7 +29,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepForkedTestRuntimeClasspath,latestDepTestR com.github.jnr:jnr-posix:3.1.22=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath @@ -163,45 +164,45 @@ org.tabletest:tabletest-parser:1.2.0=latestDepForkedTestCompileClasspath,latestD org.testcontainers:testcontainers:1.21.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.xmlresolver:xmlresolver:5.3.3=spotbugs software.amazon.awssdk:annotations:2.15.35=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:annotations:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:annotations:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:apache-client:2.15.35=testRuntimeClasspath -software.amazon.awssdk:apache5-client:2.46.9=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:apache5-client:2.46.15=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:auth:2.15.35=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:auth:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:auth:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-core:2.15.35=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:aws-core:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:aws-core:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-json-protocol:2.15.35=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:aws-json-protocol:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:checksums-spi:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:checksums:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:endpoints-spi:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:http-auth-aws-eventstream:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:http-auth-aws:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:http-auth-spi:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:http-auth:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:aws-json-protocol:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:checksums-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:checksums:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:endpoints-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws-eventstream:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-client-spi:2.15.35=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-client-spi:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:identity-spi:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:json-utils:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-client-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:identity-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:json-utils:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:metrics-spi:2.15.35=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:metrics-spi:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:metrics-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.15.35=testRuntimeClasspath -software.amazon.awssdk:netty-nio-client:2.46.9=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:netty-nio-client:2.46.15=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:profiles:2.15.35=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:profiles:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:profiles:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:protocol-core:2.15.35=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:protocol-core:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:protocol-core:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:regions:2.15.35=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:regions:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:retries-spi:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:retries:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:regions:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:retries-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:retries:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sdk-core:2.15.35=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:sdk-core:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:sdk-core:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sfn:2.15.35=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:sfn:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:third-party-jackson-core:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:utils-lite:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:sfn:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:third-party-jackson-core:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:utils-lite:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:utils:2.15.35=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:utils:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:utils:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.eventstream:eventstream:1.0.1=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath empty=spotbugsPlugins diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/gradle.lockfile b/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/gradle.lockfile index b78d1237b86..186e8b4c51e 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:aws-java:aws-java-sns-1.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -42,7 +43,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepForkedTestRuntimeClasspath,latestDepTestR com.github.jnr:jnr-posix:3.1.22=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/gradle.lockfile b/dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/gradle.lockfile index b2f183086d1..48082e375c8 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:aws-java:aws-java-sns-2.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -25,7 +26,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepForkedTestRuntimeClasspath,latestDepTestR com.github.jnr:jnr-posix:3.1.22=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath @@ -157,56 +158,56 @@ org.testcontainers:localstack:1.21.4=latestDepForkedTestCompileClasspath,latestD org.testcontainers:testcontainers:1.21.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.xmlresolver:xmlresolver:5.3.3=spotbugs software.amazon.awssdk:annotations:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:annotations:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:annotations:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:apache-client:2.25.40=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -software.amazon.awssdk:apache5-client:2.46.9=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:apache5-client:2.46.15=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:auth:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:auth:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:auth:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-core:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:aws-core:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:aws-core:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-json-protocol:2.25.40=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:aws-query-protocol:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:aws-query-protocol:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:aws-query-protocol:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:checksums-spi:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:checksums-spi:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:checksums-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:checksums:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:checksums:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:checksums:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:endpoints-spi:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:endpoints-spi:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:http-auth-aws-eventstream:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:endpoints-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws-eventstream:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth-aws:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth-aws:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth-spi:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth-spi:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-client-spi:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-client-spi:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-client-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:identity-spi:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:identity-spi:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:identity-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:json-utils:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:json-utils:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:json-utils:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:metrics-spi:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:metrics-spi:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:metrics-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.25.40=testRuntimeClasspath -software.amazon.awssdk:netty-nio-client:2.46.9=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:netty-nio-client:2.46.15=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:profiles:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:profiles:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:profiles:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:protocol-core:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:protocol-core:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:protocol-core:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:regions:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:regions:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:retries-spi:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:retries:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:regions:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:retries-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:retries:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sdk-core:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:sdk-core:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:sdk-core:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sns:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:sns:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:sns:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sqs:2.25.40=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:third-party-jackson-core:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:third-party-jackson-core:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:utils-lite:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:third-party-jackson-core:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:utils-lite:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:utils:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:utils:2.46.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:utils:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.eventstream:eventstream:1.0.1=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath empty=spotbugsPlugins diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/gradle.lockfile b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/gradle.lockfile index 671a49bdc63..a3fa192046f 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:aws-java:aws-java-sqs-1.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -45,7 +46,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepForkedTestRuntimeClasspath,latestDepTestR com.github.jnr:jnr-posix:3.1.22=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/gradle.lockfile b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/gradle.lockfile index 8cceb4978c5..c2e81fd7211 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:aws-java:aws-java-sqs-2.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -23,7 +24,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepForkedTestRuntimeClasspath,latestDepTestR com.github.jnr:jnr-posix:3.1.22=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/axis2-1.3/gradle.lockfile b/dd-java-agent/instrumentation/axis2-1.3/gradle.lockfile index 559feac81c7..5cb538e06e6 100644 --- a/dd-java-agent/instrumentation/axis2-1.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/axis2-1.3/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:axis2-1.3:dependencies --write-locks annogen:annogen:0.1.0=compileClasspath,testCompileClasspath,testRuntimeClasspath avalon-framework:avalon-framework:4.1.3=compileClasspath,testCompileClasspath,testRuntimeClasspath backport-util-concurrent:backport-util-concurrent:2.2=compileClasspath,testCompileClasspath,testRuntimeClasspath @@ -25,7 +26,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepForkedTestRuntimeClasspath,latestDepTestR com.github.jnr:jnr-posix:3.1.22=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/axway-api-7.5/gradle.lockfile b/dd-java-agent/instrumentation/axway-api-7.5/gradle.lockfile index 971ba344154..e7a7ec6f7cc 100644 --- a/dd-java-agent/instrumentation/axway-api-7.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/axway-api-7.5/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:axway-api-7.5:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/azure-functions-1.2.2/gradle.lockfile b/dd-java-agent/instrumentation/azure-functions-1.2.2/gradle.lockfile index cd709afc777..daa828b702e 100644 --- a/dd-java-agent/instrumentation/azure-functions-1.2.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/azure-functions-1.2.2/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:azure-functions-1.2.2:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/caffeine-1.0/gradle.lockfile b/dd-java-agent/instrumentation/caffeine-1.0/gradle.lockfile index 43ae920470d..b8814033727 100644 --- a/dd-java-agent/instrumentation/caffeine-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/caffeine-1.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:caffeine-1.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -23,7 +24,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/cdi-1.2/gradle.lockfile b/dd-java-agent/instrumentation/cdi-1.2/gradle.lockfile index 607bc7349ba..e3f285f6848 100644 --- a/dd-java-agent/instrumentation/cdi-1.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/cdi-1.2/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:cdi-1.2:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/cics-9.1/gradle.lockfile b/dd-java-agent/instrumentation/cics-9.1/gradle.lockfile index aab88290bb9..e1513d661cc 100644 --- a/dd-java-agent/instrumentation/cics-9.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/cics-9.1/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:cics-9.1:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/commons-codec-1.1/gradle.lockfile b/dd-java-agent/instrumentation/commons-codec-1.1/gradle.lockfile index 2d802b35fde..835dfe16b2b 100644 --- a/dd-java-agent/instrumentation/commons-codec-1.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/commons-codec-1.1/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:commons-codec-1.1:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,csiCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/commons-fileupload-1.5/gradle.lockfile b/dd-java-agent/instrumentation/commons-fileupload-1.5/gradle.lockfile index 37ced87a01d..b55046fbdb0 100644 --- a/dd-java-agent/instrumentation/commons-fileupload-1.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/commons-fileupload-1.5/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:commons-fileupload-1.5:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/commons-httpclient-2.0/gradle.lockfile b/dd-java-agent/instrumentation/commons-httpclient-2.0/gradle.lockfile index 499d1dfc33e..f5528118944 100644 --- a/dd-java-agent/instrumentation/commons-httpclient-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/commons-httpclient-2.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:commons-httpclient-2.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/commons-lang/commons-lang-2.1/gradle.lockfile b/dd-java-agent/instrumentation/commons-lang/commons-lang-2.1/gradle.lockfile index e8c58db2319..c6aaf370e94 100644 --- a/dd-java-agent/instrumentation/commons-lang/commons-lang-2.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/commons-lang/commons-lang-2.1/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:commons-lang:commons-lang-2.1:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,csiCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/commons-lang/commons-lang-3.5/gradle.lockfile b/dd-java-agent/instrumentation/commons-lang/commons-lang-3.5/gradle.lockfile index e61ce6cda0e..15d8c711773 100644 --- a/dd-java-agent/instrumentation/commons-lang/commons-lang-3.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/commons-lang/commons-lang-3.5/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:commons-lang:commons-lang-3.5:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,csiCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/commons-text-1.0/gradle.lockfile b/dd-java-agent/instrumentation/commons-text-1.0/gradle.lockfile index d208a452da0..1a60bf5e084 100644 --- a/dd-java-agent/instrumentation/commons-text-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/commons-text-1.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:commons-text-1.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,csiCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/confluent-schema-registry/confluent-schema-registry-4.1/gradle.lockfile b/dd-java-agent/instrumentation/confluent-schema-registry/confluent-schema-registry-4.1/gradle.lockfile index 32b0ce6d558..42dbd083070 100644 --- a/dd-java-agent/instrumentation/confluent-schema-registry/confluent-schema-registry-4.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/confluent-schema-registry/confluent-schema-registry-4.1/gradle.lockfile @@ -1,7 +1,8 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -at.yawk.lz4:lz4-java:1.10.1=latestDepTestRuntimeClasspath +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:confluent-schema-registry:confluent-schema-registry-4.1:dependencies --write-locks +at.yawk.lz4:lz4-java:1.10.2=latestDepTestRuntimeClasspath cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -16,18 +17,18 @@ com.datadoghq:java-dogstatsd-client:4.4.5=latestDepTestRuntimeClasspath,testRunt com.datadoghq:sketches-java:0.8.3=latestDepTestRuntimeClasspath,testRuntimeClasspath com.eclipsesource.minimal-json:minimal-json:0.9.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.14.2=testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-annotations:2.20=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.21=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.9.0=compileClasspath com.fasterxml.jackson.core:jackson-core:2.14.2=testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.21.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson.core:jackson-core:2.9.4=compileClasspath com.fasterxml.jackson.core:jackson-databind:2.14.2=testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-databind:2.20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.21.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson.core:jackson-databind:2.9.4=compileClasspath -com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.21.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.21.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson:jackson-bom:2.14.2=testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson:jackson-bom:2.20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.21.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc com.github.jnr:jffi:1.3.15=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-a64asm:1.0.0=latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -39,7 +40,7 @@ com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeC com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.luben:zstd-jni:1.5.2-1=testRuntimeClasspath com.github.luben:zstd-jni:1.5.6-10=latestDepTestRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath @@ -72,23 +73,25 @@ de.thetaphi:forbiddenapis:3.10=compileClasspath,latestDepTestCompileClasspath,la io.confluent:common-config:4.1.0=compileClasspath io.confluent:common-utils:4.1.0=compileClasspath io.confluent:common-utils:7.4.0=testCompileClasspath,testRuntimeClasspath -io.confluent:common-utils:8.2.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.confluent:common-utils:8.3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.confluent:kafka-avro-serializer:7.4.0=testCompileClasspath,testRuntimeClasspath -io.confluent:kafka-avro-serializer:8.2.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.confluent:kafka-avro-serializer:8.3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.confluent:kafka-avro-types:8.3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.confluent:kafka-schema-registry-client:4.1.0=compileClasspath io.confluent:kafka-schema-registry-client:7.4.0=testCompileClasspath,testRuntimeClasspath -io.confluent:kafka-schema-registry-client:8.2.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.confluent:kafka-schema-registry-client:8.3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.confluent:kafka-schema-serializer:7.4.0=testCompileClasspath,testRuntimeClasspath -io.confluent:kafka-schema-serializer:8.2.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.confluent:kafka-schema-serializer:8.3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.confluent:kafka-schema-types:8.3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.confluent:logredactor-metrics:1.0.11=testCompileClasspath,testRuntimeClasspath -io.confluent:logredactor-metrics:1.0.17=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.confluent:logredactor-metrics:1.0.18=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.confluent:logredactor:1.0.11=testCompileClasspath,testRuntimeClasspath -io.confluent:logredactor:1.0.17=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.confluent:logredactor:1.0.18=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.leangen.geantyref:geantyref:1.3.16=latestDepTestRuntimeClasspath,testRuntimeClasspath io.netty:netty:3.10.5.Final=compileClasspath io.sqreen:libsqreen:17.3.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.swagger.core.v3:swagger-annotations-jakarta:2.2.42=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.swagger.core.v3:swagger-annotations:2.1.10=testCompileClasspath,testRuntimeClasspath -io.swagger.core.v3:swagger-annotations:2.2.29=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.0=spotbugs jline:jline:0.9.94=compileClasspath @@ -116,7 +119,7 @@ org.apache.httpcomponents.core5:httpcore5-h2:5.3.4=latestDepTestCompileClasspath org.apache.httpcomponents.core5:httpcore5:5.3.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.kafka:kafka-clients:1.1.0-cp1=compileClasspath org.apache.kafka:kafka-clients:7.4.0-ccs=testCompileClasspath,testRuntimeClasspath -org.apache.kafka:kafka-clients:8.2.1-ccs=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.kafka:kafka-clients:8.3.0-ccs=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.logging.log4j:log4j-api:2.25.2=spotbugs org.apache.logging.log4j:log4j-core:2.25.2=spotbugs org.apache.zookeeper:zookeeper:3.4.10=compileClasspath diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-2.0/gradle.lockfile b/dd-java-agent/instrumentation/couchbase/couchbase-2.0/gradle.lockfile index 17e55d6f3d6..6e79f9f0c25 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/couchbase/couchbase-2.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:couchbase:couchbase-2.0:dependencies --write-locks aopalliance:aopalliance:1.0=testCompileClasspath,testRuntimeClasspath cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -36,7 +37,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-2.6/gradle.lockfile b/dd-java-agent/instrumentation/couchbase/couchbase-2.6/gradle.lockfile index 4c3c97bae46..2d28514292c 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-2.6/gradle.lockfile +++ b/dd-java-agent/instrumentation/couchbase/couchbase-2.6/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:couchbase:couchbase-2.6:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -36,7 +37,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/gradle.lockfile b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/gradle.lockfile index c6606b814e0..0c93ff80195 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:couchbase:couchbase-3.1:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -29,7 +30,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/gradle.lockfile b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/gradle.lockfile index c0145dd26a3..53c00a52f90 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:couchbase:couchbase-3.2:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -29,7 +30,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/cucumber-5.4/gradle.lockfile b/dd-java-agent/instrumentation/cucumber-5.4/gradle.lockfile index d592fbcee4c..eaeeb1b3d4a 100644 --- a/dd-java-agent/instrumentation/cucumber-5.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/cucumber-5.4/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:cucumber-5.4:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/cxf-2.1/gradle.lockfile b/dd-java-agent/instrumentation/cxf-2.1/gradle.lockfile index b2887d8b26b..da95c724354 100644 --- a/dd-java-agent/instrumentation/cxf-2.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/cxf-2.1/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:cxf-2.1:dependencies --write-locks aopalliance:aopalliance:1.0=compileClasspath cafe.cryptography:curve25519-elisabeth:0.1.0=cxf3LatestDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=cxf3LatestDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -24,7 +25,7 @@ com.github.jnr:jnr-ffi:2.2.19=cxf3LatestDepTestRuntimeClasspath,latestDepTestRun com.github.jnr:jnr-posix:3.1.22=cxf3LatestDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=cxf3LatestDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=cxf3LatestDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,cxf3LatestDepTestAnnotationProcessor,cxf3LatestDepTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/gradle.lockfile b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/gradle.lockfile index e0503dda8df..4a923f0802b 100644 --- a/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/gradle.lockfile +++ b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:datadog:asm:iast-instrumenter:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/datadog/dynamic-instrumentation/span-origin/gradle.lockfile b/dd-java-agent/instrumentation/datadog/dynamic-instrumentation/span-origin/gradle.lockfile index 971ba344154..e2b24789cc3 100644 --- a/dd-java-agent/instrumentation/datadog/dynamic-instrumentation/span-origin/gradle.lockfile +++ b/dd-java-agent/instrumentation/datadog/dynamic-instrumentation/span-origin/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:datadog:dynamic-instrumentation:span-origin:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/datadog/profiling/enable-wallclock-profiling/gradle.lockfile b/dd-java-agent/instrumentation/datadog/profiling/enable-wallclock-profiling/gradle.lockfile index 28393e8683e..bd07e49353a 100644 --- a/dd-java-agent/instrumentation/datadog/profiling/enable-wallclock-profiling/gradle.lockfile +++ b/dd-java-agent/instrumentation/datadog/profiling/enable-wallclock-profiling/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:datadog:profiling:enable-wallclock-profiling:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDep4TestRuntimeClasspath,latestDepTestRuntim com.github.jnr:jnr-posix:3.1.22=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDep4TestAnnotationProcessor,latestDep4TestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/gradle.lockfile b/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/gradle.lockfile index 88d2be9c54c..230a7e3c023 100644 --- a/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/gradle.lockfile +++ b/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:datadog:profiling:exception-profiling:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/gradle.lockfile b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/gradle.lockfile index 729aa3588f8..4ccefb3427a 100644 --- a/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/gradle.lockfile +++ b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:datadog:tracing:trace-annotation:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/datanucleus-4.0.5/gradle.lockfile b/dd-java-agent/instrumentation/datanucleus-4.0.5/gradle.lockfile index 1585fc03e34..58345d72f71 100644 --- a/dd-java-agent/instrumentation/datanucleus-4.0.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/datanucleus-4.0.5/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:datanucleus-4.0.5:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/gradle.lockfile b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/gradle.lockfile index e4b776aa72c..993c1bfe2b1 100644 --- a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:datastax-cassandra:datastax-cassandra-3.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -37,7 +38,7 @@ com.github.jnr:jnr-posix:3.0.44=latestDepTestCompileClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.8/gradle.lockfile b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.8/gradle.lockfile index d0fba3a2602..e01647c5a71 100644 --- a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.8/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:datastax-cassandra:datastax-cassandra-3.8:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -34,7 +35,7 @@ com.github.jnr:jnr-posix:3.0.44=compileClasspath,latestDepTestCompileClasspath,t com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/gradle.lockfile b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/gradle.lockfile index bf516ba9bb7..edad5aa7e3f 100644 --- a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:datastax-cassandra:datastax-cassandra-4.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -48,7 +49,8 @@ com.github.jnr:jnr-posix:3.1.15=latestDepTestCompileClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:3.1.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/drools/drools-6.0/gradle.lockfile b/dd-java-agent/instrumentation/drools/drools-6.0/gradle.lockfile index cd861e82879..e6ef6242aed 100644 --- a/dd-java-agent/instrumentation/drools/drools-6.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/drools/drools-6.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:drools:drools-6.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latest7TestRuntimeClasspath,latest8TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latest7TestRuntimeClasspath,latest8TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latest7TestCompileClasspath,latest7TestRuntimeClasspath,latest8TestCompileClasspath,latest8TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latest7TestRuntimeClasspath,latest8TestRuntimeClas com.github.jnr:jnr-posix:3.1.22=latest7TestRuntimeClasspath,latest8TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latest7TestRuntimeClasspath,latest8TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latest7TestRuntimeClasspath,latest8TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latest7TestCompileClasspath,latest7TestRuntimeClasspath,latest8TestCompileClasspath,latest8TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latest7TestAnnotationProcessor,latest7TestCompileClasspath,latest8TestAnnotationProcessor,latest8TestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/dropwizard/dropwizard-0.8/gradle.lockfile b/dd-java-agent/instrumentation/dropwizard/dropwizard-0.8/gradle.lockfile index 47a1db7bba4..cb9265244ea 100644 --- a/dd-java-agent/instrumentation/dropwizard/dropwizard-0.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/dropwizard/dropwizard-0.8/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:dropwizard:dropwizard-0.8:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -33,7 +34,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/dropwizard/dropwizard-views-0.7/gradle.lockfile b/dd-java-agent/instrumentation/dropwizard/dropwizard-views-0.7/gradle.lockfile index 1efc828be14..86a4c640ef8 100644 --- a/dd-java-agent/instrumentation/dropwizard/dropwizard-views-0.7/gradle.lockfile +++ b/dd-java-agent/instrumentation/dropwizard/dropwizard-views-0.7/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:dropwizard:dropwizard-views-0.7:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.1.1=compileClasspath @@ -43,7 +44,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.spullara.mustache.java:compiler:0.8.14=testCompileClasspath,testRuntimeClasspath com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-common/gradle.lockfile b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-common/gradle.lockfile index eb857aa6028..e936c9c5507 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-common/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:elasticsearch:elasticsearch-common:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -26,7 +27,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-5.0/gradle.lockfile b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-5.0/gradle.lockfile index 167d5e57bc7..50364120e7e 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-5.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-5.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:elasticsearch:elasticsearch-rest:elasticsearch-rest-5.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -30,7 +31,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-6.4/gradle.lockfile b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-6.4/gradle.lockfile index 04f97630af3..28df52c42bc 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-6.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-6.4/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:elasticsearch:elasticsearch-rest:elasticsearch-rest-6.4:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -30,7 +31,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.spullara.mustache.java:compiler:0.9.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-7.0/gradle.lockfile b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-7.0/gradle.lockfile index 2d07047a045..999e2bcb1a5 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-7.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-7.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:elasticsearch:elasticsearch-rest:elasticsearch-rest-7.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -31,7 +32,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.spullara.mustache.java:compiler:0.9.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-2.0/gradle.lockfile b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-2.0/gradle.lockfile index b5b724f97e7..22d68fceaa1 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-2.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:elasticsearch:elasticsearch-transport:elasticsearch-transport-2.0:dependencies --write-locks aopalliance:aopalliance:1.0=testCompileClasspath,testRuntimeClasspath cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -37,7 +38,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.0/gradle.lockfile b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.0/gradle.lockfile index 5a45ff8cf6e..25548b59053 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:elasticsearch:elasticsearch-transport:elasticsearch-transport-5.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -26,7 +27,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.spullara.mustache.java:compiler:0.9.3=compileClasspath,testCompileClasspath,testRuntimeClasspath com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.3/gradle.lockfile b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.3/gradle.lockfile index 707b9d8f9f2..f77c7bcfbcd 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.3/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:elasticsearch:elasticsearch-transport:elasticsearch-transport-5.3:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -31,7 +32,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.spullara.mustache.java:compiler:0.9.3=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-6.0/gradle.lockfile b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-6.0/gradle.lockfile index abb1942fd09..1ae5d7d9ab3 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-6.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-6.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:elasticsearch:elasticsearch-transport:elasticsearch-transport-6.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -30,7 +31,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.spullara.mustache.java:compiler:0.9.3=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-7.3/gradle.lockfile b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-7.3/gradle.lockfile index 6e9f8afce97..483cfbe82a2 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-7.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-7.3/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:elasticsearch:elasticsearch-transport:elasticsearch-transport-7.3:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -30,7 +31,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.spullara.mustache.java:compiler:0.9.3=compileClasspath,testCompileClasspath,testRuntimeClasspath com.github.spullara.mustache.java:compiler:0.9.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-common/gradle.lockfile b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-common/gradle.lockfile index b20c7641be2..f29a5634f57 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-common/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:elasticsearch:elasticsearch-transport:elasticsearch-transport-common:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -26,7 +27,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.spullara.mustache.java:compiler:0.9.3=compileClasspath com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs diff --git a/dd-java-agent/instrumentation/finatra-2.9/gradle.lockfile b/dd-java-agent/instrumentation/finatra-2.9/gradle.lockfile index 9d91bdd5ec1..f4c89585fdf 100644 --- a/dd-java-agent/instrumentation/finatra-2.9/gradle.lockfile +++ b/dd-java-agent/instrumentation/finatra-2.9/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:finatra-2.9:dependencies --write-locks aopalliance:aopalliance:1.0=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPre207TestCompileClasspath,latestPre207TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,latestPre207TestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,latestPre207TestRuntimeClasspath,testRuntimeClasspath @@ -49,7 +50,7 @@ com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,latestPre207 com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,latestPre207TestRuntimeClasspath,testRuntimeClasspath com.github.nscala-time:nscala-time_2.11:2.14.0=compileClasspath,latestPre207TestCompileClasspath,latestPre207TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.nscala-time:nscala-time_2.11:2.22.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPre207TestCompileClasspath,latestPre207TestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.spullara.mustache.java:compiler:0.8.18=compileClasspath com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs diff --git a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/gradle.lockfile b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/gradle.lockfile index 68ec6408332..cd9bff8ec38 100644 --- a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/gradle.lockfile +++ b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:freemarker:freemarker-2.3.24:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,csiCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.9/gradle.lockfile b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.9/gradle.lockfile index 7b00791963e..7cead51b31d 100644 --- a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.9/gradle.lockfile +++ b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.9/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:freemarker:freemarker-2.3.9:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath,version2_3_23TestRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath,version2_3_23TestRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath,version2_3_23TestCompileClasspath,version2_3_23TestRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath,version2_3_23TestRuntimeClass com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath,version2_3_23TestRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath,version2_3_23TestRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath,version2_3_23TestRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath,version2_3_23TestCompileClasspath,version2_3_23TestRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath,version2_3_23TestAnnotationProcessor,version2_3_23TestCompileClasspath diff --git a/dd-java-agent/instrumentation/gax-1.4/gradle.lockfile b/dd-java-agent/instrumentation/gax-1.4/gradle.lockfile new file mode 100644 index 00000000000..416a306cb64 --- /dev/null +++ b/dd-java-agent/instrumentation/gax-1.4/gradle.lockfile @@ -0,0 +1,160 @@ +# This is a Gradle generated file for dependency locking. +# Manual edits can break the build and are not advised. +# This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:gax-1.4:dependencies --write-locks +cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq.okhttp3:okhttp:3.12.15=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq.okio:okio:1.17.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:java-dogstatsd-client:4.4.5=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.datadoghq:sketches-java:0.8.3=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.1.3=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.github.javaparser:javaparser-core:3.25.6=codenarc +com.github.jnr:jffi:1.3.15=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-a64asm:1.0.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-constants:0.10.4=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-enxio:0.32.20=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.9.8=spotbugs +com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs +com.google.api.grpc:proto-google-common-protos:2.72.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.api:api-common:1.1.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:api-common:2.64.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.api:gax:1.4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:gax:2.81.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.auth:google-auth-library-credentials:0.7.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-credentials:1.48.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.auth:google-auth-library-oauth2-http:0.7.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-oauth2-http:1.48.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath +com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.auto.value:auto-value-annotations:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.auto.value:auto-value:1.2=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auto:auto-common:1.2.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +com.google.code.gson:gson:2.13.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs +com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.48.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.guava:guava:19.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.5.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor +com.google.http-client:google-http-client-gson:2.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.http-client:google-http-client-jackson2:1.19.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.http-client:google-http-client:1.19.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.http-client:google-http-client:2.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.protobuf:protobuf-java-util:4.33.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.protobuf:protobuf-java:4.33.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.squareup.okio:okio:1.17.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.thoughtworks.qdox:qdox:1.12.1=codenarc +commons-codec:commons-codec:1.11=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +commons-codec:commons-codec:1.3=compileClasspath,testCompileClasspath,testRuntimeClasspath +commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-io:commons-io:2.20.0=spotbugs +commons-logging:commons-logging:1.1.1=compileClasspath,testCompileClasspath,testRuntimeClasspath +de.thetaphi:forbiddenapis:3.10=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-api:1.81.0=latestDepTestRuntimeClasspath +io.grpc:grpc-context:1.70.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.leangen.geantyref:geantyref:1.3.16=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.opencensus:opencensus-api:0.31.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.opencensus:opencensus-contrib-http-util:0.31.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.sqreen:libsqreen:17.3.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +javax.annotation:javax.annotation-api:1.3.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +jaxen:jaxen:2.0.0=spotbugs +junit:junit:4.13.2=latestDepTestRuntimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.java.dev.jna:jna-platform:5.8.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +net.java.dev.jna:jna:5.8.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +net.sf.saxon:Saxon-HE:12.9=spotbugs +org.apache.ant:ant-antlr:1.10.14=codenarc +org.apache.ant:ant-junit:1.10.14=codenarc +org.apache.bcel:bcel:6.11.0=spotbugs +org.apache.commons:commons-lang3:3.19.0=spotbugs +org.apache.commons:commons-text:1.14.0=spotbugs +org.apache.httpcomponents:httpclient:4.0.1=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.httpcomponents:httpclient:4.5.14=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.httpcomponents:httpcore:4.0.1=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.httpcomponents:httpcore:4.4.16=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.logging.log4j:log4j-api:2.25.2=spotbugs +org.apache.logging.log4j:log4j-core:2.25.2=spotbugs +org.apiguardian:apiguardian-api:1.1.2=latestDepTestCompileClasspath,testCompileClasspath +org.checkerframework:checker-qual:3.33.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +org.codehaus.groovy:groovy-ant:3.0.23=codenarc +org.codehaus.groovy:groovy-docgenerator:3.0.23=codenarc +org.codehaus.groovy:groovy-groovydoc:3.0.23=codenarc +org.codehaus.groovy:groovy-json:3.0.23=codenarc +org.codehaus.groovy:groovy-json:3.0.25=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-templates:3.0.23=codenarc +org.codehaus.groovy:groovy-xml:3.0.23=codenarc +org.codehaus.groovy:groovy:3.0.23=codenarc +org.codehaus.groovy:groovy:3.0.25=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codenarc:CodeNarc:3.7.0=codenarc +org.dom4j:dom4j:2.2.0=spotbugs +org.gmetrics:GMetrics:2.1.0=codenarc +org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-launcher:1.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-suite-api:1.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-suite-commons:1.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.junit:junit-bom:5.14.0=spotbugs +org.junit:junit-bom:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.mockito:mockito-core:4.4.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.objenesis:objenesis:3.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.opentest4j:opentest4j:1.3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.ow2.asm:asm-analysis:9.7.1=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.ow2.asm:asm-analysis:9.9=spotbugs +org.ow2.asm:asm-commons:9.9=spotbugs +org.ow2.asm:asm-commons:9.9.1=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.ow2.asm:asm-tree:9.9=spotbugs +org.ow2.asm:asm-tree:9.9.1=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.ow2.asm:asm-util:9.7.1=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.ow2.asm:asm-util:9.9=spotbugs +org.ow2.asm:asm:9.9=spotbugs +org.ow2.asm:asm:9.9.1=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:jcl-over-slf4j:1.7.30=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:jul-to-slf4j:1.7.30=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:log4j-over-slf4j:1.7.30=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:1.7.30=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath +org.slf4j:slf4j-api:1.7.32=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:2.0.17=spotbugs,spotbugsSlf4j +org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j +org.snakeyaml:snakeyaml-engine:2.9=buildTimeInstrumentationPlugin,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath +org.spockframework:spock-bom:2.4-groovy-3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.spockframework:spock-core:2.4-groovy-3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.tabletest:tabletest-junit:1.2.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.tabletest:tabletest-parser:1.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.threeten:threetenbp:1.3.3=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.threeten:threetenbp:1.7.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.xmlresolver:xmlresolver:5.3.3=spotbugs +empty=spotbugsPlugins diff --git a/dd-java-agent/instrumentation/glassfish-3.0/gradle.lockfile b/dd-java-agent/instrumentation/glassfish-3.0/gradle.lockfile index c22f6507f61..629e401c02e 100644 --- a/dd-java-agent/instrumentation/glassfish-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/glassfish-3.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:glassfish-3.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/google-http-client-1.19/gradle.lockfile b/dd-java-agent/instrumentation/google-http-client-1.19/gradle.lockfile index eae92cc27ee..fd5f09fe253 100644 --- a/dd-java-agent/instrumentation/google-http-client-1.19/gradle.lockfile +++ b/dd-java-agent/instrumentation/google-http-client-1.19/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:google-http-client-1.19:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/google-pubsub-1.116/gradle.lockfile b/dd-java-agent/instrumentation/google-pubsub-1.116/gradle.lockfile index f9659003ac8..ba197d81c00 100644 --- a/dd-java-agent/instrumentation/google-pubsub-1.116/gradle.lockfile +++ b/dd-java-agent/instrumentation/google-pubsub-1.116/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:google-pubsub-1.116:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -25,7 +26,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepForkedTestRuntimeClasspath,latestDepTestR com.github.jnr:jnr-posix:3.1.22=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.android:annotations:4.1.1.4=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/graal/graal-native-image-20.0/gradle.lockfile b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/gradle.lockfile index 67ee525b34b..51e74efac14 100644 --- a/dd-java-agent/instrumentation/graal/graal-native-image-20.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:graal:graal-native-image-20.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/graal/gradle.lockfile b/dd-java-agent/instrumentation/graal/gradle.lockfile index 971ba344154..279033df922 100644 --- a/dd-java-agent/instrumentation/graal/gradle.lockfile +++ b/dd-java-agent/instrumentation/graal/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:graal:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/gradle-testing-5.1/gradle.lockfile b/dd-java-agent/instrumentation/gradle-testing-5.1/gradle.lockfile index 971ba344154..f34a741b09b 100644 --- a/dd-java-agent/instrumentation/gradle-testing-5.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/gradle-testing-5.1/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:gradle-testing-5.1:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/gradle.lockfile b/dd-java-agent/instrumentation/gradle.lockfile index 8bbea56ab70..04fdef43cef 100644 --- a/dd-java-agent/instrumentation/gradle.lockfile +++ b/dd-java-agent/instrumentation/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=runtimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=runtimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=runtimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/gradle/gradle-3.0/gradle.lockfile b/dd-java-agent/instrumentation/gradle/gradle-3.0/gradle.lockfile index 971ba344154..376a3b8fbce 100644 --- a/dd-java-agent/instrumentation/gradle/gradle-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/gradle/gradle-3.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:gradle:gradle-3.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/gradle/gradle-8.3/gradle.lockfile b/dd-java-agent/instrumentation/gradle/gradle-8.3/gradle.lockfile index 971ba344154..ff6a125ed10 100644 --- a/dd-java-agent/instrumentation/gradle/gradle-8.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/gradle/gradle-8.3/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:gradle:gradle-8.3:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/gradle.lockfile b/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/gradle.lockfile index 868c17d075b..c9871da1ed9 100644 --- a/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:graphql-java:graphql-java-14.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepForkedTestRuntimeClasspath,latestDepTestR com.github.jnr:jnr-posix:3.1.22=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/gradle.lockfile b/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/gradle.lockfile index aca0920d155..b2b82e75b8b 100644 --- a/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:graphql-java:graphql-java-20.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=graphql20LatestDepForkedTestCompileClasspath,graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestCompileClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestCompileClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestCompileClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=graphql20LatestDepForkedTestRuntimeClasspath,graph com.github.jnr:jnr-posix:3.1.22=graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,graphql20LatestDepForkedTestCompileClasspath,graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestCompileClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestCompileClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestCompileClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,graphql20LatestDepForkedTestAnnotationProcessor,graphql20LatestDepForkedTestCompileClasspath,graphql20LatestDepTestAnnotationProcessor,graphql20LatestDepTestCompileClasspath,graphql21LatestDepForkedTestAnnotationProcessor,graphql21LatestDepForkedTestCompileClasspath,graphql21LatestDepTestAnnotationProcessor,graphql21LatestDepTestCompileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-common/gradle.lockfile b/dd-java-agent/instrumentation/graphql-java/graphql-java-common/gradle.lockfile index f04f28765d3..586b7d5468f 100644 --- a/dd-java-agent/instrumentation/graphql-java/graphql-java-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/graphql-java/graphql-java-common/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:graphql-java:graphql-java-common:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-2.0/gradle.lockfile b/dd-java-agent/instrumentation/grizzly/grizzly-2.0/gradle.lockfile index b55a5631bb0..d2d6c4233ce 100644 --- a/dd-java-agent/instrumentation/grizzly/grizzly-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/grizzly/grizzly-2.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:grizzly:grizzly-2.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/gradle.lockfile b/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/gradle.lockfile index eb2eaf85855..f0e68ef1a1c 100644 --- a/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/gradle.lockfile +++ b/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:grizzly:grizzly-client-1.9:dependencies --write-locks biz.aQute.bnd:biz.aQute.bnd.annotation:7.1.0=latest5DepTestCompileClasspath cafe.cryptography:curve25519-elisabeth:0.1.0=latest5DepTestRuntimeClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latest5DepTestRuntimeClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestRuntimeClasspath,testRuntimeClasspath @@ -22,7 +23,7 @@ com.github.jnr:jnr-ffi:2.2.19=latest5DepTestRuntimeClasspath,latestDepTestRuntim com.github.jnr:jnr-posix:3.1.22=latest5DepTestRuntimeClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latest5DepTestRuntimeClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latest5DepTestRuntimeClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latest5DepTestCompileClasspath,latest5DepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latest5DepTestAnnotationProcessor,latest5DepTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,muleLatestDepTestAnnotationProcessor,muleLatestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/gradle.lockfile b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/gradle.lockfile index d50004d736c..9cc7c809f1f 100644 --- a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/gradle.lockfile +++ b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:grizzly:grizzly-http-2.3.20:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/grpc-1.5/gradle.lockfile b/dd-java-agent/instrumentation/grpc-1.5/gradle.lockfile index 92e68f1a608..9fe969c021e 100644 --- a/dd-java-agent/instrumentation/grpc-1.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/grpc-1.5/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:grpc-1.5:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestCompileProtoPath,latestDepTestRuntime com.github.jnr:jnr-posix:3.1.22=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,compileProtoPath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,compileProtoPath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.android:annotations:4.1.1.4=compileProtoPath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/gson-1.6/gradle.lockfile b/dd-java-agent/instrumentation/gson-1.6/gradle.lockfile index 7fb52880515..e25f723a7aa 100644 --- a/dd-java-agent/instrumentation/gson-1.6/gradle.lockfile +++ b/dd-java-agent/instrumentation/gson-1.6/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:gson-1.6:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/guava-10.0/gradle.lockfile b/dd-java-agent/instrumentation/guava-10.0/gradle.lockfile index fdd32934dfd..245364ab566 100644 --- a/dd-java-agent/instrumentation/guava-10.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/guava-10.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:guava-10.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/gradle.lockfile b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/gradle.lockfile index cd367272f6f..f59489465d6 100644 --- a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/gradle.lockfile +++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:hazelcast:hazelcast-3.6:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/gradle.lockfile b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/gradle.lockfile index c2d34650bd4..2c1676a5e39 100644 --- a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/gradle.lockfile +++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:hazelcast:hazelcast-3.9:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/gradle.lockfile b/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/gradle.lockfile index 0001d8d5267..e45b5264934 100644 --- a/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:hazelcast:hazelcast-4.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-common/gradle.lockfile b/dd-java-agent/instrumentation/hibernate/hibernate-common/gradle.lockfile index 971ba344154..3393267c109 100644 --- a/dd-java-agent/instrumentation/hibernate/hibernate-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/hibernate/hibernate-common/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:hibernate:hibernate-common:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/gradle.lockfile b/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/gradle.lockfile index 76381b2ada7..c670b30fbe6 100644 --- a/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:hibernate:hibernate-core-3.3:dependencies --write-locks antlr:antlr:2.7.6=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -22,7 +23,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/gradle.lockfile b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/gradle.lockfile index ff53e27002c..0188fefe2dc 100644 --- a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:hibernate:hibernate-core-4.0:dependencies --write-locks antlr:antlr:2.7.7=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -23,7 +24,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.3/gradle.lockfile b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.3/gradle.lockfile index f34479968d2..b40fe254ed3 100644 --- a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.3/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:hibernate:hibernate-core-4.3:dependencies --write-locks antlr:antlr:2.7.7=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath aopalliance:aopalliance:1.0=testCompileClasspath,testRuntimeClasspath cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -23,7 +24,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/hystrix-1.4/gradle.lockfile b/dd-java-agent/instrumentation/hystrix-1.4/gradle.lockfile index bc4660b9571..07cb77e00b8 100644 --- a/dd-java-agent/instrumentation/hystrix-1.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/hystrix-1.4/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:hystrix-1.4:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/ignite-2.0/gradle.lockfile b/dd-java-agent/instrumentation/ignite-2.0/gradle.lockfile index 016b2521b35..2cb202835df 100644 --- a/dd-java-agent/instrumentation/ignite-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/ignite-2.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:ignite-2.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=ignite216ForkedTestRuntimeClasspath,ignite216TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=ignite216ForkedTestRuntimeClasspath,ignite216TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=ignite216ForkedTestCompileClasspath,ignite216ForkedTestRuntimeClasspath,ignite216TestCompileClasspath,ignite216TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=ignite216ForkedTestRuntimeClasspath,ignite216TestR com.github.jnr:jnr-posix:3.1.22=ignite216ForkedTestRuntimeClasspath,ignite216TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=ignite216ForkedTestRuntimeClasspath,ignite216TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=ignite216ForkedTestRuntimeClasspath,ignite216TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,ignite216ForkedTestCompileClasspath,ignite216ForkedTestRuntimeClasspath,ignite216TestCompileClasspath,ignite216TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,ignite216ForkedTestAnnotationProcessor,ignite216ForkedTestCompileClasspath,ignite216TestAnnotationProcessor,ignite216TestCompileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-1.9.13/gradle.lockfile b/dd-java-agent/instrumentation/jackson-core/jackson-core-1.9.13/gradle.lockfile index 6a3751874a4..0ba4b1ffe0f 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-1.9.13/gradle.lockfile +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-1.9.13/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:jackson-core:jackson-core-1.9.13:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.0/gradle.lockfile b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.0/gradle.lockfile index e83ee2940e4..ac3291bce8a 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:jackson-core:jackson-core-2.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -27,7 +28,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.12/gradle.lockfile b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.12/gradle.lockfile index 10e688c3e4a..60fde8bb904 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.12/gradle.lockfile +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.12/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:jackson-core:jackson-core-2.12:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -29,7 +30,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/gradle.lockfile b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/gradle.lockfile index a4090241a80..75518bcd493 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/gradle.lockfile +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:jackson-core:jackson-core-2.16:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -29,7 +30,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.6/gradle.lockfile b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.6/gradle.lockfile index b551dbe2087..80ca708e537 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.6/gradle.lockfile +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.6/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:jackson-core:jackson-core-2.6:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -27,7 +28,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.8/gradle.lockfile b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.8/gradle.lockfile index 6bc5ab908f6..c988591dd4f 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.8/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:jackson-core:jackson-core-2.8:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -27,7 +28,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-common/gradle.lockfile b/dd-java-agent/instrumentation/jackson-core/jackson-core-common/gradle.lockfile index 04fa262be69..cf9ffbf4727 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-common/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:jackson-core:jackson-core-common:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -29,7 +30,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/jacoco-0.8.9/gradle.lockfile b/dd-java-agent/instrumentation/jacoco-0.8.9/gradle.lockfile index 9706546c0b7..2c7d8286358 100644 --- a/dd-java-agent/instrumentation/jacoco-0.8.9/gradle.lockfile +++ b/dd-java-agent/instrumentation/jacoco-0.8.9/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:jacoco-0.8.9:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/gradle.lockfile b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/gradle.lockfile index 18c70d5b546..1f13b3eca4e 100644 --- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:java:java-concurrent:java-concurrent-1.8:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/gradle.lockfile b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/gradle.lockfile index e2a7dd634e2..21f4bb280bf 100644 --- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:java:java-concurrent:java-concurrent-21.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=previewTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=previewTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=previewTestCompileClasspath,testCompileClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=previewTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=previewTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=previewTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=previewTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,previewTestCompileClasspath,previewTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,previewTestAnnotationProcessor,previewTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-25.0/gradle.lockfile b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-25.0/gradle.lockfile index 9a6c1dfa056..070509e7df3 100644 --- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-25.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-25.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:java:java-concurrent:java-concurrent-25.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/java/java-io-1.8/gradle.lockfile b/dd-java-agent/instrumentation/java/java-io-1.8/gradle.lockfile index 8c0eeaf9a26..7a204bbb387 100644 --- a/dd-java-agent/instrumentation/java/java-io-1.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-io-1.8/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:java:java-io-1.8:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=java11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=java11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=java11TestCompileClasspath,java11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=java11TestRuntimeClasspath,latestDepTestRuntimeCla com.github.jnr:jnr-posix:3.1.22=java11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=java11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=java11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,java11TestCompileClasspath,java11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,csiCompileClasspath,java11TestAnnotationProcessor,java11TestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/gradle.lockfile b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/gradle.lockfile index 288e398687b..d1a5c8826d2 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:java:java-lang:java-lang-1.8:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,csiCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-11.0/gradle.lockfile b/dd-java-agent/instrumentation/java/java-lang/java-lang-11.0/gradle.lockfile index 243f87a0f2c..082e7831fdf 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-11.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-11.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:java:java-lang:java-lang-11.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,csiCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/gradle.lockfile b/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/gradle.lockfile index d9553b08c84..174cd83af29 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:java:java-lang:java-lang-15.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -22,7 +23,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,csiCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-17.0/gradle.lockfile b/dd-java-agent/instrumentation/java/java-lang/java-lang-17.0/gradle.lockfile index 243f87a0f2c..ac739abd599 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-17.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-17.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:java:java-lang:java-lang-17.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,csiCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/gradle.lockfile b/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/gradle.lockfile index 9a6c1dfa056..6ae7dcd9150 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:java:java-lang:java-lang-21.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/gradle.lockfile b/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/gradle.lockfile index 4c639d9e911..164acb3e9fd 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:java:java-lang:java-lang-22.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/gradle.lockfile b/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/gradle.lockfile index 243f87a0f2c..353b1eec14e 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:java:java-lang:java-lang-9.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,csiCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-classloading-1.8/gradle.lockfile b/dd-java-agent/instrumentation/java/java-lang/java-lang-classloading-1.8/gradle.lockfile index b297a8318ab..373f92bfc11 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-classloading-1.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-classloading-1.8/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:java:java-lang:java-lang-classloading-1.8:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=classloadingJbossTestRuntimeClasspath,classloadingJsr14TestRuntimeClasspath,classloadingOsgiTestRuntimeClasspath,classloadingTomcatLatestDepTestRuntimeClasspath,classloadingTomcatTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=classloadingJbossTestRuntimeClasspath,classloadingJsr14TestRuntimeClasspath,classloadingOsgiTestRuntimeClasspath,classloadingTomcatLatestDepTestRuntimeClasspath,classloadingTomcatTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=classloadingJbossTestCompileClasspath,classloadingJbossTestRuntimeClasspath,classloadingJsr14TestCompileClasspath,classloadingJsr14TestRuntimeClasspath,classloadingOsgiTestCompileClasspath,classloadingOsgiTestRuntimeClasspath,classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath,classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=classloadingJbossTestRuntimeClasspath,classloading com.github.jnr:jnr-posix:3.1.22=classloadingJbossTestRuntimeClasspath,classloadingJsr14TestRuntimeClasspath,classloadingOsgiTestRuntimeClasspath,classloadingTomcatLatestDepTestRuntimeClasspath,classloadingTomcatTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=classloadingJbossTestRuntimeClasspath,classloadingJsr14TestRuntimeClasspath,classloadingOsgiTestRuntimeClasspath,classloadingTomcatLatestDepTestRuntimeClasspath,classloadingTomcatTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=classloadingJbossTestRuntimeClasspath,classloadingJsr14TestRuntimeClasspath,classloadingOsgiTestRuntimeClasspath,classloadingTomcatLatestDepTestRuntimeClasspath,classloadingTomcatTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=classloadingJbossTestCompileClasspath,classloadingJbossTestRuntimeClasspath,classloadingJsr14TestCompileClasspath,classloadingJsr14TestRuntimeClasspath,classloadingOsgiTestCompileClasspath,classloadingOsgiTestRuntimeClasspath,classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath,classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath,compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,classloadingJbossTestAnnotationProcessor,classloadingJbossTestCompileClasspath,classloadingJsr14TestAnnotationProcessor,classloadingJsr14TestCompileClasspath,classloadingOsgiTestAnnotationProcessor,classloadingOsgiTestCompileClasspath,classloadingTomcatLatestDepTestAnnotationProcessor,classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatTestAnnotationProcessor,classloadingTomcatTestCompileClasspath,compileClasspath,testAnnotationProcessor,testCompileClasspath @@ -64,28 +65,28 @@ org.apache.commons:commons-text:1.14.0=spotbugs org.apache.felix:org.apache.felix.framework:6.0.2=classloadingOsgiTestCompileClasspath,classloadingOsgiTestRuntimeClasspath org.apache.logging.log4j:log4j-api:2.25.2=spotbugs org.apache.logging.log4j:log4j-core:2.25.2=spotbugs -org.apache.tomcat:tomcat-annotations-api:11.0.22=classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath +org.apache.tomcat:tomcat-annotations-api:11.0.23=classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath org.apache.tomcat:tomcat-annotations-api:8.0.14=classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath -org.apache.tomcat:tomcat-api:11.0.22=classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath +org.apache.tomcat:tomcat-api:11.0.23=classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath org.apache.tomcat:tomcat-api:8.0.14=classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath -org.apache.tomcat:tomcat-catalina:11.0.22=classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath +org.apache.tomcat:tomcat-catalina:11.0.23=classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath org.apache.tomcat:tomcat-catalina:8.0.14=classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath -org.apache.tomcat:tomcat-coyote:11.0.22=classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath +org.apache.tomcat:tomcat-coyote:11.0.23=classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath org.apache.tomcat:tomcat-coyote:8.0.14=classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath -org.apache.tomcat:tomcat-el-api:11.0.22=classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath +org.apache.tomcat:tomcat-el-api:11.0.23=classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath org.apache.tomcat:tomcat-el-api:8.0.14=classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath -org.apache.tomcat:tomcat-jaspic-api:11.0.22=classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath -org.apache.tomcat:tomcat-jni:11.0.22=classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath +org.apache.tomcat:tomcat-jaspic-api:11.0.23=classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath +org.apache.tomcat:tomcat-jni:11.0.23=classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath org.apache.tomcat:tomcat-jni:8.0.14=classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath -org.apache.tomcat:tomcat-jsp-api:11.0.22=classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath +org.apache.tomcat:tomcat-jsp-api:11.0.23=classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath org.apache.tomcat:tomcat-jsp-api:8.0.14=classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath -org.apache.tomcat:tomcat-juli:11.0.22=classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath +org.apache.tomcat:tomcat-juli:11.0.23=classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath org.apache.tomcat:tomcat-juli:8.0.14=classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath -org.apache.tomcat:tomcat-servlet-api:11.0.22=classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath +org.apache.tomcat:tomcat-servlet-api:11.0.23=classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath org.apache.tomcat:tomcat-servlet-api:8.0.14=classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath -org.apache.tomcat:tomcat-util-scan:11.0.22=classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath +org.apache.tomcat:tomcat-util-scan:11.0.23=classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath org.apache.tomcat:tomcat-util-scan:8.0.14=classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath -org.apache.tomcat:tomcat-util:11.0.22=classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath +org.apache.tomcat:tomcat-util:11.0.23=classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath org.apache.tomcat:tomcat-util:8.0.14=classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=classloadingJbossTestCompileClasspath,classloadingJsr14TestCompileClasspath,classloadingOsgiTestCompileClasspath,classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatTestCompileClasspath,testCompileClasspath org.checkerframework:checker-qual:3.33.0=annotationProcessor,classloadingJbossTestAnnotationProcessor,classloadingJsr14TestAnnotationProcessor,classloadingOsgiTestAnnotationProcessor,classloadingTomcatLatestDepTestAnnotationProcessor,classloadingTomcatTestAnnotationProcessor,testAnnotationProcessor diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/gradle.lockfile b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/gradle.lockfile index 59d56047232..ab11aeee288 100644 --- a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:java:java-net:java-net-1.8:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,csiCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/gradle.lockfile b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/gradle.lockfile index 31b3d0fb029..3308bda2848 100644 --- a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:java:java-net:java-net-11.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/java/java-nio-1.8/gradle.lockfile b/dd-java-agent/instrumentation/java/java-nio-1.8/gradle.lockfile index 31b3d0fb029..69ac1a6c611 100644 --- a/dd-java-agent/instrumentation/java/java-nio-1.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-nio-1.8/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:java:java-nio-1.8:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/java/java-rmi-1.1/gradle.lockfile b/dd-java-agent/instrumentation/java/java-rmi-1.1/gradle.lockfile index 971ba344154..75a277ec14f 100644 --- a/dd-java-agent/instrumentation/java/java-rmi-1.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-rmi-1.1/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:java:java-rmi-1.1:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/java/java-security-1.8/gradle.lockfile b/dd-java-agent/instrumentation/java/java-security-1.8/gradle.lockfile index 7790da78c43..9f66d73dd93 100644 --- a/dd-java-agent/instrumentation/java/java-security-1.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-security-1.8/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:java:java-security-1.8:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,csiCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/java/java-util-1.8/gradle.lockfile b/dd-java-agent/instrumentation/java/java-util-1.8/gradle.lockfile index 243f87a0f2c..46c69d1b227 100644 --- a/dd-java-agent/instrumentation/java/java-util-1.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-util-1.8/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:java:java-util-1.8:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,csiCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/javax-naming-1.0/gradle.lockfile b/dd-java-agent/instrumentation/javax-naming-1.0/gradle.lockfile index 243f87a0f2c..8ba02ef0bca 100644 --- a/dd-java-agent/instrumentation/javax-naming-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/javax-naming-1.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:javax-naming-1.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,csiCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/javax-xml-1.4/gradle.lockfile b/dd-java-agent/instrumentation/javax-xml-1.4/gradle.lockfile index e4304c1cba2..ce6b3fb6aa3 100644 --- a/dd-java-agent/instrumentation/javax-xml-1.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/javax-xml-1.4/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:javax-xml-1.4:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,csiCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/jboss/jboss-logmanager-1.1/gradle.lockfile b/dd-java-agent/instrumentation/jboss/jboss-logmanager-1.1/gradle.lockfile index 76c9b1a1985..21bb1498a65 100644 --- a/dd-java-agent/instrumentation/jboss/jboss-logmanager-1.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/jboss/jboss-logmanager-1.1/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:jboss:jboss-logmanager-1.1:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/jboss/jboss-modules-1.3/gradle.lockfile b/dd-java-agent/instrumentation/jboss/jboss-modules-1.3/gradle.lockfile index e33bdfc5a4b..9199c8f9839 100644 --- a/dd-java-agent/instrumentation/jboss/jboss-modules-1.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/jboss/jboss-modules-1.3/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:jboss:jboss-modules-1.3:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/jdbc/gradle.lockfile b/dd-java-agent/instrumentation/jdbc/gradle.lockfile index d96d10ecde7..eb8729194e8 100644 --- a/dd-java-agent/instrumentation/jdbc/gradle.lockfile +++ b/dd-java-agent/instrumentation/jdbc/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:jdbc:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=jmhRuntimeClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestRuntimeClasspath,oldH2TestRuntimeClasspath,oldPostgresTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=jmhRuntimeClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestRuntimeClasspath,oldH2TestRuntimeClasspath,oldPostgresTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=jmhRuntimeClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,oldH2TestCompileClasspath,oldH2TestRuntimeClasspath,oldPostgresTestCompileClasspath,oldPostgresTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -25,7 +26,7 @@ com.github.jnr:jnr-ffi:2.2.19=jmhRuntimeClasspath,latestDepJava11TestRuntimeClas com.github.jnr:jnr-posix:3.1.22=jmhRuntimeClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestRuntimeClasspath,oldH2TestRuntimeClasspath,oldPostgresTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=jmhRuntimeClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestRuntimeClasspath,oldH2TestRuntimeClasspath,oldPostgresTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=jmhRuntimeClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestRuntimeClasspath,oldH2TestRuntimeClasspath,oldPostgresTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,oldH2TestCompileClasspath,oldH2TestRuntimeClasspath,oldPostgresTestCompileClasspath,oldPostgresTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,jmhCompileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,csiCompileClasspath,jmhCompileClasspath,latestDepJava11TestAnnotationProcessor,latestDepJava11TestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,oldH2TestAnnotationProcessor,oldH2TestCompileClasspath,oldPostgresTestAnnotationProcessor,oldPostgresTestCompileClasspath,testAnnotationProcessor,testCompileClasspath @@ -59,7 +60,7 @@ com.squareup.okio:okio:1.17.5=jmhRuntimeClasspath,latestDepJava11TestCompileClas com.thoughtworks.qdox:qdox:1.12.1=codenarc com.zaxxer:HikariCP:2.4.0=compileClasspath,csiCompileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,oldH2TestCompileClasspath,oldH2TestRuntimeClasspath,oldPostgresTestCompileClasspath,oldPostgresTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.zaxxer:HikariCP:4.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.zaxxer:HikariCP:7.0.2=latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath +com.zaxxer:HikariCP:7.1.0=latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath commons-fileupload:commons-fileupload:1.5=jmhRuntimeClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,oldH2TestCompileClasspath,oldH2TestRuntimeClasspath,oldPostgresTestCompileClasspath,oldPostgresTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath commons-io:commons-io:2.11.0=jmhRuntimeClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,oldH2TestCompileClasspath,oldH2TestRuntimeClasspath,oldPostgresTestCompileClasspath,oldPostgresTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath commons-io:commons-io:2.20.0=spotbugs diff --git a/dd-java-agent/instrumentation/jdbc/scalikejdbc-3.5/gradle.lockfile b/dd-java-agent/instrumentation/jdbc/scalikejdbc-3.5/gradle.lockfile index d4ce1744487..53e44d07e45 100644 --- a/dd-java-agent/instrumentation/jdbc/scalikejdbc-3.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/jdbc/scalikejdbc-3.5/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:jdbc:scalikejdbc-3.5:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -25,7 +26,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/jedis/jedis-1.4/gradle.lockfile b/dd-java-agent/instrumentation/jedis/jedis-1.4/gradle.lockfile index 623069c62b5..28b860b5585 100644 --- a/dd-java-agent/instrumentation/jedis/jedis-1.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/jedis/jedis-1.4/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:jedis:jedis-1.4:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -22,7 +23,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/jedis/jedis-3.0/gradle.lockfile b/dd-java-agent/instrumentation/jedis/jedis-3.0/gradle.lockfile index 0c1f9316085..0a054964de5 100644 --- a/dd-java-agent/instrumentation/jedis/jedis-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jedis/jedis-3.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:jedis:jedis-3.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -22,7 +23,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/jedis/jedis-4.0/gradle.lockfile b/dd-java-agent/instrumentation/jedis/jedis-4.0/gradle.lockfile index 2c77097ce09..4dce12960b6 100644 --- a/dd-java-agent/instrumentation/jedis/jedis-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jedis/jedis-4.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:jedis:jedis-4.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -22,7 +23,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/jersey/jersey-2.0/gradle.lockfile b/dd-java-agent/instrumentation/jersey/jersey-2.0/gradle.lockfile index fe1e04daf5f..e614ce83069 100644 --- a/dd-java-agent/instrumentation/jersey/jersey-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jersey/jersey-2.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:jersey:jersey-2.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=jersey2JettyTestRuntimeClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=jersey2JettyTestRuntimeClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=jersey2JettyTestCompileClasspath,jersey2JettyTestRuntimeClasspath,jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -32,7 +33,7 @@ com.github.jnr:jnr-ffi:2.2.19=jersey2JettyTestRuntimeClasspath,jersey3JettyTestR com.github.jnr:jnr-posix:3.1.22=jersey2JettyTestRuntimeClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=jersey2JettyTestRuntimeClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=jersey2JettyTestRuntimeClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,jersey2JettyTestCompileClasspath,jersey2JettyTestRuntimeClasspath,jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,jersey2JettyTestAnnotationProcessor,jersey2JettyTestCompileClasspath,jersey3JettyTestAnnotationProcessor,jersey3JettyTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/jersey/jersey-client-2.0/gradle.lockfile b/dd-java-agent/instrumentation/jersey/jersey-client-2.0/gradle.lockfile index 463da857eaa..a516a5ece47 100644 --- a/dd-java-agent/instrumentation/jersey/jersey-client-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jersey/jersey-client-2.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:jersey:jersey-client-2.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/jersey/jersey-filter-2.0/gradle.lockfile b/dd-java-agent/instrumentation/jersey/jersey-filter-2.0/gradle.lockfile index 70abcddbe5d..60991358166 100644 --- a/dd-java-agent/instrumentation/jersey/jersey-filter-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jersey/jersey-filter-2.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:jersey:jersey-filter-2.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/gradle.lockfile index ddb930c8200..d26995636f4 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-11.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -8,20 +9,20 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.3=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:java-dogstatsd-client:4.4.3=testRuntimeClasspath +com.datadoghq:java-dogstatsd-client:4.4.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.jnr:jffi:1.3.14=testRuntimeClasspath +com.github.jnr:jffi:1.3.15=testRuntimeClasspath com.github.jnr:jnr-a64asm:1.0.0=testRuntimeClasspath com.github.jnr:jnr-constants:0.10.4=testRuntimeClasspath -com.github.jnr:jnr-enxio:0.32.19=testRuntimeClasspath -com.github.jnr:jnr-ffi:2.2.18=testRuntimeClasspath -com.github.jnr:jnr-posix:3.1.21=testRuntimeClasspath -com.github.jnr:jnr-unixsocket:0.38.24=testRuntimeClasspath +com.github.jnr:jnr-enxio:0.32.20=testRuntimeClasspath +com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath +com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath +com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath @@ -45,14 +46,14 @@ com.thoughtworks.qdox:qdox:1.12.1=codenarc commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClasspath commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath commons-io:commons-io:2.20.0=spotbugs -de.thetaphi:forbiddenapis:3.10=compileClasspath +de.thetaphi:forbiddenapis:3.10=compileClasspath,testCompileClasspath,testRuntimeClasspath io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath io.sqreen:libsqreen:17.3.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.0=spotbugs junit:junit:4.13.2=testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.3=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.3=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.8.0=testRuntimeClasspath net.sf.saxon:Saxon-HE:12.9=spotbugs @@ -76,11 +77,12 @@ org.codehaus.groovy:groovy:3.0.23=codenarc org.codehaus.groovy:groovy:3.0.25=testCompileClasspath,testRuntimeClasspath org.codenarc:CodeNarc:3.7.0=codenarc org.dom4j:dom4j:2.2.0=spotbugs -org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-http:11.0.0=compileClasspath -org.eclipse.jetty:jetty-io:11.0.0=compileClasspath -org.eclipse.jetty:jetty-server:11.0.0=compileClasspath -org.eclipse.jetty:jetty-util:11.0.0=compileClasspath +org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.1=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=compileClasspath +org.eclipse.jetty:jetty-http:11.0.26=compileClasspath +org.eclipse.jetty:jetty-io:11.0.26=compileClasspath +org.eclipse.jetty:jetty-server:11.0.26=compileClasspath +org.eclipse.jetty:jetty-util:11.0.26=compileClasspath org.gmetrics:GMetrics:2.1.0=codenarc org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath @@ -98,7 +100,8 @@ org.junit.platform:junit-platform-suite-api:1.14.1=testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.0=spotbugs org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.mockito:mockito-core:4.4.0=testRuntimeClasspath +org.mockito:mockito-core:4.4.0=testCompileClasspath,testRuntimeClasspath +org.mockito:mockito-junit-jupiter:4.4.0=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:9.7.1=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-7.0/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-7.0/gradle.lockfile index 1a2132267b2..ca5abc46828 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-7.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-7.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-7.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/gradle.lockfile index 56460cda2da..5bcb2122729 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-8.1.3:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath @@ -76,12 +77,12 @@ org.codehaus.groovy:groovy:3.0.23=codenarc org.codehaus.groovy:groovy:3.0.25=testCompileClasspath,testRuntimeClasspath org.codenarc:CodeNarc:3.7.0=codenarc org.dom4j:dom4j:2.2.0=spotbugs -org.eclipse.jetty.orbit:javax.servlet:3.0.0.v201112011016=compileClasspath -org.eclipse.jetty:jetty-continuation:8.1.3.v20120416=compileClasspath -org.eclipse.jetty:jetty-http:8.1.3.v20120416=compileClasspath -org.eclipse.jetty:jetty-io:8.1.3.v20120416=compileClasspath -org.eclipse.jetty:jetty-server:8.1.3.v20120416=compileClasspath -org.eclipse.jetty:jetty-util:8.1.3.v20120416=compileClasspath +org.eclipse.jetty.orbit:javax.servlet:3.0.0.v201112011016=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-continuation:8.1.3.v20120416=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-http:8.1.3.v20120416=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-io:8.1.3.v20120416=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-server:8.1.3.v20120416=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-util:8.1.3.v20120416=compileClasspath,testCompileClasspath,testRuntimeClasspath org.gmetrics:GMetrics:2.1.0=codenarc org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath @@ -99,7 +100,8 @@ org.junit.platform:junit-platform-suite-api:1.14.1=testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.0=spotbugs org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.mockito:mockito-core:4.4.0=testRuntimeClasspath +org.mockito:mockito-core:4.4.0=testCompileClasspath,testRuntimeClasspath +org.mockito:mockito-junit-jupiter:4.4.0=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:9.7.1=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/gradle.lockfile index 1af2fc1aab1..05767c4b0c1 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.2:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath @@ -97,7 +98,8 @@ org.junit.platform:junit-platform-suite-api:1.14.1=testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.0=spotbugs org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.mockito:mockito-core:4.4.0=testRuntimeClasspath +org.mockito:mockito-core:4.4.0=testCompileClasspath,testRuntimeClasspath +org.mockito:mockito-junit-jupiter:4.4.0=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:9.7.1=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/gradle.lockfile index 1af2fc1aab1..ebe307b7e90 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.3:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath @@ -97,7 +98,8 @@ org.junit.platform:junit-platform-suite-api:1.14.1=testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.0=spotbugs org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.mockito:mockito-core:4.4.0=testRuntimeClasspath +org.mockito:mockito-core:4.4.0=testCompileClasspath,testRuntimeClasspath +org.mockito:mockito-junit-jupiter:4.4.0=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:9.7.1=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/gradle.lockfile index 961940d455a..0e366e707ea 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.4:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -8,20 +9,20 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.3=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:java-dogstatsd-client:4.4.3=testRuntimeClasspath +com.datadoghq:java-dogstatsd-client:4.4.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.jnr:jffi:1.3.14=testRuntimeClasspath +com.github.jnr:jffi:1.3.15=testRuntimeClasspath com.github.jnr:jnr-a64asm:1.0.0=testRuntimeClasspath com.github.jnr:jnr-constants:0.10.4=testRuntimeClasspath -com.github.jnr:jnr-enxio:0.32.19=testRuntimeClasspath -com.github.jnr:jnr-ffi:2.2.18=testRuntimeClasspath -com.github.jnr:jnr-posix:3.1.21=testRuntimeClasspath -com.github.jnr:jnr-unixsocket:0.38.24=testRuntimeClasspath +com.github.jnr:jnr-enxio:0.32.20=testRuntimeClasspath +com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath +com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath +com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath @@ -45,14 +46,14 @@ com.thoughtworks.qdox:qdox:1.12.1=codenarc commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClasspath commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath commons-io:commons-io:2.20.0=spotbugs -de.thetaphi:forbiddenapis:3.10=compileClasspath +de.thetaphi:forbiddenapis:3.10=compileClasspath,testCompileClasspath,testRuntimeClasspath io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath io.sqreen:libsqreen:17.3.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=compileClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.0=spotbugs junit:junit:4.13.2=testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.3=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.3=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.8.0=testRuntimeClasspath net.sf.saxon:Saxon-HE:12.9=spotbugs @@ -97,7 +98,8 @@ org.junit.platform:junit-platform-suite-api:1.14.1=testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.0=spotbugs org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.mockito:mockito-core:4.4.0=testRuntimeClasspath +org.mockito:mockito-core:4.4.0=testCompileClasspath,testRuntimeClasspath +org.mockito:mockito-junit-jupiter:4.4.0=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:9.7.1=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/gradle.lockfile index 85fec3badcd..434e96ea13a 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:jetty:jetty-client:jetty-client-10.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=jetty10LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=jetty10LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=jetty10LatestDepTestCompileClasspath,jetty10LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=jetty10LatestDepTestRuntimeClasspath,jetty11TestRu com.github.jnr:jnr-posix:3.1.22=jetty10LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=jetty10LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=jetty10LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,jetty10LatestDepTestCompileClasspath,jetty10LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,jetty10LatestDepTestAnnotationProcessor,jetty10LatestDepTestCompileClasspath,jetty11TestAnnotationProcessor,jetty11TestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/gradle.lockfile index 2031f360a1e..b7877298604 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:jetty:jetty-client:jetty-client-12.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/gradle.lockfile index 4cce12422c8..cedfa3009d0 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:jetty:jetty-client:jetty-client-9.1:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-common/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-common/gradle.lockfile index 3e8d048a8d8..90ef02a162d 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-common/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:jetty:jetty-client:jetty-client-common:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-common/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-common/gradle.lockfile index 9123d7966ff..a9a0b0698d2 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-common/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:jetty:jetty-common:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/gradle.lockfile index 7f7a5e4feb4..02901b039d0 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-10.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=earlyDep10ForkedTestRuntimeClasspath,latestDepFork com.github.jnr:jnr-posix:3.1.22=earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,earlyDep10ForkedTestAnnotationProcessor,earlyDep10ForkedTestCompileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/gradle.lockfile index 528a61f1be1..ed0d1ae0a7f 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-11.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepForkedTestRuntimeClasspath,latestDepTestR com.github.jnr:jnr-posix:3.1.22=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/gradle.lockfile index 42578ffbe31..051df5449ef 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-12.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=ee10ForkedTestRuntimeClasspath,ee10LatestDepForked com.github.jnr:jnr-posix:3.1.22=ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,ee10ForkedTestAnnotationProcessor,ee10ForkedTestCompileClasspath,ee10LatestDepForkedTestAnnotationProcessor,ee10LatestDepForkedTestCompileClasspath,ee10LatestDepTestAnnotationProcessor,ee10LatestDepTestCompileClasspath,ee10TestAnnotationProcessor,ee10TestCompileClasspath,ee8LatestDepTestAnnotationProcessor,ee8LatestDepTestCompileClasspath,ee8TestAnnotationProcessor,ee8TestCompileClasspath,ee9LatestDepTestAnnotationProcessor,ee9LatestDepTestCompileClasspath,ee9TestAnnotationProcessor,ee9TestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/gradle.lockfile index 2a44d9caa8d..271518bdb5c 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-7.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepForkedTestRuntimeClasspath,testRuntimeCla com.github.jnr:jnr-posix:3.1.22=latestDepForkedTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepForkedTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepForkedTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/gradle.lockfile index b84f6f3c511..9dd5821a131 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-7.6:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepForkedTestRuntimeClasspath,testRuntimeCla com.github.jnr:jnr-posix:3.1.22=latestDepForkedTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepForkedTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepForkedTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/gradle.lockfile index 54b1e895db6..437fb3d6e5b 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0.4:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepForkedTestRuntimeClasspath,latestDepTestR com.github.jnr:jnr-posix:3.1.22=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/gradle.lockfile index a613450eac9..8a693bc1d75 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testFixturesRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testFixturesRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testFixturesRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testFixturesRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testFixturesRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testFixturesRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.3/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.3/gradle.lockfile index 0504bc66f72..94fcde72a96 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.3/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.3:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepForkedTestRuntimeClasspath,latestDepTestR com.github.jnr:jnr-posix:3.1.22=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.4.21/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.4.21/gradle.lockfile index 173da839298..06f179bf311 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.4.21/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.4.21/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.4.21:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepForkedTestRuntimeClasspath,latestDepTestR com.github.jnr:jnr-posix:3.1.22=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-util-9.4.31/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-util-9.4.31/gradle.lockfile index da5e2f8f6c1..8b71df799b3 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-util-9.4.31/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-util-9.4.31/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:jetty:jetty-util-9.4.31:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/jms/jakarta-jms-3.0/gradle.lockfile b/dd-java-agent/instrumentation/jms/jakarta-jms-3.0/gradle.lockfile index 9da03a983d9..e5e43939597 100644 --- a/dd-java-agent/instrumentation/jms/jakarta-jms-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jms/jakarta-jms-3.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:jms:jakarta-jms-3.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/jms/javax-jms-1.1/gradle.lockfile b/dd-java-agent/instrumentation/jms/javax-jms-1.1/gradle.lockfile index 31b7ff217ca..106068ef045 100644 --- a/dd-java-agent/instrumentation/jms/javax-jms-1.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/jms/javax-jms-1.1/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:jms:javax-jms-1.1:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepForkedTestRuntimeClasspath,latestDepTestR com.github.jnr:jnr-posix:3.1.22=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/jose-jwt-4.0/gradle.lockfile b/dd-java-agent/instrumentation/jose-jwt-4.0/gradle.lockfile index a49a8892918..3fcd5cef051 100644 --- a/dd-java-agent/instrumentation/jose-jwt-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jose-jwt-4.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:jose-jwt-4.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -26,7 +27,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/jsp-2.3/gradle.lockfile b/dd-java-agent/instrumentation/jsp-2.3/gradle.lockfile index 298fcb903f4..d008c3394da 100644 --- a/dd-java-agent/instrumentation/jsp-2.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/jsp-2.3/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:jsp-2.3:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/gradle.lockfile b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/gradle.lockfile index a1fca099e3b..ce6649cf0ae 100644 --- a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:junit:junit-4:junit-4-cucumber-5.4:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -25,7 +26,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4-munit-0.7.28/gradle.lockfile b/dd-java-agent/instrumentation/junit/junit-4/junit-4-munit-0.7.28/gradle.lockfile index 1e4eb4cd449..e4bc9377094 100644 --- a/dd-java-agent/instrumentation/junit/junit-4/junit-4-munit-0.7.28/gradle.lockfile +++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4-munit-0.7.28/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:junit:junit-4:junit-4-munit-0.7.28:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -29,7 +30,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/gradle.lockfile b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/gradle.lockfile index 51e0c75d822..0279523496d 100644 --- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/gradle.lockfile +++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:junit:junit-4:junit-4.10:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath @@ -25,7 +26,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,compileOnlyDependenciesMetadata,latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,compileOnlyDependenciesMetadata,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,compileOnlyDependenciesMetadata,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestCompileOnlyDependenciesMetadata,testAnnotationProcessor,testCompileClasspath,testCompileOnlyDependenciesMetadata diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/gradle.lockfile b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/gradle.lockfile index 7bb298b9ad7..e9aec40f12e 100644 --- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/gradle.lockfile +++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:junit:junit-4:junit-4.13:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -25,7 +26,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/gradle.lockfile b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/gradle.lockfile index 2600593e137..0bc1847715e 100644 --- a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:junit:junit-5:junit-5-cucumber-5.4:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -25,7 +26,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/gradle.lockfile b/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/gradle.lockfile index 4c9706550c5..76edf140bea 100644 --- a/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:junit:junit-5:junit-5-spock-2.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cglib:cglib-nodep:3.3.0=compileClasspath @@ -26,7 +27,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/gradle.lockfile b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/gradle.lockfile index 981e7546884..3c99ea15f76 100644 --- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:junit:junit-5:junit-5.3:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latest5TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,v513TestRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latest5TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,v513TestRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latest5TestCompileClasspath,latest5TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,v513TestCompileClasspath,v513TestRuntimeClasspath @@ -25,7 +26,7 @@ com.github.jnr:jnr-ffi:2.2.19=latest5TestRuntimeClasspath,latestDepTestRuntimeCl com.github.jnr:jnr-posix:3.1.22=latest5TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,v513TestRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latest5TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,v513TestRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latest5TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,v513TestRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latest5TestCompileClasspath,latest5TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath,v513TestCompileClasspath,v513TestRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latest5TestAnnotationProcessor,latest5TestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath,v513TestAnnotationProcessor,v513TestCompileClasspath diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/gradle.lockfile b/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/gradle.lockfile index 9d78bf50068..a1cfbf80815 100644 --- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:junit:junit-5:junit-5.8:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -25,7 +26,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/gradle.lockfile b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/gradle.lockfile index 9d5f1d1547a..b993eb598ce 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/gradle.lockfile +++ b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:kafka:kafka-clients-0.11:dependencies --write-locks at.yawk.lz4:lz4-java:1.10.1=iastLatestDepTest3RuntimeClasspath cafe.cryptography:curve25519-elisabeth:0.1.0=iastLatestDepTest3RuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=iastLatestDepTest3RuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -39,7 +40,7 @@ com.github.jnr:jnr-unixsocket:0.38.25=iastLatestDepTest3RuntimeClasspath,latestD com.github.jnr:jnr-x86asm:1.0.2=iastLatestDepTest3RuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.luben:zstd-jni:1.5.2-1=latestDepTestRuntimeClasspath com.github.luben:zstd-jni:1.5.6-4=iastLatestDepTest3RuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,iastLatestDepTest3AnnotationProcessor,iastLatestDepTest3CompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/gradle.lockfile b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/gradle.lockfile index 9ef97653d08..5ae070c053d 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:kafka:kafka-clients-3.8:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -33,7 +34,7 @@ com.github.jnr:jnr-unixsocket:0.38.25=latestDepForkedTestRuntimeClasspath,latest com.github.jnr:jnr-x86asm:1.0.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.luben:zstd-jni:1.5.6-3=testRuntimeClasspath com.github.luben:zstd-jni:1.5.6-4=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/kafka/kafka-common/gradle.lockfile b/dd-java-agent/instrumentation/kafka/kafka-common/gradle.lockfile index daf9249ee67..5ee8afd8beb 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/kafka/kafka-common/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:kafka:kafka-common:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/gradle.lockfile b/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/gradle.lockfile index 077761a6185..d15fa2afbae 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/gradle.lockfile +++ b/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:kafka:kafka-connect-0.11:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -38,7 +39,7 @@ com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath com.github.luben:zstd-jni:1.4.5-6=testCompileClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/gradle.lockfile b/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/gradle.lockfile index aae6a900207..70e8ed5db0a 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/gradle.lockfile +++ b/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:kafka:kafka-streams-0.11:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -33,7 +34,7 @@ com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspa com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.luben:zstd-jni:1.4.9-1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/kafka/kafka-streams-1.0/gradle.lockfile b/dd-java-agent/instrumentation/kafka/kafka-streams-1.0/gradle.lockfile index 1651adb71ab..e61db9681f7 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-streams-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/kafka/kafka-streams-1.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:kafka:kafka-streams-1.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -24,7 +25,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/karate-1.0/gradle.lockfile b/dd-java-agent/instrumentation/karate-1.0/gradle.lockfile index a6d01e320da..7c9bf167f87 100644 --- a/dd-java-agent/instrumentation/karate-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/karate-1.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:karate-1.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=karate131TestRuntimeClasspath,karate141TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=karate131TestRuntimeClasspath,karate141TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=karate131TestCompileClasspath,karate131TestRuntimeClasspath,karate141TestCompileClasspath,karate141TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -34,7 +35,7 @@ com.github.jnr:jnr-ffi:2.2.19=karate131TestRuntimeClasspath,karate141TestRuntime com.github.jnr:jnr-posix:3.1.22=karate131TestRuntimeClasspath,karate141TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=karate131TestRuntimeClasspath,karate141TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=karate131TestRuntimeClasspath,karate141TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,karate131TestCompileClasspath,karate131TestRuntimeClasspath,karate141TestCompileClasspath,karate141TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,karate131TestAnnotationProcessor,karate131TestCompileClasspath,karate141TestAnnotationProcessor,karate141TestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/kotlin-coroutines-1.3/gradle.lockfile b/dd-java-agent/instrumentation/kotlin-coroutines-1.3/gradle.lockfile index 7a29c97c8da..9dd0aecba8c 100644 --- a/dd-java-agent/instrumentation/kotlin-coroutines-1.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/kotlin-coroutines-1.3/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:kotlin-coroutines-1.3:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testFixturesRuntimeC com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,compileOnlyDependenciesMetadata,latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,compileOnlyDependenciesMetadata,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,compileOnlyDependenciesMetadata,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestCompileOnlyDependenciesMetadata,testAnnotationProcessor,testCompileClasspath,testCompileOnlyDependenciesMetadata diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-4.0/gradle.lockfile b/dd-java-agent/instrumentation/lettuce/lettuce-4.0/gradle.lockfile index 1732cc72d13..effea683102 100644 --- a/dd-java-agent/instrumentation/lettuce/lettuce-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/lettuce/lettuce-4.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:lettuce:lettuce-4.0:dependencies --write-locks biz.paluch.redis:lettuce:4.0.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath biz.paluch.redis:lettuce:4.5.0.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -24,7 +25,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/gradle.lockfile b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/gradle.lockfile index 2a0102e97b5..9837f2d1f81 100644 --- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:lettuce:lettuce-5.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -29,7 +30,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepForkedTestRuntimeClasspath,latestDepTestR com.github.jnr:jnr-posix:3.1.22=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/liberty/liberty-20.0/gradle.lockfile b/dd-java-agent/instrumentation/liberty/liberty-20.0/gradle.lockfile index 50a90f9e3a8..d06148933b0 100644 --- a/dd-java-agent/instrumentation/liberty/liberty-20.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/liberty/liberty-20.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:liberty:liberty-20.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testLogging,webappCompileClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/liberty/liberty-23.0/gradle.lockfile b/dd-java-agent/instrumentation/liberty/liberty-23.0/gradle.lockfile index 4bce5722841..c14ca24fc75 100644 --- a/dd-java-agent/instrumentation/liberty/liberty-23.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/liberty/liberty-23.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:liberty:liberty-23.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testLogging,webappCompileClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/log4j/log4j-1.2.4/gradle.lockfile b/dd-java-agent/instrumentation/log4j/log4j-1.2.4/gradle.lockfile index 51adc94aa7d..40da9698294 100644 --- a/dd-java-agent/instrumentation/log4j/log4j-1.2.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/log4j/log4j-1.2.4/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:log4j:log4j-1.2.4:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/log4j/log4j-2.0/gradle.lockfile b/dd-java-agent/instrumentation/log4j/log4j-2.0/gradle.lockfile index f64bea79167..5aba2834741 100644 --- a/dd-java-agent/instrumentation/log4j/log4j-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/log4j/log4j-2.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:log4j:log4j-2.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/log4j/log4j-2.7/gradle.lockfile b/dd-java-agent/instrumentation/log4j/log4j-2.7/gradle.lockfile index 7a83638ad50..57d334d0452 100644 --- a/dd-java-agent/instrumentation/log4j/log4j-2.7/gradle.lockfile +++ b/dd-java-agent/instrumentation/log4j/log4j-2.7/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:log4j:log4j-2.7:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/logback-1.0/gradle.lockfile b/dd-java-agent/instrumentation/logback-1.0/gradle.lockfile index b851f4adc82..c560799f4e3 100644 --- a/dd-java-agent/instrumentation/logback-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/logback-1.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:logback-1.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.0.0=compileClasspath @@ -23,7 +24,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/mail/jakarta-mail-2.0.1/gradle.lockfile b/dd-java-agent/instrumentation/mail/jakarta-mail-2.0.1/gradle.lockfile index dd1ce78a677..731c012761d 100644 --- a/dd-java-agent/instrumentation/mail/jakarta-mail-2.0.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/mail/jakarta-mail-2.0.1/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:mail:jakarta-mail-2.0.1:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/mail/javax-mail-1.4.4/gradle.lockfile b/dd-java-agent/instrumentation/mail/javax-mail-1.4.4/gradle.lockfile index 43c77e22bf7..b6d21eab302 100644 --- a/dd-java-agent/instrumentation/mail/javax-mail-1.4.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/mail/javax-mail-1.4.4/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:mail:javax-mail-1.4.4:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/maven/maven-3.2.1/gradle.lockfile b/dd-java-agent/instrumentation/maven/maven-3.2.1/gradle.lockfile index 090d264e527..34a8ca23f44 100644 --- a/dd-java-agent/instrumentation/maven/maven-3.2.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/maven/maven-3.2.1/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:maven:maven-3.2.1:dependencies --write-locks aopalliance:aopalliance:1.0=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -26,7 +27,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/maven/maven-surefire-3.0/gradle.lockfile b/dd-java-agent/instrumentation/maven/maven-surefire-3.0/gradle.lockfile index 89cc098e1df..334ac1e6a45 100644 --- a/dd-java-agent/instrumentation/maven/maven-surefire-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/maven/maven-surefire-3.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:maven:maven-surefire-3.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-2.0/gradle.lockfile b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-2.0/gradle.lockfile index 591b3299820..816e71bc26a 100644 --- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-2.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:micronaut:micronaut-http-server-netty:micronaut-http-server-netty-2.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -32,8 +33,8 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.0.3=latestDepTestAnnotationProcessor,testAnnotationProcessor -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.0.3=latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-3.0/gradle.lockfile b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-3.0/gradle.lockfile index 996aed21140..7113c242921 100644 --- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-3.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:micronaut:micronaut-http-server-netty:micronaut-http-server-netty-3.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -34,7 +35,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/gradle.lockfile b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/gradle.lockfile index 418c76f91d1..45d409ac03a 100644 --- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:micronaut:micronaut-http-server-netty:micronaut-http-server-netty-4.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -35,7 +36,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-common/gradle.lockfile b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-common/gradle.lockfile index 2afdfa3235c..8b7ea5973f9 100644 --- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-common/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:micronaut:micronaut-http-server-netty:micronaut-http-server-netty-common:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -24,7 +25,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/mongo/mongo-common/gradle.lockfile b/dd-java-agent/instrumentation/mongo/mongo-common/gradle.lockfile index ad305b13154..faf6fb978c6 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/mongo/mongo-common/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:mongo:mongo-common:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -25,7 +26,7 @@ com.github.jnr:jnr-ffi:2.2.19=runtimeClasspath,testFixturesRuntimeClasspath,test com.github.jnr:jnr-posix:3.1.22=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/gradle.lockfile b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/gradle.lockfile index 4c81488db14..01c80e85b5d 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:mongo:mongo-driver:mongo-driver-3:mongo-driver-3.1:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -25,7 +26,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/gradle.lockfile b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/gradle.lockfile index 2456edd859a..a699d858da2 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:mongo:mongo-driver:mongo-driver-3:mongo-driver-3.4:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -25,7 +26,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.6/gradle.lockfile b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.6/gradle.lockfile index fcae1177613..a09b01fabce 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.6/gradle.lockfile +++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.6/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:mongo:mongo-driver:mongo-driver-3:mongo-driver-3.6:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -25,7 +26,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.8/gradle.lockfile b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.8/gradle.lockfile index 8c22525bf01..f2e2bfd204b 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.8/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:mongo:mongo-driver:mongo-driver-3:mongo-driver-3.8:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -25,7 +26,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/gradle.lockfile b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/gradle.lockfile index 322803732a5..4649f7db2d8 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:mongo:mongo-driver:mongo-driver-4.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestCompileClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestCompileClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestCompileClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestCompileClasspath,mongo43TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -25,7 +26,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepForkedTestRuntimeClasspath,latestDepTestR com.github.jnr:jnr-posix:3.1.22=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestCompileClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestCompileClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestCompileClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestCompileClasspath,mongo43TestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,mongo410ForkedTestAnnotationProcessor,mongo410ForkedTestCompileClasspath,mongo410TestAnnotationProcessor,mongo410TestCompileClasspath,mongo43ForkedTestAnnotationProcessor,mongo43ForkedTestCompileClasspath,mongo43TestAnnotationProcessor,mongo43TestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-async-3.3/gradle.lockfile b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-async-3.3/gradle.lockfile index db60c339c48..96f399d882a 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-async-3.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-async-3.3/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:mongo:mongo-test:mongo-test-async-3.3:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -25,7 +26,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.1/gradle.lockfile b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.1/gradle.lockfile index 5fd2b3c608e..ac802765372 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.1/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:mongo:mongo-test:mongo-test-core-3.1:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -25,7 +26,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.7/gradle.lockfile b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.7/gradle.lockfile index c5ad2580ea8..56719dde63b 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.7/gradle.lockfile +++ b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.7/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:mongo:mongo-test:mongo-test-core-3.7:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -25,7 +26,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-sync-3.10/gradle.lockfile b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-sync-3.10/gradle.lockfile index 12c6ef15947..126793becca 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-sync-3.10/gradle.lockfile +++ b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-sync-3.10/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:mongo:mongo-test:mongo-test-sync-3.10:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -25,7 +26,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/mule-4.5/gradle.lockfile b/dd-java-agent/instrumentation/mule-4.5/gradle.lockfile index 9c7c5af825e..a9d955ae53b 100644 --- a/dd-java-agent/instrumentation/mule-4.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/mule-4.5/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:mule-4.5:dependencies --write-locks biz.aQute.bnd:biz.aQute.bnd.annotation:7.1.0=latestDepForkedTestCompileClasspath cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath @@ -16,7 +17,7 @@ com.conversantmedia:disruptor:1.2.21=latestDepForkedTestCompileClasspath,latestD com.damnhandy:handy-uri-templates:2.1.8=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestMuleServices,mule46Services,muleServices com.datadoghq.okhttp3:okhttp:3.12.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.3=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath @@ -56,15 +57,16 @@ com.github.java-json-tools:jackson-coreutils:1.9=compileClasspath,latestDepForke com.github.java-json-tools:json-schema-core:1.2.10=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.java-json-tools:json-schema-validator:2.2.10=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.jnr:jffi:1.3.14=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath +com.github.jnr:jffi:1.3.15=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-a64asm:1.0.0=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-constants:0.10.4=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-enxio:0.32.19=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-ffi:2.2.18=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-posix:3.1.21=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-unixsocket:0.38.24=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-enxio:0.32.20=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-ffi:2.2.19=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-posix:3.1.22=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-unixsocket:0.38.25=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.7.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,mule46ForkedTestAnnotationProcessor,mule46ForkedTestCompileClasspath,testAnnotationProcessor,testCompileClasspath @@ -268,7 +270,7 @@ joda-time:joda-time:2.12.5=mule46ForkedTestCompileClasspath,mule46ForkedTestRunt joda-time:joda-time:2.14.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath joda-time:joda-time:2.9.1=compileClasspath,testCompileClasspath,testRuntimeClasspath junit:junit:4.13.2=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.8=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.bytebuddy:byte-buddy:1.14.18=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath @@ -443,10 +445,10 @@ org.junit:junit-bom:5.14.0=spotbugs org.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.mockito:mockito-core:4.11.0=testRuntimeClasspath org.mockito:mockito-core:4.4.0=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath -org.mozilla:rhino-engine:1.8.1=latestMuleServices +org.mozilla:rhino-engine:1.9.1=latestMuleServices org.mozilla:rhino:1.7.12=compileClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.mozilla:rhino:1.8.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath -org.mozilla:rhino:1.8.1=latestMuleServices +org.mozilla:rhino:1.9.1=latestMuleServices org.mule.apache:xerces2-xsd11:2.11.3=mule46Services,muleServices org.mule.apache:xerces2-xsd11:2.11.3-MULE-001=compileClasspath,testCompileClasspath,testRuntimeClasspath org.mule.apache:xerces2-xsd11:2.11.3-MULE-002=latestMuleServices,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath @@ -722,7 +724,7 @@ org.mule.sdk:mule-sdk-compatibility-api:1.0.0=latestDepForkedTestCompileClasspat org.mule.services:mule-netty-http-service:0.3.5=latestMuleServices org.mule.services:mule-service-http:1.12.5=latestMuleServices org.mule.services:mule-service-http:1.5.21=mule46Services,muleServices -org.mule.services:mule-service-scheduler:1.11.4=latestMuleServices +org.mule.services:mule-service-scheduler:1.12.0=latestMuleServices org.mule.services:mule-service-scheduler:1.5.0=mule46Services,muleServices org.mule.services:mule-service-weave:2.5.0=mule46Services,muleServices org.mule.services:mule-service-weave:2.8.1=latestMuleServices diff --git a/dd-java-agent/instrumentation/netty/netty-3.8/gradle.lockfile b/dd-java-agent/instrumentation/netty/netty-3.8/gradle.lockfile index b53152e6f8a..c64576330d0 100644 --- a/dd-java-agent/instrumentation/netty/netty-3.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/netty/netty-3.8/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:netty:netty-3.8:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/netty/netty-4.0/gradle.lockfile b/dd-java-agent/instrumentation/netty/netty-4.0/gradle.lockfile index f1eacfae704..5c02472d3e9 100644 --- a/dd-java-agent/instrumentation/netty/netty-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/netty/netty-4.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:netty:netty-4.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/gradle.lockfile b/dd-java-agent/instrumentation/netty/netty-4.1/gradle.lockfile index abf6f3348a8..cb9f5726f77 100644 --- a/dd-java-agent/instrumentation/netty/netty-4.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/netty/netty-4.1/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:netty:netty-4.1:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath @@ -111,9 +112,9 @@ org.apache.logging.log4j:log4j-api:2.25.2=spotbugs org.apache.logging.log4j:log4j-core:2.25.2=spotbugs org.apiguardian:apiguardian-api:1.1.2=latestDepTestCompileClasspath,testCompileClasspath org.asynchttpclient:async-http-client-netty-utils:2.1.0=testCompileClasspath,testRuntimeClasspath -org.asynchttpclient:async-http-client-netty-utils:2.15.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.asynchttpclient:async-http-client-netty-utils:2.16.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.asynchttpclient:async-http-client:2.1.0=testCompileClasspath,testRuntimeClasspath -org.asynchttpclient:async-http-client:2.15.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.asynchttpclient:async-http-client:2.16.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.checkerframework:checker-qual:3.33.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor org.codehaus.groovy:groovy-ant:3.0.23=codenarc org.codehaus.groovy:groovy-docgenerator:3.0.23=codenarc diff --git a/dd-java-agent/instrumentation/netty/netty-buffer-4.0/gradle.lockfile b/dd-java-agent/instrumentation/netty/netty-buffer-4.0/gradle.lockfile index 83a55f9db31..3e7a8807b21 100644 --- a/dd-java-agent/instrumentation/netty/netty-buffer-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/netty/netty-buffer-4.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:netty:netty-buffer-4.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDep4TestRuntimeClasspath,latestDepTestRuntim com.github.jnr:jnr-posix:3.1.22=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDep4TestAnnotationProcessor,latestDep4TestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/netty/netty-common/gradle.lockfile b/dd-java-agent/instrumentation/netty/netty-common/gradle.lockfile index 1f3c5861844..b69b14da908 100644 --- a/dd-java-agent/instrumentation/netty/netty-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/netty/netty-common/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:netty:netty-common:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/gradle.lockfile b/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/gradle.lockfile index 058835f3dc3..5f16a18a1a0 100644 --- a/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:netty:netty-concurrent-4.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDep4TestRuntimeClasspath,latestDepTestRuntim com.github.jnr:jnr-posix:3.1.22=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDep4TestAnnotationProcessor,latestDep4TestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/netty/netty-promise-4.0/gradle.lockfile b/dd-java-agent/instrumentation/netty/netty-promise-4.0/gradle.lockfile index 7267a737b4d..c5ae8d014c7 100644 --- a/dd-java-agent/instrumentation/netty/netty-promise-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/netty/netty-promise-4.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:netty:netty-promise-4.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDep4TestRuntimeClasspath,latestDepTestRuntim com.github.jnr:jnr-posix:3.1.22=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDep4TestAnnotationProcessor,latestDep4TestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/ognl-appsec-3.3.2/gradle.lockfile b/dd-java-agent/instrumentation/ognl-appsec-3.3.2/gradle.lockfile index f8bbf6b0170..1fc5ce9c43e 100644 --- a/dd-java-agent/instrumentation/ognl-appsec-3.3.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/ognl-appsec-3.3.2/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:ognl-appsec-3.3.2:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/okhttp/okhttp-2.2/gradle.lockfile b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/gradle.lockfile index 7350cfe902d..470c0312e1a 100644 --- a/dd-java-agent/instrumentation/okhttp/okhttp-2.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:okhttp:okhttp-2.2:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/okhttp/okhttp-3.0/gradle.lockfile b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/gradle.lockfile index e9d4aadc7e7..a8423d01118 100644 --- a/dd-java-agent/instrumentation/okhttp/okhttp-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:okhttp:okhttp-3.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/gradle.lockfile b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/gradle.lockfile index 7aa809957ac..15f33a0f66b 100644 --- a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:openai-java:openai-java-3.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -29,7 +30,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.github.victools:jsonschema-generator:4.38.0=latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -50,11 +51,11 @@ com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=anno com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath com.openai:openai-java-client-okhttp:3.0.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.openai:openai-java-client-okhttp:4.39.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.openai:openai-java-client-okhttp:4.41.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.openai:openai-java-core:3.0.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.openai:openai-java-core:4.39.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.openai:openai-java-core:4.41.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.openai:openai-java:3.0.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.openai:openai-java:4.39.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.openai:openai-java:4.41.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath com.squareup.okhttp3:logging-interceptor:4.12.0=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/opensearch/opensearch-common/gradle.lockfile b/dd-java-agent/instrumentation/opensearch/opensearch-common/gradle.lockfile index 8a646172661..666809c4dc4 100644 --- a/dd-java-agent/instrumentation/opensearch/opensearch-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/opensearch/opensearch-common/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:opensearch:opensearch-common:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -26,7 +27,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/opensearch/opensearch-rest-1.0/gradle.lockfile b/dd-java-agent/instrumentation/opensearch/opensearch-rest-1.0/gradle.lockfile index 3b8ee533654..d2637036a1c 100644 --- a/dd-java-agent/instrumentation/opensearch/opensearch-rest-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/opensearch/opensearch-rest-1.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:opensearch:opensearch-rest-1.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -26,7 +27,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.spullara.mustache.java:compiler:0.9.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs diff --git a/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/gradle.lockfile b/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/gradle.lockfile index 4f2847649c2..928fc3bc21a 100644 --- a/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:opensearch:opensearch-transport-1.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -26,7 +27,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.spullara.mustache.java:compiler:0.9.6=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs diff --git a/dd-java-agent/instrumentation/opentelemetry/gradle.lockfile b/dd-java-agent/instrumentation/opentelemetry/gradle.lockfile index 971ba344154..94400dc1505 100644 --- a/dd-java-agent/instrumentation/opentelemetry/gradle.lockfile +++ b/dd-java-agent/instrumentation/opentelemetry/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:opentelemetry:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/gradle.lockfile b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/gradle.lockfile index 02ec056d5c3..6eff6f12238 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:opentelemetry:opentelemetry-0.3:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.27/gradle.lockfile b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.27/gradle.lockfile index 2392acccce6..2b9ceb87a02 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.27/gradle.lockfile +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.27/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:opentelemetry:opentelemetry-1.27:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/gradle.lockfile b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/gradle.lockfile index 11dc9a5839e..fccdad30367 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:opentelemetry:opentelemetry-1.4:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/gradle.lockfile b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/gradle.lockfile index 73b9543521d..8c378304c36 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/gradle.lockfile +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:opentelemetry:opentelemetry-1.47:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -29,7 +30,7 @@ com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspa com.github.jnr:jnr-unixsocket:0.27=latestDepTestCompileClasspath,testCompileClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/gradle.lockfile b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/gradle.lockfile index 1067e6ad219..f7dbd49824b 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/gradle.lockfile +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:opentelemetry:opentelemetry-annotations-1.20:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latest1xDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latest1xDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latest1xDepTestCompileClasspath,latest1xDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latest1xDepTestRuntimeClasspath,latestDepTestRunti com.github.jnr:jnr-posix:3.1.22=latest1xDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latest1xDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latest1xDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latest1xDepTestCompileClasspath,latest1xDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latest1xDepTestAnnotationProcessor,latest1xDepTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath @@ -50,14 +51,14 @@ de.thetaphi:forbiddenapis:3.10=compileClasspath,latest1xDepTestCompileClasspath, io.leangen.geantyref:geantyref:1.3.16=latest1xDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:1.20.0=compileClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:1.33.6=latest1xDepTestCompileClasspath,latest1xDepTestRuntimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:2.28.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:2.29.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.opentelemetry:opentelemetry-api:1.20.0=compileClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-api:1.41.0=latest1xDepTestCompileClasspath,latest1xDepTestRuntimeClasspath -io.opentelemetry:opentelemetry-api:1.62.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.opentelemetry:opentelemetry-common:1.62.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.opentelemetry:opentelemetry-api:1.63.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.opentelemetry:opentelemetry-common:1.63.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.opentelemetry:opentelemetry-context:1.20.0=compileClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-context:1.41.0=latest1xDepTestCompileClasspath,latest1xDepTestRuntimeClasspath -io.opentelemetry:opentelemetry-context:1.62.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.opentelemetry:opentelemetry-context:1.63.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.sqreen:libsqreen:17.3.0=latest1xDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latest1xDepTestCompileClasspath,latest1xDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.0=spotbugs diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.26/gradle.lockfile b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.26/gradle.lockfile index dd3313f7c00..d788512b8ca 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.26/gradle.lockfile +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.26/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:opentelemetry:opentelemetry-annotations-1.26:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-0.31/gradle.lockfile b/dd-java-agent/instrumentation/opentracing/opentracing-0.31/gradle.lockfile index b75f620ddde..b26e96e1d04 100644 --- a/dd-java-agent/instrumentation/opentracing/opentracing-0.31/gradle.lockfile +++ b/dd-java-agent/instrumentation/opentracing/opentracing-0.31/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:opentracing:opentracing-0.31:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-0.32/gradle.lockfile b/dd-java-agent/instrumentation/opentracing/opentracing-0.32/gradle.lockfile index 371e062cccb..e3a14d1dc56 100644 --- a/dd-java-agent/instrumentation/opentracing/opentracing-0.32/gradle.lockfile +++ b/dd-java-agent/instrumentation/opentracing/opentracing-0.32/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:opentracing:opentracing-0.32:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-common/gradle.lockfile b/dd-java-agent/instrumentation/opentracing/opentracing-common/gradle.lockfile index 7d411c461bc..8f7eb8a3f27 100644 --- a/dd-java-agent/instrumentation/opentracing/opentracing-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/opentracing/opentracing-common/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:opentracing:opentracing-common:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/org-json-20230227/gradle.lockfile b/dd-java-agent/instrumentation/org-json-20230227/gradle.lockfile index 37ae86f2874..5b1b0d1811a 100644 --- a/dd-java-agent/instrumentation/org-json-20230227/gradle.lockfile +++ b/dd-java-agent/instrumentation/org-json-20230227/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:org-json-20230227:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/osgi-4.3/gradle.lockfile b/dd-java-agent/instrumentation/osgi-4.3/gradle.lockfile index 3636c1d7728..44a2cf26185 100644 --- a/dd-java-agent/instrumentation/osgi-4.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/osgi-4.3/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:osgi-4.3:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/owasp-esapi-2.1/gradle.lockfile b/dd-java-agent/instrumentation/owasp-esapi-2.1/gradle.lockfile index 74858ea416f..7e8f0610c9e 100644 --- a/dd-java-agent/instrumentation/owasp-esapi-2.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/owasp-esapi-2.1/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:owasp-esapi-2.1:dependencies --write-locks avalon-framework:avalon-framework:4.1.3=compileClasspath,csiCompileClasspath,testCompileClasspath,testRuntimeClasspath cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -22,7 +23,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,csiCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/gradle.lockfile b/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/gradle.lockfile index a48cc783eff..476746099bf 100644 --- a/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:pekko:pekko-concurrent-1.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -25,7 +26,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/gradle.lockfile b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/gradle.lockfile index a37884ab9e8..5be56f986d0 100644 --- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:pekko:pekko-http-1.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=baseTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestPekko10TestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=baseTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestPekko10TestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPekko10TestCompileClasspath,latestPekko10TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -37,7 +38,7 @@ com.github.jnr:jnr-unixsocket:0.38.25=baseTestRuntimeClasspath,iastTestRuntimeCl com.github.jnr:jnr-x86asm:1.0.2=baseTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestPekko10TestRuntimeClasspath,testRuntimeClasspath com.github.pjfanning:pekko-http-jackson_2.12:2.1.0=iastTestCompileClasspath,iastTestRuntimeClasspath com.github.pjfanning:pekko-http-jackson_2.13:2.8.0=latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath,csiCompileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPekko10TestCompileClasspath,latestPekko10TestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,baseTestAnnotationProcessor,baseTestCompileClasspath,compileClasspath,csiCompileClasspath,iastTestAnnotationProcessor,iastTestCompileClasspath,latestDepIastTestAnnotationProcessor,latestDepIastTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestPekko10TestAnnotationProcessor,latestPekko10TestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/play-ws/play-ws-1.0/gradle.lockfile b/dd-java-agent/instrumentation/play-ws/play-ws-1.0/gradle.lockfile index ea08c38faa4..52807845814 100644 --- a/dd-java-agent/instrumentation/play-ws/play-ws-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/play-ws/play-ws-1.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:play-ws:play-ws-1.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/play-ws/play-ws-2.0/gradle.lockfile b/dd-java-agent/instrumentation/play-ws/play-ws-2.0/gradle.lockfile index 720d653a6e9..36ffd889391 100644 --- a/dd-java-agent/instrumentation/play-ws/play-ws-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/play-ws/play-ws-2.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:play-ws:play-ws-2.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/play-ws/play-ws-2.1/gradle.lockfile b/dd-java-agent/instrumentation/play-ws/play-ws-2.1/gradle.lockfile index 07e7be56839..2890312d82e 100644 --- a/dd-java-agent/instrumentation/play-ws/play-ws-2.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/play-ws/play-ws-2.1/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:play-ws:play-ws-2.1:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/play-ws/play-ws-common/gradle.lockfile b/dd-java-agent/instrumentation/play-ws/play-ws-common/gradle.lockfile index 4e7c2a9dc05..324d1ecf8ee 100644 --- a/dd-java-agent/instrumentation/play-ws/play-ws-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/play-ws/play-ws-common/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:play-ws:play-ws-common:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/play/play-2.3/gradle.lockfile b/dd-java-agent/instrumentation/play/play-2.3/gradle.lockfile index 13cb8199b23..a52043c1f45 100644 --- a/dd-java-agent/instrumentation/play/play-2.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/play/play-2.3/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:play:play-2.3:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cglib:cglib-nodep:2.1_3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -32,7 +33,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/play/play-2.4/gradle.lockfile b/dd-java-agent/instrumentation/play/play-2.4/gradle.lockfile index 12d07365510..b82fcb7a0fc 100644 --- a/dd-java-agent/instrumentation/play/play-2.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/play/play-2.4/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:play:play-2.4:dependencies --write-locks aopalliance:aopalliance:1.0=compileClasspath cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath @@ -29,7 +30,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/play/play-2.6/gradle.lockfile b/dd-java-agent/instrumentation/play/play-2.6/gradle.lockfile index e366132cdcd..a5ad83ce428 100644 --- a/dd-java-agent/instrumentation/play/play-2.6/gradle.lockfile +++ b/dd-java-agent/instrumentation/play/play-2.6/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:play:play-2.6:dependencies --write-locks aopalliance:aopalliance:1.0=testCompileClasspath,testFixturesCompileClasspath,testRuntimeClasspath cafe.cryptography:curve25519-elisabeth:0.1.0=testFixturesRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testFixturesRuntimeClasspath,testRuntimeClasspath @@ -32,7 +33,7 @@ com.github.jnr:jnr-ffi:2.2.19=testFixturesRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testFixturesRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testFixturesRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testFixturesRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.5/gradle.lockfile b/dd-java-agent/instrumentation/play/play-appsec-2.5/gradle.lockfile index 7a397afdfff..e1c7ac01b98 100644 --- a/dd-java-agent/instrumentation/play/play-appsec-2.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:play:play-appsec-2.5:dependencies --write-locks aopalliance:aopalliance:1.0=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -38,7 +39,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.6/gradle.lockfile b/dd-java-agent/instrumentation/play/play-appsec-2.6/gradle.lockfile index 8735338aa6c..d40d51e22f2 100644 --- a/dd-java-agent/instrumentation/play/play-appsec-2.6/gradle.lockfile +++ b/dd-java-agent/instrumentation/play/play-appsec-2.6/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:play:play-appsec-2.6:dependencies --write-locks aopalliance:aopalliance:1.0=testCompileClasspath,testRuntimeClasspath cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath @@ -32,7 +33,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.7/gradle.lockfile b/dd-java-agent/instrumentation/play/play-appsec-2.7/gradle.lockfile index 2cd9977be52..bd7b5f28800 100644 --- a/dd-java-agent/instrumentation/play/play-appsec-2.7/gradle.lockfile +++ b/dd-java-agent/instrumentation/play/play-appsec-2.7/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:play:play-appsec-2.7:dependencies --write-locks aopalliance:aopalliance:1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath at.yawk.lz4:lz4-java:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -45,7 +46,7 @@ com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspa com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.sbt:junit-interface:0.13.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/play/play-appsec-common/gradle.lockfile b/dd-java-agent/instrumentation/play/play-appsec-common/gradle.lockfile index 971ba344154..ad01f4efe4e 100644 --- a/dd-java-agent/instrumentation/play/play-appsec-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/play/play-appsec-common/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:play:play-appsec-common:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/protobuf-3.0/gradle.lockfile b/dd-java-agent/instrumentation/protobuf-3.0/gradle.lockfile index 7c9057722c8..e7950743858 100644 --- a/dd-java-agent/instrumentation/protobuf-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/protobuf-3.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:protobuf-3.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testCompileProtoPath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testCompileProtoPath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testCompileProtoPath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testCompileProtoPath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testCompileProtoPath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testCompileProtoPath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,compileProtoPath,spotbugs,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,compileProtoPath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,compileProtoPath,testAnnotationProcessor,testCompileClasspath,testCompileProtoPath diff --git a/dd-java-agent/instrumentation/quartz-2.0/gradle.lockfile b/dd-java-agent/instrumentation/quartz-2.0/gradle.lockfile index ecf219229d5..6c447bc9bc5 100644 --- a/dd-java-agent/instrumentation/quartz-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/quartz-2.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:quartz-2.0:dependencies --write-locks c3p0:c3p0:0.9.1.1=compileClasspath,testCompileClasspath,testRuntimeClasspath cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath,version40TestRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath,version40TestRuntimeClasspath @@ -22,7 +23,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath,version40TestRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath,version40TestRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath,version40TestRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath,version40TestCompileClasspath,version40TestRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath,version40TestAnnotationProcessor,version40TestCompileClasspath diff --git a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/gradle.lockfile b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/gradle.lockfile index ccdc0a00751..4df736a9ae5 100644 --- a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/gradle.lockfile +++ b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:rabbitmq-amqp-2.7:dependencies --write-locks aopalliance:aopalliance:1.0=latestReactorTestCompileClasspath,latestReactorTestRuntimeClasspath,reactorTestCompileClasspath,reactorTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,latestReactorTestRuntimeClasspath,reactorTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,latestReactorTestRuntimeClasspath,reactorTestRuntimeClasspath,testRuntimeClasspath @@ -26,7 +27,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,latestReactorTestRun com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,latestReactorTestRuntimeClasspath,reactorTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,latestReactorTestRuntimeClasspath,reactorTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,latestReactorTestRuntimeClasspath,reactorTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestReactorTestCompileClasspath,latestReactorTestRuntimeClasspath,reactorTestCompileClasspath,reactorTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestReactorTestAnnotationProcessor,latestReactorTestCompileClasspath,reactorTestAnnotationProcessor,reactorTestCompileClasspath,testAnnotationProcessor,testCompileClasspath @@ -45,7 +46,7 @@ com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,latestReactorTestRuntimeC com.rabbitmq:amqp-client:2.7.0=compileClasspath com.rabbitmq:amqp-client:2.8.1=testCompileClasspath,testRuntimeClasspath com.rabbitmq:amqp-client:5.14.2=latestReactorTestCompileClasspath,latestReactorTestRuntimeClasspath -com.rabbitmq:amqp-client:5.31.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.rabbitmq:amqp-client:5.32.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.rabbitmq:amqp-client:5.5.1=reactorTestCompileClasspath,reactorTestRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestReactorTestCompileClasspath,latestReactorTestRuntimeClasspath,reactorTestCompileClasspath,reactorTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestReactorTestCompileClasspath,latestReactorTestRuntimeClasspath,reactorTestCompileClasspath,reactorTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -60,17 +61,17 @@ commons-io:commons-io:2.20.0=spotbugs commons-logging:commons-logging:1.1.1=latestReactorTestCompileClasspath,latestReactorTestRuntimeClasspath,reactorTestCompileClasspath,reactorTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.10=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestReactorTestCompileClasspath,latestReactorTestRuntimeClasspath,reactorTestCompileClasspath,reactorTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.leangen.geantyref:geantyref:1.3.16=latestDepTestRuntimeClasspath,latestReactorTestRuntimeClasspath,reactorTestRuntimeClasspath,testRuntimeClasspath -io.netty:netty-buffer:4.2.14.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.netty:netty-codec-base:4.2.14.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.netty:netty-codec-compression:4.2.14.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.netty:netty-codec-marshalling:4.2.14.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.netty:netty-codec-protobuf:4.2.14.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.netty:netty-codec:4.2.14.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.netty:netty-common:4.2.14.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.netty:netty-handler:4.2.14.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.netty:netty-resolver:4.2.14.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.netty:netty-transport-native-unix-common:4.2.14.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.netty:netty-transport:4.2.14.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-buffer:4.2.15.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-base:4.2.15.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-compression:4.2.15.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-marshalling:4.2.15.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-protobuf:4.2.15.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec:4.2.15.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-common:4.2.15.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-handler:4.2.15.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-resolver:4.2.15.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.2.15.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport:4.2.15.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.projectreactor.rabbitmq:reactor-rabbitmq:1.0.0.RELEASE=reactorTestCompileClasspath,reactorTestRuntimeClasspath io.projectreactor.rabbitmq:reactor-rabbitmq:1.5.6=latestReactorTestCompileClasspath,latestReactorTestRuntimeClasspath io.projectreactor:reactor-core:3.2.3.RELEASE=reactorTestCompileClasspath,reactorTestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/ratpack-1.5/gradle.lockfile b/dd-java-agent/instrumentation/ratpack-1.5/gradle.lockfile index 696db37a569..ebde5d2448a 100644 --- a/dd-java-agent/instrumentation/ratpack-1.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/ratpack-1.5/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:ratpack-1.5:dependencies --write-locks aopalliance:aopalliance:1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -39,7 +40,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/reactive-streams-1.0/gradle.lockfile b/dd-java-agent/instrumentation/reactive-streams-1.0/gradle.lockfile index 8a3d7f74a3f..3cffca571c2 100644 --- a/dd-java-agent/instrumentation/reactive-streams-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/reactive-streams-1.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:reactive-streams-1.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/reactor-core-3.1/gradle.lockfile b/dd-java-agent/instrumentation/reactor-core-3.1/gradle.lockfile index 501a3233d33..91a8e44f8c9 100644 --- a/dd-java-agent/instrumentation/reactor-core-3.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/reactor-core-3.1/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:reactor-core-3.1:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/reactor-netty-1.0/gradle.lockfile b/dd-java-agent/instrumentation/reactor-netty-1.0/gradle.lockfile index 9c7d3a18456..b5a7b28049f 100644 --- a/dd-java-agent/instrumentation/reactor-netty-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/reactor-netty-1.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:reactor-netty-1.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/rediscala-1.8/gradle.lockfile b/dd-java-agent/instrumentation/rediscala-1.8/gradle.lockfile index f020f00df67..1d63e0ea259 100644 --- a/dd-java-agent/instrumentation/rediscala-1.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/rediscala-1.8/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:rediscala-1.8:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -24,7 +25,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/redisson/redisson-2.0.0/gradle.lockfile b/dd-java-agent/instrumentation/redisson/redisson-2.0.0/gradle.lockfile index ba85c0dbb5a..eab1f045060 100644 --- a/dd-java-agent/instrumentation/redisson/redisson-2.0.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/redisson/redisson-2.0.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:redisson:redisson-2.0.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -36,7 +37,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepForkedTestRuntimeClasspath,latestDepTestR com.github.jnr:jnr-posix:3.1.22=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/redisson/redisson-2.3.0/gradle.lockfile b/dd-java-agent/instrumentation/redisson/redisson-2.3.0/gradle.lockfile index 3ff4e40bcaf..4892d674429 100644 --- a/dd-java-agent/instrumentation/redisson/redisson-2.3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/redisson/redisson-2.3.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:redisson:redisson-2.3.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -37,7 +38,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepForkedTestRuntimeClasspath,latestDepTestR com.github.jnr:jnr-posix:3.1.22=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/redisson/redisson-3.10.3/gradle.lockfile b/dd-java-agent/instrumentation/redisson/redisson-3.10.3/gradle.lockfile index a00c7b08e57..b93e78b3bbe 100644 --- a/dd-java-agent/instrumentation/redisson/redisson-3.10.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/redisson/redisson-3.10.3/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:redisson:redisson-3.10.3:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -43,7 +44,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepForkedTestRuntimeClasspath,latestDepTestR com.github.jnr:jnr-posix:3.1.22=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/renaissance-0.7/gradle.lockfile b/dd-java-agent/instrumentation/renaissance-0.7/gradle.lockfile index 971ba344154..7f5e36ae930 100644 --- a/dd-java-agent/instrumentation/renaissance-0.7/gradle.lockfile +++ b/dd-java-agent/instrumentation/renaissance-0.7/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:renaissance-0.7:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/gradle.lockfile b/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/gradle.lockfile index 7e2d7a83cad..c8a4090a5a4 100644 --- a/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:resilience4j:resilience4j-2.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/gradle.lockfile b/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/gradle.lockfile index 8c5548f0678..45dd2b52541 100644 --- a/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:resilience4j:resilience4j-reactor-2.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.0/gradle.lockfile b/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.0/gradle.lockfile index 4d4b633af8b..4bb555685f0 100644 --- a/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:resteasy:filter-resteasy:filter-resteasy-3.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.1/gradle.lockfile b/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.1/gradle.lockfile index 5fb91e98c3b..21c653cd4ee 100644 --- a/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.1/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:resteasy:filter-resteasy:filter-resteasy-3.1:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/resteasy/resteasy-3.0/gradle.lockfile b/dd-java-agent/instrumentation/resteasy/resteasy-3.0/gradle.lockfile index d2e681f76a1..8db38c49a55 100644 --- a/dd-java-agent/instrumentation/resteasy/resteasy-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/resteasy/resteasy-3.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:resteasy:resteasy-3.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/restlet-2.2/gradle.lockfile b/dd-java-agent/instrumentation/restlet-2.2/gradle.lockfile index 6f52e7ffa99..eab8b78d6b8 100644 --- a/dd-java-agent/instrumentation/restlet-2.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/restlet-2.2/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:restlet-2.2:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=baseForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=baseForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=baseForkedTestRuntimeClasspath,latestDepTestRuntim com.github.jnr:jnr-posix:3.1.22=baseForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=baseForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=baseForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,baseForkedTestAnnotationProcessor,baseForkedTestCompileClasspath,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/gradle.lockfile b/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/gradle.lockfile index 1aa703c22f9..287b0a6d32c 100644 --- a/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:rs:jakarta-rs-annotations-3.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepJava11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepJava11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepJava11TestRuntimeClasspath,latestDepTestR com.github.jnr:jnr-posix:3.1.22=latestDepJava11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepJava11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepJava11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepJava11TestAnnotationProcessor,latestDepJava11TestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-1.1.1/gradle.lockfile b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-1.1.1/gradle.lockfile index 99e18bb868e..92f098f0b96 100644 --- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-1.1.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-1.1.1/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:rs:jax-rs:jax-rs-annotations:jax-rs-annotations-1.1.1:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -41,7 +42,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/gradle.lockfile b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/gradle.lockfile index d21259e8a68..9e6f650db5e 100644 --- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:rs:jax-rs:jax-rs-annotations:jax-rs-annotations-2.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,nestedTestRuntimeClasspath,resteasy31TestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,nestedTestRuntimeClasspath,resteasy31TestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-access:1.2.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,nestedTestCompileClasspath,nestedTestRuntimeClasspath,resteasy31TestCompileClasspath,resteasy31TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -36,7 +37,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,nestedTestRuntimeCla com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,nestedTestRuntimeClasspath,resteasy31TestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,nestedTestRuntimeClasspath,resteasy31TestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,nestedTestRuntimeClasspath,resteasy31TestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,nestedTestCompileClasspath,nestedTestRuntimeClasspath,resteasy31TestCompileClasspath,resteasy31TestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,nestedTestAnnotationProcessor,nestedTestCompileClasspath,resteasy31TestAnnotationProcessor,resteasy31TestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-1.1/gradle.lockfile b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-1.1/gradle.lockfile index f7e8fb9fb9a..d62e22856a9 100644 --- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-1.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-1.1/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:rs:jax-rs:jax-rs-client:jax-rs-client-1.1:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/gradle.lockfile b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/gradle.lockfile index 5413e3972be..2c62688db2f 100644 --- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:rs:jax-rs:jax-rs-client:jax-rs-client-2.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -22,7 +23,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-1.0/gradle.lockfile b/dd-java-agent/instrumentation/rxjava/rxjava-1.0/gradle.lockfile index 341e024eeff..c6d279cb258 100644 --- a/dd-java-agent/instrumentation/rxjava/rxjava-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/rxjava/rxjava-1.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:rxjava:rxjava-1.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-2.0/gradle.lockfile b/dd-java-agent/instrumentation/rxjava/rxjava-2.0/gradle.lockfile index b8e075fa7f2..ec1ad425b48 100644 --- a/dd-java-agent/instrumentation/rxjava/rxjava-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/rxjava/rxjava-2.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:rxjava:rxjava-2.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/scala/scala-2.10.7/gradle.lockfile b/dd-java-agent/instrumentation/scala/scala-2.10.7/gradle.lockfile index 8f03934fdd4..efecf7af88f 100644 --- a/dd-java-agent/instrumentation/scala/scala-2.10.7/gradle.lockfile +++ b/dd-java-agent/instrumentation/scala/scala-2.10.7/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:scala:scala-2.10.7:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -25,7 +26,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,csiCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/gradle.lockfile b/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/gradle.lockfile index dfcc5599691..fe1e701c148 100644 --- a/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:scala:scala-concurrent-2.8:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latest11TestRuntimeClasspath,latest12TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latest11TestRuntimeClasspath,latest12TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latest11TestCompileClasspath,latest11TestRuntimeClasspath,latest12TestCompileClasspath,latest12TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -25,7 +26,7 @@ com.github.jnr:jnr-ffi:2.2.19=latest11TestRuntimeClasspath,latest12TestRuntimeCl com.github.jnr:jnr-posix:3.1.22=latest11TestRuntimeClasspath,latest12TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latest11TestRuntimeClasspath,latest12TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latest11TestRuntimeClasspath,latest12TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latest11TestCompileClasspath,latest11TestRuntimeClasspath,latest12TestCompileClasspath,latest12TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latest11TestAnnotationProcessor,latest11TestCompileClasspath,latest12TestAnnotationProcessor,latest12TestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.10/gradle.lockfile b/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.10/gradle.lockfile index 4c503b80e1c..f75a692c9ba 100644 --- a/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.10/gradle.lockfile +++ b/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.10/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:scala:scala-promise:scala-promise-2.10:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -25,7 +26,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepForkedTestRuntimeClasspath,latestDepTestR com.github.jnr:jnr-posix:3.1.22=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.13/gradle.lockfile b/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.13/gradle.lockfile index 366be84d85d..2db4bd0a4ca 100644 --- a/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.13/gradle.lockfile +++ b/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.13/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:scala:scala-promise:scala-promise-2.13:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -25,7 +26,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepForkedTestRuntimeClasspath,latestDepTestR com.github.jnr:jnr-posix:3.1.22=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-common/gradle.lockfile b/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-common/gradle.lockfile index 093e5f8fa02..ef9ea833a92 100644 --- a/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-common/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:scala:scala-promise:scala-promise-common:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -25,7 +26,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/scalatest-3.0.8/gradle.lockfile b/dd-java-agent/instrumentation/scalatest-3.0.8/gradle.lockfile index cacab46a11e..749e25db5f8 100644 --- a/dd-java-agent/instrumentation/scalatest-3.0.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/scalatest-3.0.8/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:scalatest-3.0.8:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -29,7 +30,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/selenium-3.13/gradle.lockfile b/dd-java-agent/instrumentation/selenium-3.13/gradle.lockfile index 4cbefdcca06..45eb3646a7a 100644 --- a/dd-java-agent/instrumentation/selenium-3.13/gradle.lockfile +++ b/dd-java-agent/instrumentation/selenium-3.13/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:selenium-3.13:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -25,7 +26,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testFixturesRuntimeC com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath @@ -65,21 +66,21 @@ commons-io:commons-io:2.11.0=testCompileClasspath,testFixturesCompileClasspath,t commons-io:commons-io:2.20.0=spotbugs commons-io:commons-io:2.22.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath commons-logging:commons-logging:1.2=testCompileClasspath,testRuntimeClasspath -commons-logging:commons-logging:1.3.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +commons-logging:commons-logging:1.4.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath commons-net:commons-net:3.9.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.10=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath io.leangen.geantyref:geantyref:1.3.16=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.opentelemetry:opentelemetry-api:1.62.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.opentelemetry:opentelemetry-common:1.62.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.opentelemetry:opentelemetry-context:1.62.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.opentelemetry:opentelemetry-exporter-logging:1.62.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.opentelemetry:opentelemetry-sdk-common:1.62.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.62.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.62.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.opentelemetry:opentelemetry-sdk-logs:1.62.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.opentelemetry:opentelemetry-sdk-metrics:1.62.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.opentelemetry:opentelemetry-sdk-trace:1.62.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.opentelemetry:opentelemetry-sdk:1.62.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.opentelemetry:opentelemetry-api:1.63.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.opentelemetry:opentelemetry-common:1.63.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.opentelemetry:opentelemetry-context:1.63.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-logging:1.63.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.opentelemetry:opentelemetry-sdk-common:1.63.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.63.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.63.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.opentelemetry:opentelemetry-sdk-logs:1.63.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.opentelemetry:opentelemetry-sdk-metrics:1.63.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.opentelemetry:opentelemetry-sdk-trace:1.63.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.opentelemetry:opentelemetry-sdk:1.63.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.sqreen:libsqreen:17.3.0=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath jaxen:jaxen:2.0.0=spotbugs @@ -110,8 +111,6 @@ org.apache.httpcomponents:httpcore:4.4.16=latestDepTestCompileClasspath,latestDe org.apache.httpcomponents:httpmime:4.5.14=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.logging.log4j:log4j-api:2.25.2=spotbugs org.apache.logging.log4j:log4j-core:2.25.2=spotbugs -org.apache.maven:maven-artifact:3.9.16=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.apache.maven:maven-model:3.9.16=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=latestDepTestCompileClasspath,testCompileClasspath,testFixturesCompileClasspath org.brotli:dec:0.1.2=testCompileClasspath,testRuntimeClasspath org.checkerframework:checker-compat-qual:2.0.0=compileClasspath,testCompileClasspath,testRuntimeClasspath @@ -126,7 +125,6 @@ org.codehaus.groovy:groovy-xml:3.0.23=codenarc org.codehaus.groovy:groovy:3.0.23=codenarc org.codehaus.groovy:groovy:3.0.25=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.14=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.codehaus.plexus:plexus-utils:3.6.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.codenarc:CodeNarc:3.7.0=codenarc org.dom4j:dom4j:2.2.0=spotbugs org.eclipse.jetty.websocket:websocket-api:9.4.50.v20221201=testCompileClasspath,testRuntimeClasspath @@ -140,13 +138,13 @@ org.freemarker:freemarker:2.3.31=latestDepTestCompileClasspath,latestDepTestRunt org.gmetrics:GMetrics:2.1.0=codenarc org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testRuntimeClasspath -org.htmlunit:htmlunit-core-js:5.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.htmlunit:htmlunit-csp:5.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.htmlunit:htmlunit-cssparser:5.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.htmlunit:htmlunit-websocket-client:5.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.htmlunit:htmlunit-xpath:5.0.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.htmlunit:htmlunit:5.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.htmlunit:neko-htmlunit:5.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.htmlunit:htmlunit-core-js:5.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.htmlunit:htmlunit-csp:5.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.htmlunit:htmlunit-cssparser:5.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.htmlunit:htmlunit-websocket-client:5.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.htmlunit:htmlunit-xpath:5.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.htmlunit:htmlunit:5.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.htmlunit:neko-htmlunit:5.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.jacoco:org.jacoco.core:0.8.14=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.jacoco:org.jacoco.report:0.8.14=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -180,34 +178,35 @@ org.ow2.asm:asm-util:9.9=spotbugs org.ow2.asm:asm:9.9=spotbugs org.ow2.asm:asm:9.9.1=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.seleniumhq.selenium:htmlunit-driver:2.70.0=testCompileClasspath,testRuntimeClasspath -org.seleniumhq.selenium:htmlunit3-driver:4.44.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:htmlunit3-driver:4.45.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.seleniumhq.selenium:selenium-api:3.141.59=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.seleniumhq.selenium:selenium-api:4.44.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-api:4.45.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.seleniumhq.selenium:selenium-chrome-driver:3.141.59=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.seleniumhq.selenium:selenium-chrome-driver:4.44.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.seleniumhq.selenium:selenium-chromium-driver:4.44.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.seleniumhq.selenium:selenium-devtools-v146:4.44.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.seleniumhq.selenium:selenium-devtools-v147:4.44.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.seleniumhq.selenium:selenium-devtools-v148:4.44.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-chrome-driver:4.45.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-chromium-driver:4.45.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-devtools-latest:4.45.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-devtools-v147:4.45.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-devtools-v148:4.45.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-devtools-v149:4.45.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.seleniumhq.selenium:selenium-edge-driver:3.141.59=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.seleniumhq.selenium:selenium-edge-driver:4.44.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-edge-driver:4.45.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.seleniumhq.selenium:selenium-firefox-driver:3.141.59=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.seleniumhq.selenium:selenium-firefox-driver:4.44.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.seleniumhq.selenium:selenium-http:4.44.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-firefox-driver:4.45.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-http:4.45.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.seleniumhq.selenium:selenium-ie-driver:3.141.59=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.seleniumhq.selenium:selenium-ie-driver:4.44.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-ie-driver:4.45.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.seleniumhq.selenium:selenium-java:3.141.59=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.seleniumhq.selenium:selenium-java:4.44.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.seleniumhq.selenium:selenium-json:4.44.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.seleniumhq.selenium:selenium-manager:4.44.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-java:4.45.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-json:4.45.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-manager:4.45.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.seleniumhq.selenium:selenium-opera-driver:3.141.59=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.seleniumhq.selenium:selenium-os:4.44.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-os:4.45.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.seleniumhq.selenium:selenium-remote-driver:3.141.59=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.seleniumhq.selenium:selenium-remote-driver:4.44.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-remote-driver:4.45.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.seleniumhq.selenium:selenium-safari-driver:3.141.59=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.seleniumhq.selenium:selenium-safari-driver:4.44.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-safari-driver:4.45.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.seleniumhq.selenium:selenium-support:3.141.59=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.seleniumhq.selenium:selenium-support:4.44.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-support:4.45.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.skyscreamer:jsonassert:1.5.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.slf4j:jcl-over-slf4j:1.7.30=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.slf4j:jul-to-slf4j:1.7.30=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.0/gradle.lockfile b/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.0/gradle.lockfile index 31a64780b26..68d671f9f55 100644 --- a/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:servicetalk:servicetalk-0.42.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -22,7 +23,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.56/gradle.lockfile b/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.56/gradle.lockfile index f0b0bed09bf..241ce1e745d 100644 --- a/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.56/gradle.lockfile +++ b/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.56/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:servicetalk:servicetalk-0.42.56:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/gradle.lockfile b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/gradle.lockfile index c7e03f07c69..4ddf38862b2 100644 --- a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:servlet:jakarta-servlet-5.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testFixturesRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testFixturesRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testFixturesRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testFixturesRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testFixturesRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testFixturesRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,csiCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/gradle.lockfile b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/gradle.lockfile index 2a9fb2e7176..29c24bb7ab1 100644 --- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-2.2:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/gradle.lockfile b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/gradle.lockfile index e008b1f8393..bfe3a91d834 100644 --- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepForkedTestRuntimeClasspath,latestDepTestR com.github.jnr:jnr-posix:3.1.22=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,csiCompileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/gradle.lockfile b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/gradle.lockfile index 342419e98da..1deec1c3509 100644 --- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-common:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,csiCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/gradle.lockfile b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/gradle.lockfile index fcc9b9b6d0f..04b4beeced6 100644 --- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/gradle.lockfile +++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-iast:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/slick-3.2/gradle.lockfile b/dd-java-agent/instrumentation/slick-3.2/gradle.lockfile index af682d3d833..22da2a0e858 100644 --- a/dd-java-agent/instrumentation/slick-3.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/slick-3.2/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:slick-3.2:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -25,7 +26,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/snakeyaml-1.33/gradle.lockfile b/dd-java-agent/instrumentation/snakeyaml-1.33/gradle.lockfile index 6c9cefaea4d..2c25d8d3264 100644 --- a/dd-java-agent/instrumentation/snakeyaml-1.33/gradle.lockfile +++ b/dd-java-agent/instrumentation/snakeyaml-1.33/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:snakeyaml-1.33:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/gradle.lockfile b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/gradle.lockfile index 28d39a23877..0f5e91546c8 100644 --- a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/gradle.lockfile @@ -53,7 +53,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.android:annotations:4.1.1.4=latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -77,7 +77,8 @@ com.google.guava:guava:32.1.3-jre=latestDepTestCompileClasspath,latestDepTestRun com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.http-client:google-http-client-gson:1.41.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.http-client:google-http-client:1.41.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath com.google.protobuf:protobuf-java-util:3.21.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.protobuf:protobuf-java:3.25.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.6=latestDepTestCompileClasspath,testCompileClasspath @@ -118,33 +119,33 @@ io.leangen.geantyref:geantyref:1.3.16=latestDepTestRuntimeClasspath,testRuntimeC io.netty:netty-all:4.1.32.Final=compileClasspath io.netty:netty-all:4.1.79.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-buffer:4.1.79.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-dns:4.1.79.Final=testRuntimeClasspath -io.netty:netty-codec-haproxy:4.1.79.Final=testRuntimeClasspath +io.netty:netty-codec-dns:4.1.79.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-haproxy:4.1.79.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec-http2:4.1.79.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec-http:4.1.79.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-memcache:4.1.79.Final=testRuntimeClasspath -io.netty:netty-codec-mqtt:4.1.79.Final=testRuntimeClasspath -io.netty:netty-codec-redis:4.1.79.Final=testRuntimeClasspath -io.netty:netty-codec-smtp:4.1.79.Final=testRuntimeClasspath -io.netty:netty-codec-socks:4.1.79.Final=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.netty:netty-codec-stomp:4.1.79.Final=testRuntimeClasspath -io.netty:netty-codec-xml:4.1.79.Final=testRuntimeClasspath +io.netty:netty-codec-memcache:4.1.79.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-mqtt:4.1.79.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-redis:4.1.79.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-smtp:4.1.79.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-socks:4.1.79.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-stomp:4.1.79.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-xml:4.1.79.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec:4.1.79.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-common:4.1.79.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-handler-proxy:4.1.79.Final=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.netty:netty-handler-proxy:4.1.79.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-handler:4.1.79.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-resolver-dns-classes-macos:4.1.79.Final=testRuntimeClasspath -io.netty:netty-resolver-dns-native-macos:4.1.79.Final=testRuntimeClasspath -io.netty:netty-resolver-dns:4.1.79.Final=testRuntimeClasspath +io.netty:netty-resolver-dns-classes-macos:4.1.79.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-resolver-dns-native-macos:4.1.79.Final=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.netty:netty-resolver-dns:4.1.79.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-resolver:4.1.79.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-transport-classes-epoll:4.1.79.Final=testRuntimeClasspath -io.netty:netty-transport-classes-kqueue:4.1.79.Final=testRuntimeClasspath -io.netty:netty-transport-native-epoll:4.1.79.Final=testRuntimeClasspath -io.netty:netty-transport-native-kqueue:4.1.79.Final=testRuntimeClasspath +io.netty:netty-transport-classes-epoll:4.1.79.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-transport-classes-kqueue:4.1.79.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-transport-native-epoll:4.1.79.Final=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.netty:netty-transport-native-kqueue:4.1.79.Final=latestDepTestRuntimeClasspath,testRuntimeClasspath io.netty:netty-transport-native-unix-common:4.1.79.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-transport-rxtx:4.1.79.Final=testRuntimeClasspath -io.netty:netty-transport-sctp:4.1.79.Final=testRuntimeClasspath -io.netty:netty-transport-udt:4.1.79.Final=testRuntimeClasspath +io.netty:netty-transport-rxtx:4.1.79.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-transport-sctp:4.1.79.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-transport-udt:4.1.79.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-transport:4.1.79.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.opencensus:opencensus-api:0.28.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.opencensus:opencensus-contrib-http-util:0.28.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spark/spark-executor-common/gradle.lockfile b/dd-java-agent/instrumentation/spark/spark-executor-common/gradle.lockfile index 44636b69ca0..8129cf28877 100644 --- a/dd-java-agent/instrumentation/spark/spark-executor-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/spark/spark-executor-common/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:spark:spark-executor-common:dependencies --write-locks aopalliance:aopalliance:1.0=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath cafe.cryptography:curve25519-elisabeth:0.1.0=baseTestRuntimeClasspath,latest212DepTestRuntimeClasspath,latest213DepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=baseTestRuntimeClasspath,latest212DepTestRuntimeClasspath,latest213DepTestRuntimeClasspath,testRuntimeClasspath @@ -41,7 +42,7 @@ com.github.jnr:jnr-unixsocket:0.38.25=baseTestRuntimeClasspath,latest212DepTestR com.github.jnr:jnr-x86asm:1.0.2=baseTestRuntimeClasspath,latest212DepTestRuntimeClasspath,latest213DepTestRuntimeClasspath,testRuntimeClasspath com.github.luben:zstd-jni:1.3.2-2=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath com.github.luben:zstd-jni:1.5.5-4=latest212DepTestCompileClasspath,latest212DepTestRuntimeClasspath,latest213DepTestCompileClasspath,latest213DepTestRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath,latest212DepTestCompileClasspath,latest212DepTestRuntimeClasspath,latest213DepTestCompileClasspath,latest213DepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,baseTestAnnotationProcessor,baseTestCompileClasspath,compileClasspath,latest212DepTestAnnotationProcessor,latest212DepTestCompileClasspath,latest213DepTestAnnotationProcessor,latest213DepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/spark/sparkjava-2.3/gradle.lockfile b/dd-java-agent/instrumentation/spark/sparkjava-2.3/gradle.lockfile index 3f07327de42..6f55ed31f4c 100644 --- a/dd-java-agent/instrumentation/spark/sparkjava-2.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/spark/sparkjava-2.3/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:spark:sparkjava-2.3:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/spray-1.3/gradle.lockfile b/dd-java-agent/instrumentation/spray-1.3/gradle.lockfile index df14c9989b4..3cd94493909 100644 --- a/dd-java-agent/instrumentation/spray-1.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/spray-1.3/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:spray-1.3:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -26,7 +27,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-beans-3.1/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-beans-3.1/gradle.lockfile index 0f3a82d66bc..5986537ac5c 100644 --- a/dd-java-agent/instrumentation/spring/spring-beans-3.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-beans-3.1/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:spring:spring-beans-3.1:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-boot-1.3/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-boot-1.3/gradle.lockfile index d3e9c69128e..928ae9777b4 100644 --- a/dd-java-agent/instrumentation/spring/spring-boot-1.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-boot-1.3/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:spring:spring-boot-1.3:dependencies --write-locks aopalliance:aopalliance:1.0=compileClasspath,testCompileClasspath,testRuntimeClasspath biz.aQute.bnd:biz.aQute.bnd.annotation:7.1.0=latestDepForkedTestCompileClasspath,latestDepTestCompileClasspath cafe.cryptography:curve25519-elisabeth:0.1.0=boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestRuntimeClasspath,boot3ForkedTestRuntimeClasspath,boot3TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -25,7 +26,7 @@ com.github.jnr:jnr-ffi:2.2.19=boot1LatestDepForkedTestRuntimeClasspath,boot1Late com.github.jnr:jnr-posix:3.1.22=boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestRuntimeClasspath,boot3ForkedTestRuntimeClasspath,boot3TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestRuntimeClasspath,boot3ForkedTestRuntimeClasspath,boot3TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestRuntimeClasspath,boot3ForkedTestRuntimeClasspath,boot3TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=boot1LatestDepForkedTestCompileClasspath,boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestCompileClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestCompileClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestCompileClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestCompileClasspath,boot2TestRuntimeClasspath,boot3ForkedTestCompileClasspath,boot3ForkedTestRuntimeClasspath,boot3TestCompileClasspath,boot3TestRuntimeClasspath,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,boot1LatestDepForkedTestAnnotationProcessor,boot1LatestDepForkedTestCompileClasspath,boot1LatestDepTestAnnotationProcessor,boot1LatestDepTestCompileClasspath,boot2ForkedTestAnnotationProcessor,boot2ForkedTestCompileClasspath,boot2LatestDepForkedTestAnnotationProcessor,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepTestAnnotationProcessor,boot2LatestDepTestCompileClasspath,boot2TestAnnotationProcessor,boot2TestCompileClasspath,boot3ForkedTestAnnotationProcessor,boot3ForkedTestCompileClasspath,boot3TestAnnotationProcessor,boot3TestCompileClasspath,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/gradle.lockfile index ee7909fd797..bbe883762ef 100644 --- a/dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:spring:spring-cloud-zuul-2.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.3=compileClasspath,testCompileClasspath,testRuntimeClasspath @@ -31,7 +32,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-core-3.2.2/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-core-3.2.2/gradle.lockfile index 26b3d7ceb24..8241a84ef02 100644 --- a/dd-java-agent/instrumentation/spring/spring-core-3.2.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-core-3.2.2/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:spring:spring-core-3.2.2:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-data-1.8/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-data-1.8/gradle.lockfile index 9bd6d2298af..2b21c5f77cc 100644 --- a/dd-java-agent/instrumentation/spring/spring-data-1.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-data-1.8/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:spring:spring-data-1.8:dependencies --write-locks antlr:antlr:2.7.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath aopalliance:aopalliance:1.0=testCompileClasspath,testRuntimeClasspath cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -23,7 +24,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-jms-3.1/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-jms-3.1/gradle.lockfile index a53899c6a5e..c913f6d020e 100644 --- a/dd-java-agent/instrumentation/spring/spring-jms-3.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-jms-3.1/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:spring:spring-jms-3.1:dependencies --write-locks aopalliance:aopalliance:1.0=compileClasspath cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -22,7 +23,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepForkedTestRuntimeClasspath,latestDepTestR com.github.jnr:jnr-posix:3.1.22=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-messaging-4.0/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-messaging-4.0/gradle.lockfile index fdb688cf1b7..6bae6bc6b08 100644 --- a/dd-java-agent/instrumentation/spring/spring-messaging-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-messaging-4.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:spring:spring-messaging-4.0:dependencies --write-locks aopalliance:aopalliance:1.0=compileClasspath,compileOnlyDependenciesMetadata cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -35,7 +36,7 @@ com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspa com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.luben:zstd-jni:1.5.6-3=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,compileOnlyDependenciesMetadata,latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,compileOnlyDependenciesMetadata,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,compileOnlyDependenciesMetadata,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestCompileOnlyDependenciesMetadata,testAnnotationProcessor,testCompileClasspath,testCompileOnlyDependenciesMetadata diff --git a/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/gradle.lockfile index 16d9a3adcfb..ecb9ae0a132 100644 --- a/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:spring:spring-rabbit-1.5:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -28,7 +29,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/gradle.lockfile index a6c689546a9..50c2fd81f52 100644 --- a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:spring:spring-scheduling-3.1:dependencies --write-locks antlr:antlr:2.7.7=latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath @@ -31,7 +32,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepForkedTestRuntimeClasspath,latestDepTestR com.github.jnr:jnr-posix:3.1.22=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spotbugs,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestSpring5TestAnnotationProcessor,latestSpring5TestCompileClasspath,spring6TestAnnotationProcessor,spring6TestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/gradle.lockfile index 0e275b28d68..90f2f0990c5 100644 --- a/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:spring:spring-security:spring-security-5.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -35,7 +36,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-security/spring-security-6.0/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-security/spring-security-6.0/gradle.lockfile index b118f3446df..06d35b7abc9 100644 --- a/dd-java-agent/instrumentation/spring/spring-security/spring-security-6.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-security/spring-security-6.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:spring:spring-security:spring-security-6.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.4.5=testCompileClasspath,testRuntimeClasspath @@ -37,7 +38,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/gradle.lockfile index c362d280378..cbdcbabfb96 100644 --- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:spring:spring-webflux:spring-webflux-5.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=iastTestRuntimeClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestIast24TestRuntimeClasspath,latestIast3TestRuntimeClasspath,latestIastTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=iastTestRuntimeClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestIast24TestRuntimeClasspath,latestIast3TestRuntimeClasspath,latestIastTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=iastTestCompileClasspath,iastTestRuntimeClasspath,latestBoot20TestCompileClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestCompileClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestCompileClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestIast24TestCompileClasspath,latestIast24TestRuntimeClasspath,latestIast3TestCompileClasspath,latestIast3TestRuntimeClasspath,latestIastTestCompileClasspath,latestIastTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -43,7 +44,7 @@ com.github.jnr:jnr-ffi:2.2.19=iastTestRuntimeClasspath,latestBoot20TestRuntimeCl com.github.jnr:jnr-posix:3.1.22=iastTestRuntimeClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestIast24TestRuntimeClasspath,latestIast3TestRuntimeClasspath,latestIastTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=iastTestRuntimeClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestIast24TestRuntimeClasspath,latestIast3TestRuntimeClasspath,latestIastTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=iastTestRuntimeClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestIast24TestRuntimeClasspath,latestIast3TestRuntimeClasspath,latestIastTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestBoot20TestCompileClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestCompileClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestCompileClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestIast24TestCompileClasspath,latestIast24TestRuntimeClasspath,latestIast3TestCompileClasspath,latestIast3TestRuntimeClasspath,latestIastTestCompileClasspath,latestIastTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,iastTestAnnotationProcessor,iastTestCompileClasspath,latestBoot20TestAnnotationProcessor,latestBoot20TestCompileClasspath,latestBoot24TestAnnotationProcessor,latestBoot24TestCompileClasspath,latestBoot2LatestTestAnnotationProcessor,latestBoot2LatestTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestIast24TestAnnotationProcessor,latestIast24TestCompileClasspath,latestIast3TestAnnotationProcessor,latestIast3TestCompileClasspath,latestIastTestAnnotationProcessor,latestIastTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-6.0/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-6.0/gradle.lockfile index 99c299b0496..76b92319395 100644 --- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-6.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-6.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:spring:spring-webflux:spring-webflux-6.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=bootTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=bootTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -39,7 +40,7 @@ com.github.jnr:jnr-ffi:2.2.19=bootTestRuntimeClasspath,iastTestRuntimeClasspath, com.github.jnr:jnr-posix:3.1.22=bootTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=bootTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=bootTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=bootTestCompileClasspath,bootTestRuntimeClasspath,compileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,bootTestAnnotationProcessor,bootTestCompileClasspath,compileClasspath,iastTestAnnotationProcessor,iastTestCompileClasspath,latestDepBootTestAnnotationProcessor,latestDepBootTestCompileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/gradle.lockfile index d28ab3d5f0b..ecfc97d7d5c 100644 --- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:spring:spring-webmvc:spring-webmvc-3.1:dependencies --write-locks aopalliance:aopalliance:1.0=compileClasspath,testCompileClasspath,testRuntimeClasspath cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -33,7 +34,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepForkedTestRuntimeClasspath,latestDepTestR com.github.jnr:jnr-posix:3.1.22=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/gradle.lockfile index 63053e22bf0..1eb39aab644 100644 --- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:spring:spring-webmvc:spring-webmvc-5.3:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -28,7 +29,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,csiCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/gradle.lockfile index 352e4493667..2132238d431 100644 --- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:spring:spring-webmvc:spring-webmvc-6.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.4.5=testCompileClasspath,testRuntimeClasspath @@ -37,7 +38,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-ws-2.0/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-ws-2.0/gradle.lockfile index af2e551eaf9..e3bb8d8667b 100644 --- a/dd-java-agent/instrumentation/spring/spring-ws-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-ws-2.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:spring:spring-ws-2.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -28,7 +29,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/spymemcached-2.10/gradle.lockfile b/dd-java-agent/instrumentation/spymemcached-2.10/gradle.lockfile index 5fe20594e72..de71a077068 100644 --- a/dd-java-agent/instrumentation/spymemcached-2.10/gradle.lockfile +++ b/dd-java-agent/instrumentation/spymemcached-2.10/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:spymemcached-2.10:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -25,7 +26,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepForkedTestRuntimeClasspath,latestDepTestR com.github.jnr:jnr-posix:3.1.22=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/synapse-3.0/gradle.lockfile b/dd-java-agent/instrumentation/synapse-3.0/gradle.lockfile index abe7c5faac6..5f1f83094ab 100644 --- a/dd-java-agent/instrumentation/synapse-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/synapse-3.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:synapse-3.0:dependencies --write-locks c3p0:c3p0:0.9.1.1=testCompileClasspath,testRuntimeClasspath cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -22,7 +23,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/testng/testng-6.4/gradle.lockfile b/dd-java-agent/instrumentation/testng/testng-6.4/gradle.lockfile index 2f3ae62f12b..e92b9f68c47 100644 --- a/dd-java-agent/instrumentation/testng/testng-6.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/testng/testng-6.4/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:testng:testng-6.4:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -26,7 +27,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/testng/testng-7.0/gradle.lockfile b/dd-java-agent/instrumentation/testng/testng-7.0/gradle.lockfile index bdcfcfce224..bfe8ad4dc70 100644 --- a/dd-java-agent/instrumentation/testng/testng-7.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/testng/testng-7.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:testng:testng-7.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath,testng751TestRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath,testng751TestRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,testng751TestCompileClasspath,testng751TestRuntimeClasspath @@ -26,7 +27,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath,testng751TestRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath,testng751TestRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath,testng751TestRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath,testng751TestCompileClasspath,testng751TestRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath,testng751TestAnnotationProcessor,testng751TestCompileClasspath diff --git a/dd-java-agent/instrumentation/testng/testng-common/gradle.lockfile b/dd-java-agent/instrumentation/testng/testng-common/gradle.lockfile index 546402d87f1..7f33d1c8e7c 100644 --- a/dd-java-agent/instrumentation/testng/testng-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/testng/testng-common/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:testng:testng-common:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testFixturesRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testFixturesRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -26,7 +27,7 @@ com.github.jnr:jnr-ffi:2.2.19=testFixturesRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testFixturesRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testFixturesRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testFixturesRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/thymeleaf-3.0/gradle.lockfile b/dd-java-agent/instrumentation/thymeleaf-3.0/gradle.lockfile index 98d730f0120..839538efa91 100644 --- a/dd-java-agent/instrumentation/thymeleaf-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/thymeleaf-3.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:thymeleaf-3.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/gradle.lockfile b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/gradle.lockfile index 971ba344154..e468060c8c6 100644 --- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/gradle.lockfile +++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:tibco-businessworks:tibco-businessworks-5.14:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/gradle.lockfile b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/gradle.lockfile index 971ba344154..9482d125fcb 100644 --- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:tibco-businessworks:tibco-businessworks-6.5:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/gradle.lockfile b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/gradle.lockfile index 971ba344154..75481504402 100644 --- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/gradle.lockfile +++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:tibco-businessworks:tibco-businessworks-stubs:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/tinylog-2.0/gradle.lockfile b/dd-java-agent/instrumentation/tinylog-2.0/gradle.lockfile index 9048f33a333..01d2e66af0c 100644 --- a/dd-java-agent/instrumentation/tinylog-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/tinylog-2.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:tinylog-2.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-5.5/gradle.lockfile b/dd-java-agent/instrumentation/tomcat/tomcat-5.5/gradle.lockfile index e67661c3717..bb77de94d35 100644 --- a/dd-java-agent/instrumentation/tomcat/tomcat-5.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/tomcat/tomcat-5.5/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:tomcat:tomcat-5.5:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latest10ForkedTestRuntimeClasspath,latest10TestRun com.github.jnr:jnr-posix:3.1.22=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latest10ForkedTestAnnotationProcessor,latest10ForkedTestCompileClasspath,latest10TestAnnotationProcessor,latest10TestCompileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath,tomcat9TestAnnotationProcessor,tomcat9TestCompileClasspath @@ -75,14 +76,14 @@ org.apache.commons:commons-text:1.14.0=spotbugs org.apache.logging.log4j:log4j-api:2.25.2=spotbugs org.apache.logging.log4j:log4j-core:2.25.2=spotbugs org.apache.tomcat.embed:tomcat-embed-core:10.1.55=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath -org.apache.tomcat.embed:tomcat-embed-core:11.0.22=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.tomcat.embed:tomcat-embed-core:11.0.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.tomcat.embed:tomcat-embed-core:9.0.118=tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath org.apache.tomcat.embed:tomcat-embed-websocket:10.1.55=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath -org.apache.tomcat.embed:tomcat-embed-websocket:11.0.22=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.tomcat.embed:tomcat-embed-websocket:11.0.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.tomcat.embed:tomcat-embed-websocket:9.0.118=tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath org.apache.tomcat:jakartaee-migration:1.0.12=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.tomcat:tomcat-annotations-api:10.1.55=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath -org.apache.tomcat:tomcat-annotations-api:11.0.22=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.tomcat:tomcat-annotations-api:11.0.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.tomcat:tomcat-annotations-api:9.0.118=tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath org.apache.tomcat:tomcat-websocket-api:8.0.1=compileClasspath org.apache.tomcat:tomcat-websocket:8.0.1=compileClasspath diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-9.0/gradle.lockfile b/dd-java-agent/instrumentation/tomcat/tomcat-9.0/gradle.lockfile index 3051d91f0ae..6a867a91861 100644 --- a/dd-java-agent/instrumentation/tomcat/tomcat-9.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/tomcat/tomcat-9.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:tomcat:tomcat-9.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-5.5/gradle.lockfile b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-5.5/gradle.lockfile index 66767f33098..d4698f77048 100644 --- a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-5.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-5.5/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:tomcat:tomcat-appsec:tomcat-appsec-5.5:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-6.0/gradle.lockfile b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-6.0/gradle.lockfile index f4c9cfb9ca7..cd5da6ddb1e 100644 --- a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-6.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-6.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:tomcat:tomcat-appsec:tomcat-appsec-6.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/gradle.lockfile b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/gradle.lockfile index 00aae09dee8..57eb9c16bb2 100644 --- a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:tomcat:tomcat-appsec:tomcat-appsec-7.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-common/gradle.lockfile b/dd-java-agent/instrumentation/tomcat/tomcat-common/gradle.lockfile index 9da304c0d31..0dac479c2b6 100644 --- a/dd-java-agent/instrumentation/tomcat/tomcat-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/tomcat/tomcat-common/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:tomcat:tomcat-common:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/twilio-0.0.1/gradle.lockfile b/dd-java-agent/instrumentation/twilio-0.0.1/gradle.lockfile index 64e26da7414..36bf6bdeba3 100644 --- a/dd-java-agent/instrumentation/twilio-0.0.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/twilio-0.0.1/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:twilio-0.0.1:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -32,7 +33,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/unbescape-1.1/gradle.lockfile b/dd-java-agent/instrumentation/unbescape-1.1/gradle.lockfile index f6cbf9da0bf..c73764723f3 100644 --- a/dd-java-agent/instrumentation/unbescape-1.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/unbescape-1.1/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:unbescape-1.1:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,csiCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/undertow/undertow-2.0/gradle.lockfile b/dd-java-agent/instrumentation/undertow/undertow-2.0/gradle.lockfile index 03e9d3a9547..e4d06c25608 100644 --- a/dd-java-agent/instrumentation/undertow/undertow-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/undertow/undertow-2.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:undertow:undertow-2.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepForkedTestRuntimeClasspath,latestDepTestR com.github.jnr:jnr-posix:3.1.22=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/undertow/undertow-2.2/gradle.lockfile b/dd-java-agent/instrumentation/undertow/undertow-2.2/gradle.lockfile index 53989f6f8f1..66d9e0e543b 100644 --- a/dd-java-agent/instrumentation/undertow/undertow-2.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/undertow/undertow-2.2/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:undertow:undertow-2.2:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latest22ForkedTestRuntimeClasspath,latest22TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latest22ForkedTestRuntimeClasspath,latest22TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latest22ForkedTestCompileClasspath,latest22ForkedTestRuntimeClasspath,latest22TestCompileClasspath,latest22TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latest22ForkedTestRuntimeClasspath,latest22TestRun com.github.jnr:jnr-posix:3.1.22=latest22ForkedTestRuntimeClasspath,latest22TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latest22ForkedTestRuntimeClasspath,latest22TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latest22ForkedTestRuntimeClasspath,latest22TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latest22ForkedTestCompileClasspath,latest22ForkedTestRuntimeClasspath,latest22TestCompileClasspath,latest22TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latest22ForkedTestAnnotationProcessor,latest22ForkedTestCompileClasspath,latest22TestAnnotationProcessor,latest22TestCompileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/undertow/undertow-common/gradle.lockfile b/dd-java-agent/instrumentation/undertow/undertow-common/gradle.lockfile index a99ea2472f6..69b58c867dd 100644 --- a/dd-java-agent/instrumentation/undertow/undertow-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/undertow/undertow-common/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:undertow:undertow-common:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/valkey-java-5.3/gradle.lockfile b/dd-java-agent/instrumentation/valkey-java-5.3/gradle.lockfile index f6ae46a8b07..a6a352adf78 100644 --- a/dd-java-agent/instrumentation/valkey-java-5.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/valkey-java-5.3/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:valkey-java-5.3:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -22,7 +23,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/velocity-1.5/gradle.lockfile b/dd-java-agent/instrumentation/velocity-1.5/gradle.lockfile index 415a69b4502..e690980b6e2 100644 --- a/dd-java-agent/instrumentation/velocity-1.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/velocity-1.5/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:velocity-1.5:dependencies --write-locks antlr:antlr:2.7.2=compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath avalon-framework:avalon-framework:4.1.3=compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -23,7 +24,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,csiCompileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,csiCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/gradle.lockfile b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/gradle.lockfile index da09255b2fa..c58ef76fd5b 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:vertx:vertx-mysql-client:vertx-mysql-client-3.9:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -32,7 +33,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepForkedTestRuntimeClasspath,latestDepTestR com.github.jnr:jnr-posix:3.1.22=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/gradle.lockfile b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/gradle.lockfile index 47e8c451a44..3a4f4da20aa 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:vertx:vertx-mysql-client:vertx-mysql-client-4.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -29,7 +30,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepForkedTestRuntimeClasspath,latestDepTestR com.github.jnr:jnr-posix:3.1.22=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.4.2/gradle.lockfile b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.4.2/gradle.lockfile index 625830c60bc..fe10aebbaca 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.4.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.4.2/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:vertx:vertx-mysql-client:vertx-mysql-client-4.4.2:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -24,7 +25,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepForkedTestRuntimeClasspath,latestDepTestR com.github.jnr:jnr-posix:3.1.22=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/gradle.lockfile b/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/gradle.lockfile index 5b97d73fcc5..1c5f6140dcf 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:vertx:vertx-pg-client:vertx-pg-client-4.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -29,7 +30,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepForkedTestRuntimeClasspath,latestDepTestR com.github.jnr:jnr-posix:3.1.22=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.4.2/gradle.lockfile b/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.4.2/gradle.lockfile index 62a8ace3fc9..06e7a7325b4 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.4.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.4.2/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:vertx:vertx-pg-client:vertx-pg-client-4.4.2:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -24,7 +25,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepForkedTestRuntimeClasspath,latestDepTestR com.github.jnr:jnr-posix:3.1.22=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/gradle.lockfile b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/gradle.lockfile index d49df193246..f019b87dc52 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:vertx:vertx-redis-client:vertx-redis-client-3.9:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -37,7 +38,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepForkedTestRuntimeClasspath,latestDepTestR com.github.jnr:jnr-posix:3.1.22=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,redis4xForkedTestAnnotationProcessor,redis4xForkedTestCompileClasspath,redis4xTestAnnotationProcessor,redis4xTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-stubs/gradle.lockfile b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-stubs/gradle.lockfile index 4b3e20d20e2..18868df5eeb 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-stubs/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-stubs/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:vertx:vertx-redis-client:vertx-redis-client-stubs:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -24,7 +25,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/vertx/vertx-rx-3.5/gradle.lockfile b/dd-java-agent/instrumentation/vertx/vertx-rx-3.5/gradle.lockfile index 8bf41630903..49a8cf8abe5 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-rx-3.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx/vertx-rx-3.5/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:vertx:vertx-rx-3.5:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -28,7 +29,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepForkedTestRuntimeClasspath,latestDepTestR com.github.jnr:jnr-posix:3.1.22=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/gradle.lockfile b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/gradle.lockfile index ba6d5e5985d..6becb4ed44f 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:vertx:vertx-sql-client-3.9:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -24,7 +25,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/gradle.lockfile b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/gradle.lockfile index 184515984d3..2c607446810 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:vertx:vertx-web:vertx-web-3.4:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -28,7 +29,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepForkedTestRuntimeClasspath,latestDepTestR com.github.jnr:jnr-posix:3.1.22=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.5/gradle.lockfile b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.5/gradle.lockfile index 42f1eec3fd8..60c268448b2 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.5/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:vertx:vertx-web:vertx-web-3.5:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -28,7 +29,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepForkedTestRuntimeClasspath,latestDepTestR com.github.jnr:jnr-posix:3.1.22=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.9/gradle.lockfile b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.9/gradle.lockfile index f732da00744..362a152e959 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.9/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.9/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:vertx:vertx-web:vertx-web-3.9:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -24,7 +25,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/gradle.lockfile b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/gradle.lockfile index 03f4d468332..a065ac7d1ad 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:vertx:vertx-web:vertx-web-4.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -24,7 +25,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepForkedTestRuntimeClasspath,latestDepTestR com.github.jnr:jnr-posix:3.1.22=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/gradle.lockfile b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/gradle.lockfile index 483046cda66..6a0db76a9d9 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:vertx:vertx-web:vertx-web-5.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -25,7 +26,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepForkedTestRuntimeClasspath,latestDepTestR com.github.jnr:jnr-posix:3.1.22=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/weaver-0.9/gradle.lockfile b/dd-java-agent/instrumentation/weaver-0.9/gradle.lockfile index 4060f435f48..1b6013eaadb 100644 --- a/dd-java-agent/instrumentation/weaver-0.9/gradle.lockfile +++ b/dd-java-agent/instrumentation/weaver-0.9/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:weaver-0.9:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath,weaver084TestRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath,weaver084TestRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,weaver084TestCompileClasspath,weaver084TestRuntimeClasspath @@ -36,7 +37,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath,weaver084TestRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath,weaver084TestRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath,weaver084TestRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath,weaver084TestCompileClasspath,weaver084TestRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath,weaver084TestAnnotationProcessor,weaver084TestCompileClasspath diff --git a/dd-java-agent/instrumentation/websocket/jakarta-websocket-2.0/gradle.lockfile b/dd-java-agent/instrumentation/websocket/jakarta-websocket-2.0/gradle.lockfile index f0ad840dc44..12eca69f12b 100644 --- a/dd-java-agent/instrumentation/websocket/jakarta-websocket-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/websocket/jakarta-websocket-2.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:websocket:jakarta-websocket-2.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/gradle.lockfile b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/gradle.lockfile index 732db2676a4..f5f445dd67d 100644 --- a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:websocket:javax-websocket-1.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10.0/gradle.lockfile b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10.0/gradle.lockfile index 73f8ab0b2b8..ced35bd3c3d 100644 --- a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:websocket:jetty-websocket:jetty-websocket-10.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,main_java11CompileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-11.0/gradle.lockfile b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-11.0/gradle.lockfile index d8d769c3878..76b2746ec02 100644 --- a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-11.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-11.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:websocket:jetty-websocket:jetty-websocket-11.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-12.0/gradle.lockfile b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-12.0/gradle.lockfile index 1929deea5b6..7653a6eee40 100644 --- a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-12.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-12.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:websocket:jetty-websocket:jetty-websocket-12.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/websphere-jmx-8.5/gradle.lockfile b/dd-java-agent/instrumentation/websphere-jmx-8.5/gradle.lockfile index 971ba344154..4564a4c5915 100644 --- a/dd-java-agent/instrumentation/websphere-jmx-8.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/websphere-jmx-8.5/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:websphere-jmx-8.5:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/wildfly-9.0/gradle.lockfile b/dd-java-agent/instrumentation/wildfly-9.0/gradle.lockfile index 1953b62413a..544f8ea0b21 100644 --- a/dd-java-agent/instrumentation/wildfly-9.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/wildfly-9.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:wildfly-9.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepForkedTestRuntimeClasspath,latestDepTestR com.github.jnr:jnr-posix:3.1.22=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath @@ -211,54 +212,54 @@ org.wildfly.common:wildfly-common:1.6.0.Final=testCompileClasspath,testRuntimeCl org.wildfly.common:wildfly-common:2.0.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.core:wildfly-controller-client:1.0.0.Final=compileClasspath org.wildfly.core:wildfly-controller-client:21.1.0.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.core:wildfly-controller-client:33.0.0.Beta2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.core:wildfly-controller-client:33.0.0.Beta3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.core:wildfly-controller:1.0.0.Final=compileClasspath org.wildfly.core:wildfly-controller:21.1.0.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.core:wildfly-controller:33.0.0.Beta2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.core:wildfly-controller:33.0.0.Beta3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.core:wildfly-core-management-client:21.1.0.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.core:wildfly-core-management-client:33.0.0.Beta2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.core:wildfly-core-management-client:33.0.0.Beta3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.core:wildfly-core-security-api:1.0.0.Final=compileClasspath org.wildfly.core:wildfly-core-security:1.0.0.Final=compileClasspath org.wildfly.core:wildfly-core-security:21.1.0.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.core:wildfly-core-security:33.0.0.Beta2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.core:wildfly-core-security:33.0.0.Beta3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.core:wildfly-deployment-repository:1.0.0.Final=compileClasspath org.wildfly.core:wildfly-deployment-repository:21.1.0.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.core:wildfly-deployment-repository:33.0.0.Beta2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.core:wildfly-deployment-repository:33.0.0.Beta3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.core:wildfly-domain-http-interface:1.0.0.Final=compileClasspath org.wildfly.core:wildfly-domain-http-interface:21.1.0.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.core:wildfly-domain-http-interface:33.0.0.Beta2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.core:wildfly-domain-http-interface:33.0.0.Beta3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.core:wildfly-domain-management:1.0.0.Final=compileClasspath org.wildfly.core:wildfly-domain-management:21.1.0.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.core:wildfly-domain-management:33.0.0.Beta2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.core:wildfly-domain-management:33.0.0.Beta3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.core:wildfly-embedded:21.1.0.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.core:wildfly-embedded:33.0.0.Beta2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.wildfly.core:wildfly-io-spi:33.0.0.Beta2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.core:wildfly-embedded:33.0.0.Beta3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.core:wildfly-io-spi:33.0.0.Beta3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.core:wildfly-io:1.0.0.Final=compileClasspath org.wildfly.core:wildfly-io:21.1.0.Final=testCompileClasspath,testRuntimeClasspath org.wildfly.core:wildfly-network:1.0.0.Final=compileClasspath org.wildfly.core:wildfly-network:21.1.0.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.core:wildfly-network:33.0.0.Beta2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.core:wildfly-network:33.0.0.Beta3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.core:wildfly-platform-mbean:1.0.0.Final=compileClasspath org.wildfly.core:wildfly-platform-mbean:21.1.0.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.core:wildfly-platform-mbean:33.0.0.Beta2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.core:wildfly-platform-mbean:33.0.0.Beta3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.core:wildfly-process-controller:1.0.0.Final=compileClasspath org.wildfly.core:wildfly-process-controller:21.1.0.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.core:wildfly-process-controller:33.0.0.Beta2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.core:wildfly-process-controller:33.0.0.Beta3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.core:wildfly-protocol:1.0.0.Final=compileClasspath org.wildfly.core:wildfly-protocol:21.1.0.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.core:wildfly-protocol:33.0.0.Beta2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.core:wildfly-protocol:33.0.0.Beta3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.core:wildfly-remoting:1.0.0.Final=compileClasspath org.wildfly.core:wildfly-remoting:21.1.0.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.core:wildfly-remoting:33.0.0.Beta2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.core:wildfly-remoting:33.0.0.Beta3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.core:wildfly-request-controller:1.0.0.Final=compileClasspath org.wildfly.core:wildfly-self-contained:1.0.0.Final=compileClasspath org.wildfly.core:wildfly-server:1.0.0.Final=compileClasspath org.wildfly.core:wildfly-server:21.1.0.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.core:wildfly-server:33.0.0.Beta2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.wildfly.core:wildfly-service:33.0.0.Beta2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.core:wildfly-server:33.0.0.Beta3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.core:wildfly-service:33.0.0.Beta3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.core:wildfly-version:1.0.0.Final=compileClasspath org.wildfly.core:wildfly-version:21.1.0.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.core:wildfly-version:33.0.0.Beta2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.core:wildfly-version:33.0.0.Beta3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.security.elytron-web:undertow-server:4.0.0.Final=testCompileClasspath,testRuntimeClasspath org.wildfly.security.elytron-web:undertow-server:4.2.1.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.security:wildfly-elytron-asn1:2.2.1.Final=testCompileClasspath,testRuntimeClasspath @@ -339,7 +340,7 @@ org.wildfly.security:wildfly-elytron-x500:2.2.1.Final=testCompileClasspath,testR org.wildfly.security:wildfly-elytron-x500:2.9.1.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.security:wildfly-security-manager:1.1.2.Final=compileClasspath org.wildfly:wildfly-dist:21.0.0.Final=wildflyTest -org.wildfly:wildfly-dist:40.0.0.Final=wildflyLatestDepTest +org.wildfly:wildfly-dist:40.0.1.Final=wildflyLatestDepTest org.wildfly:wildfly-ee:9.0.0.Final=compileClasspath org.wildfly:wildfly-naming:9.0.0.Final=compileClasspath org.xmlresolver:xmlresolver:5.3.3=spotbugs diff --git a/dd-java-agent/instrumentation/ws/jakarta-ws-annotations-3.0/gradle.lockfile b/dd-java-agent/instrumentation/ws/jakarta-ws-annotations-3.0/gradle.lockfile index 3eb54b96646..7c2ec025690 100644 --- a/dd-java-agent/instrumentation/ws/jakarta-ws-annotations-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/ws/jakarta-ws-annotations-3.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:ws:jakarta-ws-annotations-3.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-1.1/gradle.lockfile b/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-1.1/gradle.lockfile index e833ed866ba..41462d23b46 100644 --- a/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-1.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-1.1/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:ws:jax-ws:jax-ws-annotations-1.1:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-2.0/gradle.lockfile b/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-2.0/gradle.lockfile index c537c1be824..33c96f3ec50 100644 --- a/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-2.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:ws:jax-ws:jax-ws-annotations-2.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-java-agent/instrumentation/zio/zio-2.0/gradle.lockfile b/dd-java-agent/instrumentation/zio/zio-2.0/gradle.lockfile index 0759a97dc0f..c74e11794d3 100644 --- a/dd-java-agent/instrumentation/zio/zio-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/zio/zio-2.0/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:zio:zio-2.0:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -25,7 +26,7 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath diff --git a/dd-smoke-tests/apm-tracing-disabled/gradle.lockfile b/dd-smoke-tests/apm-tracing-disabled/gradle.lockfile index 75e29f5f6a8..1da555f7013 100644 --- a/dd-smoke-tests/apm-tracing-disabled/gradle.lockfile +++ b/dd-smoke-tests/apm-tracing-disabled/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:apm-tracing-disabled:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/appsec/gradle.lockfile b/dd-smoke-tests/appsec/gradle.lockfile index c4914df1ec7..19d0e7db391 100644 --- a/dd-smoke-tests/appsec/gradle.lockfile +++ b/dd-smoke-tests/appsec/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:appsec:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=runtimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=runtimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=runtimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/appsec/spring-tomcat7/gradle.lockfile b/dd-smoke-tests/appsec/spring-tomcat7/gradle.lockfile index a7ae1de37cc..8479190bbf5 100644 --- a/dd-smoke-tests/appsec/spring-tomcat7/gradle.lockfile +++ b/dd-smoke-tests/appsec/spring-tomcat7/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:appsec:spring-tomcat7:dependencies --write-locks aopalliance:aopalliance:1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath @@ -22,7 +23,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/appsec/springboot-graphql/gradle.lockfile b/dd-smoke-tests/appsec/springboot-graphql/gradle.lockfile index 1bd91012d00..ba2bb6d3ba8 100644 --- a/dd-smoke-tests/appsec/springboot-graphql/gradle.lockfile +++ b/dd-smoke-tests/appsec/springboot-graphql/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:appsec:springboot-graphql:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.11=compileClasspath,runtimeClasspath @@ -30,7 +31,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/appsec/springboot-grpc/gradle.lockfile b/dd-smoke-tests/appsec/springboot-grpc/gradle.lockfile index 0fa44fa58a4..f25d2eebee5 100644 --- a/dd-smoke-tests/appsec/springboot-grpc/gradle.lockfile +++ b/dd-smoke-tests/appsec/springboot-grpc/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:appsec:springboot-grpc:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/appsec/springboot-security/gradle.lockfile b/dd-smoke-tests/appsec/springboot-security/gradle.lockfile index b899c10d37b..9438a339d37 100644 --- a/dd-smoke-tests/appsec/springboot-security/gradle.lockfile +++ b/dd-smoke-tests/appsec/springboot-security/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:appsec:springboot-security:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -30,7 +31,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/appsec/springboot/gradle.lockfile b/dd-smoke-tests/appsec/springboot/gradle.lockfile index b1194308f03..a7b3ad59259 100644 --- a/dd-smoke-tests/appsec/springboot/gradle.lockfile +++ b/dd-smoke-tests/appsec/springboot/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:appsec:springboot:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -30,7 +31,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/armeria-grpc/gradle.lockfile b/dd-smoke-tests/armeria-grpc/gradle.lockfile index 01da9e389dc..2c9330c0e99 100644 --- a/dd-smoke-tests/armeria-grpc/gradle.lockfile +++ b/dd-smoke-tests/armeria-grpc/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:armeria-grpc:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testCompileProtoPath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testCompileProtoPath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testCompileProtoPath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testCompileProtoPath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testCompileProtoPath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testCompileProtoPath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,compileProtoPath,spotbugs,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,compileProtoPath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.android:annotations:4.1.1.4=testRuntimeClasspath diff --git a/dd-smoke-tests/backend-mock/gradle.lockfile b/dd-smoke-tests/backend-mock/gradle.lockfile index b2d56d8faf8..d37a8d46388 100644 --- a/dd-smoke-tests/backend-mock/gradle.lockfile +++ b/dd-smoke-tests/backend-mock/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:backend-mock:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=runtimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=runtimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -25,7 +26,7 @@ com.github.jnr:jnr-ffi:2.2.19=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=runtimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/cli/gradle.lockfile b/dd-smoke-tests/cli/gradle.lockfile index d867c6cc633..b6e7a858bc2 100644 --- a/dd-smoke-tests/cli/gradle.lockfile +++ b/dd-smoke-tests/cli/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:cli:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/concurrent/java-21/gradle.lockfile b/dd-smoke-tests/concurrent/java-21/gradle.lockfile index 535949a4ce3..b9f8e9e9857 100644 --- a/dd-smoke-tests/concurrent/java-21/gradle.lockfile +++ b/dd-smoke-tests/concurrent/java-21/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:concurrent:java-21:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/concurrent/java-25/gradle.lockfile b/dd-smoke-tests/concurrent/java-25/gradle.lockfile index 46256787966..e8c07371f81 100644 --- a/dd-smoke-tests/concurrent/java-25/gradle.lockfile +++ b/dd-smoke-tests/concurrent/java-25/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:concurrent:java-25:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/concurrent/java-8/gradle.lockfile b/dd-smoke-tests/concurrent/java-8/gradle.lockfile index 535949a4ce3..55ad0cfb2c9 100644 --- a/dd-smoke-tests/concurrent/java-8/gradle.lockfile +++ b/dd-smoke-tests/concurrent/java-8/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:concurrent:java-8:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/crashtracking/gradle.lockfile b/dd-smoke-tests/crashtracking/gradle.lockfile index 1ac6fe4d246..b3473b684e7 100644 --- a/dd-smoke-tests/crashtracking/gradle.lockfile +++ b/dd-smoke-tests/crashtracking/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:crashtracking:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/custom-systemloader/gradle.lockfile b/dd-smoke-tests/custom-systemloader/gradle.lockfile index 383c9ec7b4b..701f8238eb9 100644 --- a/dd-smoke-tests/custom-systemloader/gradle.lockfile +++ b/dd-smoke-tests/custom-systemloader/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:custom-systemloader:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/datastreams/kafkaschemaregistry/gradle.lockfile b/dd-smoke-tests/datastreams/kafkaschemaregistry/gradle.lockfile index 934a983fb37..d6511c9bf96 100644 --- a/dd-smoke-tests/datastreams/kafkaschemaregistry/gradle.lockfile +++ b/dd-smoke-tests/datastreams/kafkaschemaregistry/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:datastreams:kafkaschemaregistry:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.6=compileClasspath,runtimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -12,7 +13,7 @@ com.fasterxml.jackson.core:jackson-databind:2.14.2=compileClasspath,runtimeClass com.fasterxml.jackson:jackson-bom:2.14.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc com.github.luben:zstd-jni:1.5.5-1=runtimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.api.grpc:proto-google-common-protos:2.22.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/debugger-integration-tests/gradle.lockfile b/dd-smoke-tests/debugger-integration-tests/gradle.lockfile index 6e1d74e0bb3..5c1e7f504df 100644 --- a/dd-smoke-tests/debugger-integration-tests/gradle.lockfile +++ b/dd-smoke-tests/debugger-integration-tests/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:debugger-integration-tests:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -29,7 +30,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/dynamic-config/gradle.lockfile b/dd-smoke-tests/dynamic-config/gradle.lockfile index 45f99dfffd5..3f4ad6c3501 100644 --- a/dd-smoke-tests/dynamic-config/gradle.lockfile +++ b/dd-smoke-tests/dynamic-config/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:dynamic-config:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/field-injection/gradle.lockfile b/dd-smoke-tests/field-injection/gradle.lockfile index 619374200b3..b4940818449 100644 --- a/dd-smoke-tests/field-injection/gradle.lockfile +++ b/dd-smoke-tests/field-injection/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:field-injection:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/gradle.lockfile b/dd-smoke-tests/gradle.lockfile index 98e21d84579..0e1ca9316d9 100644 --- a/dd-smoke-tests/gradle.lockfile +++ b/dd-smoke-tests/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=runtimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=runtimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=runtimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/gradle/gradle.lockfile b/dd-smoke-tests/gradle/gradle.lockfile index 57c4a9ce7fe..ada3bd99d0b 100644 --- a/dd-smoke-tests/gradle/gradle.lockfile +++ b/dd-smoke-tests/gradle/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:gradle:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -25,7 +26,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/grpc-1.5/gradle.lockfile b/dd-smoke-tests/grpc-1.5/gradle.lockfile index 27ae787a98b..2dcb11e1a12 100644 --- a/dd-smoke-tests/grpc-1.5/gradle.lockfile +++ b/dd-smoke-tests/grpc-1.5/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:grpc-1.5:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testCompileProtoPath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testCompileProtoPath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testCompileProtoPath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testCompileProtoPath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testCompileProtoPath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testCompileProtoPath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,compileProtoPath,spotbugs,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,compileProtoPath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.android:annotations:4.1.1.4=compileProtoPath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/iast-propagation/gradle.lockfile b/dd-smoke-tests/iast-propagation/gradle.lockfile index 316e5d0a9d2..71057fe16ab 100644 --- a/dd-smoke-tests/iast-propagation/gradle.lockfile +++ b/dd-smoke-tests/iast-propagation/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:iast-propagation:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath @@ -34,7 +35,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,compileOnlyDependenciesMetadata,spotbugs,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,compileOnlyDependenciesMetadata,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,compileOnlyDependenciesMetadata,spotbugs,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath diff --git a/dd-smoke-tests/iast-util/gradle.lockfile b/dd-smoke-tests/iast-util/gradle.lockfile index 819a52b26b7..ac0d36d444b 100644 --- a/dd-smoke-tests/iast-util/gradle.lockfile +++ b/dd-smoke-tests/iast-util/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:iast-util:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -25,7 +26,7 @@ com.github.jnr:jnr-ffi:2.2.19=runtimeClasspath,testFixturesRuntimeClasspath,test com.github.jnr:jnr-posix:3.1.22=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/iast-util/iast-util-11/gradle.lockfile b/dd-smoke-tests/iast-util/iast-util-11/gradle.lockfile index e16baf90169..c04de1f9c28 100644 --- a/dd-smoke-tests/iast-util/iast-util-11/gradle.lockfile +++ b/dd-smoke-tests/iast-util/iast-util-11/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:iast-util:iast-util-11:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -28,7 +29,7 @@ com.github.jnr:jnr-ffi:2.2.19=runtimeClasspath,testFixturesRuntimeClasspath,test com.github.jnr:jnr-posix:3.1.22=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/iast-util/iast-util-17/gradle.lockfile b/dd-smoke-tests/iast-util/iast-util-17/gradle.lockfile index 507dd56cab9..03f8831845c 100644 --- a/dd-smoke-tests/iast-util/iast-util-17/gradle.lockfile +++ b/dd-smoke-tests/iast-util/iast-util-17/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:iast-util:iast-util-17:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -29,7 +30,7 @@ com.github.jnr:jnr-ffi:2.2.19=runtimeClasspath,testFixturesRuntimeClasspath,test com.github.jnr:jnr-posix:3.1.22=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/java9-modules/gradle.lockfile b/dd-smoke-tests/java9-modules/gradle.lockfile index ece88f89a17..4a01ecee187 100644 --- a/dd-smoke-tests/java9-modules/gradle.lockfile +++ b/dd-smoke-tests/java9-modules/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:java9-modules:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/jboss-modules/gradle.lockfile b/dd-smoke-tests/jboss-modules/gradle.lockfile index 98e5047b84e..47926501b94 100644 --- a/dd-smoke-tests/jboss-modules/gradle.lockfile +++ b/dd-smoke-tests/jboss-modules/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:jboss-modules:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/jdk-tool-abort/gradle.lockfile b/dd-smoke-tests/jdk-tool-abort/gradle.lockfile index a0f113a4394..c6e3b36c9fc 100644 --- a/dd-smoke-tests/jdk-tool-abort/gradle.lockfile +++ b/dd-smoke-tests/jdk-tool-abort/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:jdk-tool-abort:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/jersey-2/gradle.lockfile b/dd-smoke-tests/jersey-2/gradle.lockfile index 1b4038999c9..4f236a665f5 100644 --- a/dd-smoke-tests/jersey-2/gradle.lockfile +++ b/dd-smoke-tests/jersey-2/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:jersey-2:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/jersey-3/gradle.lockfile b/dd-smoke-tests/jersey-3/gradle.lockfile index c78162305f5..ec1e84a49e1 100644 --- a/dd-smoke-tests/jersey-3/gradle.lockfile +++ b/dd-smoke-tests/jersey-3/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:jersey-3:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -26,7 +27,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/junit-console/gradle.lockfile b/dd-smoke-tests/junit-console/gradle.lockfile index 885478a8004..31879bafc9b 100644 --- a/dd-smoke-tests/junit-console/gradle.lockfile +++ b/dd-smoke-tests/junit-console/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:junit-console:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -25,7 +26,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/kafka-2/gradle.lockfile b/dd-smoke-tests/kafka-2/gradle.lockfile index 138153be93d..0ad1806c773 100644 --- a/dd-smoke-tests/kafka-2/gradle.lockfile +++ b/dd-smoke-tests/kafka-2/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:kafka-2:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -29,7 +30,7 @@ com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath com.github.luben:zstd-jni:1.5.0-2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/kafka-3/gradle.lockfile b/dd-smoke-tests/kafka-3/gradle.lockfile index 47197ddc813..811393994aa 100644 --- a/dd-smoke-tests/kafka-3/gradle.lockfile +++ b/dd-smoke-tests/kafka-3/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:kafka-3:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -29,7 +30,7 @@ com.github.jnr:jnr-posix:3.1.22=runtimeClasspath,testFixturesRuntimeClasspath,te com.github.jnr:jnr-unixsocket:0.38.25=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.github.luben:zstd-jni:1.5.2-1=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/lib-injection/gradle.lockfile b/dd-smoke-tests/lib-injection/gradle.lockfile index 8587b482a12..a171db45193 100644 --- a/dd-smoke-tests/lib-injection/gradle.lockfile +++ b/dd-smoke-tests/lib-injection/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:lib-injection:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/log-injection/gradle.lockfile b/dd-smoke-tests/log-injection/gradle.lockfile index e95a470178f..85371d1c839 100644 --- a/dd-smoke-tests/log-injection/gradle.lockfile +++ b/dd-smoke-tests/log-injection/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:log-injection:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.0.0=logbackBackend @@ -36,7 +37,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/maven/gradle.lockfile b/dd-smoke-tests/maven/gradle.lockfile index 186c886823f..553a09f161c 100644 --- a/dd-smoke-tests/maven/gradle.lockfile +++ b/dd-smoke-tests/maven/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:maven:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -25,7 +26,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/openfeature/gradle.lockfile b/dd-smoke-tests/openfeature/gradle.lockfile index 9714dce8e23..18b650fcb57 100644 --- a/dd-smoke-tests/openfeature/gradle.lockfile +++ b/dd-smoke-tests/openfeature/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:openfeature:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/opentelemetry/gradle.lockfile b/dd-smoke-tests/opentelemetry/gradle.lockfile index cf9868f6ded..725879ed0d3 100644 --- a/dd-smoke-tests/opentelemetry/gradle.lockfile +++ b/dd-smoke-tests/opentelemetry/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:opentelemetry:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/opentracing/gradle.lockfile b/dd-smoke-tests/opentracing/gradle.lockfile index 0687a92433b..cf7ac837eda 100644 --- a/dd-smoke-tests/opentracing/gradle.lockfile +++ b/dd-smoke-tests/opentracing/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:opentracing:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/osgi/gradle.lockfile b/dd-smoke-tests/osgi/gradle.lockfile index a09e795fb0b..8fd5d9fba25 100644 --- a/dd-smoke-tests/osgi/gradle.lockfile +++ b/dd-smoke-tests/osgi/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:osgi:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/play-2.4/gradle.lockfile b/dd-smoke-tests/play-2.4/gradle.lockfile index 2a6eaab68df..8412b789240 100644 --- a/dd-smoke-tests/play-2.4/gradle.lockfile +++ b/dd-smoke-tests/play-2.4/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:play-2.4:dependencies --write-locks aopalliance:aopalliance:1.0=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath args4j:args4j:2.0.26=javaScriptCompiler cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath @@ -35,7 +36,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:1.3.9=javaScriptCompiler diff --git a/dd-smoke-tests/play-2.5/gradle.lockfile b/dd-smoke-tests/play-2.5/gradle.lockfile index 916b114a2a4..41939716188 100644 --- a/dd-smoke-tests/play-2.5/gradle.lockfile +++ b/dd-smoke-tests/play-2.5/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:play-2.5:dependencies --write-locks aopalliance:aopalliance:1.0=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath args4j:args4j:2.0.26=javaScriptCompiler cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath @@ -35,7 +36,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:1.3.9=javaScriptCompiler diff --git a/dd-smoke-tests/play-2.6/gradle.lockfile b/dd-smoke-tests/play-2.6/gradle.lockfile index 34f01e8f208..7f1a08dae80 100644 --- a/dd-smoke-tests/play-2.6/gradle.lockfile +++ b/dd-smoke-tests/play-2.6/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:play-2.6:dependencies --write-locks aopalliance:aopalliance:1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath args4j:args4j:2.0.26=javaScriptCompiler cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath @@ -35,7 +36,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:1.3.9=javaScriptCompiler,play,runtimeClasspath diff --git a/dd-smoke-tests/play-2.7/gradle.lockfile b/dd-smoke-tests/play-2.7/gradle.lockfile index b886d2cd119..85c949b5248 100644 --- a/dd-smoke-tests/play-2.7/gradle.lockfile +++ b/dd-smoke-tests/play-2.7/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:play-2.7:dependencies --write-locks aopalliance:aopalliance:1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath args4j:args4j:2.0.26=javaScriptCompiler cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath @@ -35,7 +36,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:1.3.9=javaScriptCompiler diff --git a/dd-smoke-tests/play-2.8-otel/gradle.lockfile b/dd-smoke-tests/play-2.8-otel/gradle.lockfile index 59f0deebf31..f5a9246bd80 100644 --- a/dd-smoke-tests/play-2.8-otel/gradle.lockfile +++ b/dd-smoke-tests/play-2.8-otel/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:play-2.8-otel:dependencies --write-locks aopalliance:aopalliance:1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath args4j:args4j:2.0.26=javaScriptCompiler cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath @@ -39,7 +40,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:1.3.9=javaScriptCompiler diff --git a/dd-smoke-tests/play-2.8-split-routes/gradle.lockfile b/dd-smoke-tests/play-2.8-split-routes/gradle.lockfile index cb4e864e5f1..3ed13368fdb 100644 --- a/dd-smoke-tests/play-2.8-split-routes/gradle.lockfile +++ b/dd-smoke-tests/play-2.8-split-routes/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:play-2.8-split-routes:dependencies --write-locks aopalliance:aopalliance:1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath args4j:args4j:2.0.26=javaScriptCompiler cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath @@ -39,7 +40,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:1.3.9=javaScriptCompiler diff --git a/dd-smoke-tests/play-2.8/gradle.lockfile b/dd-smoke-tests/play-2.8/gradle.lockfile index 975fad11987..9edb1bea4e4 100644 --- a/dd-smoke-tests/play-2.8/gradle.lockfile +++ b/dd-smoke-tests/play-2.8/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:play-2.8:dependencies --write-locks aopalliance:aopalliance:1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath args4j:args4j:2.0.26=javaScriptCompiler cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath @@ -39,7 +40,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:1.3.9=javaScriptCompiler diff --git a/dd-smoke-tests/profiling-integration-tests/gradle.lockfile b/dd-smoke-tests/profiling-integration-tests/gradle.lockfile index f1cafad193f..4351f9576ce 100644 --- a/dd-smoke-tests/profiling-integration-tests/gradle.lockfile +++ b/dd-smoke-tests/profiling-integration-tests/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:profiling-integration-tests:dependencies --write-locks at.yawk.lz4:lz4-java:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath @@ -26,7 +27,7 @@ com.github.jnr:jnr-ffi:2.2.19=compileClasspath,runtimeClasspath,testCompileClass com.github.jnr:jnr-posix:3.1.22=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/quarkus-native/gradle.lockfile b/dd-smoke-tests/quarkus-native/gradle.lockfile index 996d909329a..29a3e8ec0d3 100644 --- a/dd-smoke-tests/quarkus-native/gradle.lockfile +++ b/dd-smoke-tests/quarkus-native/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:quarkus-native:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/quarkus/gradle.lockfile b/dd-smoke-tests/quarkus/gradle.lockfile index 5cc5ac5b38f..18a85e58269 100644 --- a/dd-smoke-tests/quarkus/gradle.lockfile +++ b/dd-smoke-tests/quarkus/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:quarkus:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/ratpack-1.5/gradle.lockfile b/dd-smoke-tests/ratpack-1.5/gradle.lockfile index 48aaf268d76..c58f8dc1f30 100644 --- a/dd-smoke-tests/ratpack-1.5/gradle.lockfile +++ b/dd-smoke-tests/ratpack-1.5/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:ratpack-1.5:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -29,7 +30,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/resteasy/gradle.lockfile b/dd-smoke-tests/resteasy/gradle.lockfile index 06f1cd03c52..71578570e6c 100644 --- a/dd-smoke-tests/resteasy/gradle.lockfile +++ b/dd-smoke-tests/resteasy/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:resteasy:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -27,7 +28,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/rum/gradle.lockfile b/dd-smoke-tests/rum/gradle.lockfile index d7b60496e0e..db6bacb5d2f 100644 --- a/dd-smoke-tests/rum/gradle.lockfile +++ b/dd-smoke-tests/rum/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:rum:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=runtimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=runtimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=runtimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/rum/tomcat-10/gradle.lockfile b/dd-smoke-tests/rum/tomcat-10/gradle.lockfile index ba5c52e6ada..772b2510a8c 100644 --- a/dd-smoke-tests/rum/tomcat-10/gradle.lockfile +++ b/dd-smoke-tests/rum/tomcat-10/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:rum:tomcat-10:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/rum/tomcat-11/gradle.lockfile b/dd-smoke-tests/rum/tomcat-11/gradle.lockfile index c25d0e87ad1..81465c9eb5d 100644 --- a/dd-smoke-tests/rum/tomcat-11/gradle.lockfile +++ b/dd-smoke-tests/rum/tomcat-11/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:rum:tomcat-11:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/rum/tomcat-9/gradle.lockfile b/dd-smoke-tests/rum/tomcat-9/gradle.lockfile index 068dd0e93ce..20279e0524d 100644 --- a/dd-smoke-tests/rum/tomcat-9/gradle.lockfile +++ b/dd-smoke-tests/rum/tomcat-9/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:rum:tomcat-9:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/rum/wildfly-15/gradle.lockfile b/dd-smoke-tests/rum/wildfly-15/gradle.lockfile index c88f9cab102..b32ba3910bd 100644 --- a/dd-smoke-tests/rum/wildfly-15/gradle.lockfile +++ b/dd-smoke-tests/rum/wildfly-15/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:rum:wildfly-15:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/sample-trace/gradle.lockfile b/dd-smoke-tests/sample-trace/gradle.lockfile index a0f113a4394..0b673dc7e47 100644 --- a/dd-smoke-tests/sample-trace/gradle.lockfile +++ b/dd-smoke-tests/sample-trace/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:sample-trace:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/spring-boot-2.3-webmvc-jetty/gradle.lockfile b/dd-smoke-tests/spring-boot-2.3-webmvc-jetty/gradle.lockfile index 2fa22e78845..41380c2ba59 100644 --- a/dd-smoke-tests/spring-boot-2.3-webmvc-jetty/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-2.3-webmvc-jetty/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:spring-boot-2.3-webmvc-jetty:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -29,7 +30,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/spring-boot-2.4-webflux/gradle.lockfile b/dd-smoke-tests/spring-boot-2.4-webflux/gradle.lockfile index 3544a1297e3..bd7e6dcb37b 100644 --- a/dd-smoke-tests/spring-boot-2.4-webflux/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-2.4-webflux/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:spring-boot-2.4-webflux:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -29,7 +30,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/spring-boot-2.5-webflux/gradle.lockfile b/dd-smoke-tests/spring-boot-2.5-webflux/gradle.lockfile index def8ccb942b..dffd0985e7c 100644 --- a/dd-smoke-tests/spring-boot-2.5-webflux/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-2.5-webflux/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:spring-boot-2.5-webflux:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -30,7 +31,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/spring-boot-2.6-webflux/gradle.lockfile b/dd-smoke-tests/spring-boot-2.6-webflux/gradle.lockfile index ed8365efff6..9632a1192ad 100644 --- a/dd-smoke-tests/spring-boot-2.6-webflux/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-2.6-webflux/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:spring-boot-2.6-webflux:dependencies --write-locks antlr:antlr:2.7.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath @@ -32,7 +33,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/spring-boot-2.6-webmvc/gradle.lockfile b/dd-smoke-tests/spring-boot-2.6-webmvc/gradle.lockfile index 5bb89b8df5e..1b24c4dc130 100644 --- a/dd-smoke-tests/spring-boot-2.6-webmvc/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-2.6-webmvc/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:spring-boot-2.6-webmvc:dependencies --write-locks antlr:antlr:2.7.7=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath cafe.cryptography:curve25519-elisabeth:0.1.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -30,7 +31,7 @@ com.github.jnr:jnr-ffi:2.2.19=runtimeClasspath,testFixturesRuntimeClasspath,test com.github.jnr:jnr-posix:3.1.22=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/spring-boot-2.7-webflux/gradle.lockfile b/dd-smoke-tests/spring-boot-2.7-webflux/gradle.lockfile index 5cc5ac5b38f..f2f62d305e1 100644 --- a/dd-smoke-tests/spring-boot-2.7-webflux/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-2.7-webflux/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:spring-boot-2.7-webflux:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/spring-boot-3.0-native/gradle.lockfile b/dd-smoke-tests/spring-boot-3.0-native/gradle.lockfile index 8d60cd4ac3e..5e14871f3f9 100644 --- a/dd-smoke-tests/spring-boot-3.0-native/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-3.0-native/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:spring-boot-3.0-native:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/spring-boot-3.0-webflux/gradle.lockfile b/dd-smoke-tests/spring-boot-3.0-webflux/gradle.lockfile index 5cc5ac5b38f..4a65034a835 100644 --- a/dd-smoke-tests/spring-boot-3.0-webflux/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-3.0-webflux/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:spring-boot-3.0-webflux:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/spring-boot-3.0-webmvc/gradle.lockfile b/dd-smoke-tests/spring-boot-3.0-webmvc/gradle.lockfile index 5cc5ac5b38f..b3b1ff02dd2 100644 --- a/dd-smoke-tests/spring-boot-3.0-webmvc/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-3.0-webmvc/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:spring-boot-3.0-webmvc:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/spring-boot-3.3-webmvc/gradle.lockfile b/dd-smoke-tests/spring-boot-3.3-webmvc/gradle.lockfile index 5cc5ac5b38f..a2f357e2088 100644 --- a/dd-smoke-tests/spring-boot-3.3-webmvc/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-3.3-webmvc/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:spring-boot-3.3-webmvc:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/spring-boot-rabbit/gradle.lockfile b/dd-smoke-tests/spring-boot-rabbit/gradle.lockfile index 2b45702e390..3f6fc01ea72 100644 --- a/dd-smoke-tests/spring-boot-rabbit/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-rabbit/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:spring-boot-rabbit:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -33,7 +34,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/spring-security/gradle.lockfile b/dd-smoke-tests/spring-security/gradle.lockfile index a983808417f..eec2fde191e 100644 --- a/dd-smoke-tests/spring-security/gradle.lockfile +++ b/dd-smoke-tests/spring-security/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:spring-security:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -28,7 +29,7 @@ com.github.jnr:jnr-ffi:2.2.19=runtimeClasspath,testFixturesRuntimeClasspath,test com.github.jnr:jnr-posix:3.1.22=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-freemarker/gradle.lockfile b/dd-smoke-tests/springboot-freemarker/gradle.lockfile index 60866602378..5153424d7be 100644 --- a/dd-smoke-tests/springboot-freemarker/gradle.lockfile +++ b/dd-smoke-tests/springboot-freemarker/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:springboot-freemarker:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-grpc/gradle.lockfile b/dd-smoke-tests/springboot-grpc/gradle.lockfile index b5347617761..9d776d60236 100644 --- a/dd-smoke-tests/springboot-grpc/gradle.lockfile +++ b/dd-smoke-tests/springboot-grpc/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:springboot-grpc:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testCompileProtoPath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testCompileProtoPath,testRuntimeClasspath ch.qos.logback:logback-classic:1.1.11=compileClasspath,compileProtoPath,runtimeClasspath @@ -28,7 +29,7 @@ com.github.jnr:jnr-ffi:2.2.19=testCompileProtoPath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testCompileProtoPath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testCompileProtoPath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testCompileProtoPath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,compileProtoPath,spotbugs,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,compileProtoPath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.android:annotations:4.1.1.4=compileProtoPath,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-java-11/gradle.lockfile b/dd-smoke-tests/springboot-java-11/gradle.lockfile index f8fc57ac969..dc0ce10be77 100644 --- a/dd-smoke-tests/springboot-java-11/gradle.lockfile +++ b/dd-smoke-tests/springboot-java-11/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:springboot-java-11:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-java-17/gradle.lockfile b/dd-smoke-tests/springboot-java-17/gradle.lockfile index 7ddedc2ab05..9edefd1e028 100644 --- a/dd-smoke-tests/springboot-java-17/gradle.lockfile +++ b/dd-smoke-tests/springboot-java-17/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:springboot-java-17:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -22,7 +23,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-jetty-jsp/gradle.lockfile b/dd-smoke-tests/springboot-jetty-jsp/gradle.lockfile index 60866602378..00cac933587 100644 --- a/dd-smoke-tests/springboot-jetty-jsp/gradle.lockfile +++ b/dd-smoke-tests/springboot-jetty-jsp/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:springboot-jetty-jsp:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-jpa/gradle.lockfile b/dd-smoke-tests/springboot-jpa/gradle.lockfile index a0f113a4394..940d0c9dd39 100644 --- a/dd-smoke-tests/springboot-jpa/gradle.lockfile +++ b/dd-smoke-tests/springboot-jpa/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:springboot-jpa:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-mongo/gradle.lockfile b/dd-smoke-tests/springboot-mongo/gradle.lockfile index ab035e26d2a..ee714d72539 100644 --- a/dd-smoke-tests/springboot-mongo/gradle.lockfile +++ b/dd-smoke-tests/springboot-mongo/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:springboot-mongo:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -32,7 +33,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-openliberty-20/gradle.lockfile b/dd-smoke-tests/springboot-openliberty-20/gradle.lockfile index a0f113a4394..ccb7546370a 100644 --- a/dd-smoke-tests/springboot-openliberty-20/gradle.lockfile +++ b/dd-smoke-tests/springboot-openliberty-20/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:springboot-openliberty-20:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-openliberty-23/gradle.lockfile b/dd-smoke-tests/springboot-openliberty-23/gradle.lockfile index a0f113a4394..b4c81cc75d6 100644 --- a/dd-smoke-tests/springboot-openliberty-23/gradle.lockfile +++ b/dd-smoke-tests/springboot-openliberty-23/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:springboot-openliberty-23:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-thymeleaf/gradle.lockfile b/dd-smoke-tests/springboot-thymeleaf/gradle.lockfile index 60866602378..b5824549e67 100644 --- a/dd-smoke-tests/springboot-thymeleaf/gradle.lockfile +++ b/dd-smoke-tests/springboot-thymeleaf/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:springboot-thymeleaf:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-tomcat-jsp/gradle.lockfile b/dd-smoke-tests/springboot-tomcat-jsp/gradle.lockfile index 60866602378..294b0d8b699 100644 --- a/dd-smoke-tests/springboot-tomcat-jsp/gradle.lockfile +++ b/dd-smoke-tests/springboot-tomcat-jsp/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:springboot-tomcat-jsp:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-tomcat/gradle.lockfile b/dd-smoke-tests/springboot-tomcat/gradle.lockfile index b89c3d8d0b9..e4e99c01463 100644 --- a/dd-smoke-tests/springboot-tomcat/gradle.lockfile +++ b/dd-smoke-tests/springboot-tomcat/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:springboot-tomcat:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-velocity/gradle.lockfile b/dd-smoke-tests/springboot-velocity/gradle.lockfile index 60866602378..85f15196b4d 100644 --- a/dd-smoke-tests/springboot-velocity/gradle.lockfile +++ b/dd-smoke-tests/springboot-velocity/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:springboot-velocity:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot/gradle.lockfile b/dd-smoke-tests/springboot/gradle.lockfile index 5c03760c2bd..3a74e8d2f20 100644 --- a/dd-smoke-tests/springboot/gradle.lockfile +++ b/dd-smoke-tests/springboot/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:springboot:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -31,7 +32,7 @@ com.github.jnr:jnr-ffi:2.2.19=runtimeClasspath,testFixturesRuntimeClasspath,test com.github.jnr:jnr-posix:3.1.22=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/tracer-flare/gradle.lockfile b/dd-smoke-tests/tracer-flare/gradle.lockfile index a0f113a4394..04bb791f08c 100644 --- a/dd-smoke-tests/tracer-flare/gradle.lockfile +++ b/dd-smoke-tests/tracer-flare/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:tracer-flare:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/vertx-3.4/gradle.lockfile b/dd-smoke-tests/vertx-3.4/gradle.lockfile index 0b40bdb9255..d804236c433 100644 --- a/dd-smoke-tests/vertx-3.4/gradle.lockfile +++ b/dd-smoke-tests/vertx-3.4/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:vertx-3.4:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/vertx-3.9-resteasy/gradle.lockfile b/dd-smoke-tests/vertx-3.9-resteasy/gradle.lockfile index 5cc5ac5b38f..159c660459a 100644 --- a/dd-smoke-tests/vertx-3.9-resteasy/gradle.lockfile +++ b/dd-smoke-tests/vertx-3.9-resteasy/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:vertx-3.9-resteasy:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/vertx-3.9/gradle.lockfile b/dd-smoke-tests/vertx-3.9/gradle.lockfile index f99a7e3cdb9..64831011f53 100644 --- a/dd-smoke-tests/vertx-3.9/gradle.lockfile +++ b/dd-smoke-tests/vertx-3.9/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:vertx-3.9:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/vertx-4.2/gradle.lockfile b/dd-smoke-tests/vertx-4.2/gradle.lockfile index d89dfffa99f..6b82e54119f 100644 --- a/dd-smoke-tests/vertx-4.2/gradle.lockfile +++ b/dd-smoke-tests/vertx-4.2/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:vertx-4.2:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/websphere-jmx/gradle.lockfile b/dd-smoke-tests/websphere-jmx/gradle.lockfile index 532987a4fc6..2f84321bba2 100644 --- a/dd-smoke-tests/websphere-jmx/gradle.lockfile +++ b/dd-smoke-tests/websphere-jmx/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:websphere-jmx:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -25,7 +26,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/wildfly/gradle.lockfile b/dd-smoke-tests/wildfly/gradle.lockfile index c88f9cab102..ae0b2e06dc9 100644 --- a/dd-smoke-tests/wildfly/gradle.lockfile +++ b/dd-smoke-tests/wildfly/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-smoke-tests:wildfly:dependencies --write-locks cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath @@ -21,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath From 635c6b867e9d7bc670768289574b40a46b6eca2d Mon Sep 17 00:00:00 2001 From: Brice Dutheil Date: Tue, 23 Jun 2026 14:36:09 +0200 Subject: [PATCH 025/139] Support Maven smoke test apps (#11695) feat(smoke): support Maven smoke test apps The smoke-test-app plugin now has separate Gradle and Maven application entry points. OpenLiberty smoke tests can use the shared nested-build wiring instead of bespoke Exec tasks, while existing Gradle smoke-test apps keep the same task model. Maven apps still launch through the checked-in root mvnw instead of an installed mvn. Keeping mvnw preserves the Maven version pinned by .mvn/wrapper/maven-wrapper.properties and gives CI and local builds the same cross-platform launcher. CI no longer rewrites maven-wrapper.properties to use MASS. Apache Maven Wrapper documents MVNW_REPOURL as the repository-manager override, so GitLab exports it from MAVEN_REPOSITORY_PROXY and trims the trailing slash before mvnw appends the Maven distribution path: https://maven.apache.org/tools/wrapper/#Using_a_Maven_Repository_Manager The Maven path is covered by smoke-test plugin tests. ProjectBuilder verifies mavenApp task wiring, and the TestKit end-to-end test runs a fake mvnw with MAVEN_REPOSITORY_PROXY. It also asserts the nested Maven process receives MVNW_REPOURL. fix(smoke): address Maven app review feedback fix(smoke): make nested build timeouts opt-in Only wire Gradle stop and Maven build timeouts when the smoke app DSL sets them explicitly. Add Maven cache coverage that deletes the app output directory and verifies the jar is restored from the outer build cache. Mirror the output assertion for the existing Gradle cache test. Co-authored-by: brice.dutheil --- .gitlab-ci.yml | 9 +- .../buildlogic/smoketest/NestedGradleBuild.kt | 33 ++- .../buildlogic/smoketest/NestedMavenBuild.kt | 201 ++++++++++++++++++ .../buildlogic/smoketest/OperatingSystem.kt | 7 + .../smoketest/SmokeTestAppExtension.kt | 165 +++++++++++--- .../smoketest/SmokeTestAppPlugin.kt | 11 +- .../smoketest/SmokeTestAppEndToEndTest.kt | 130 +++++++++-- .../smoketest/SmokeTestAppPluginTest.kt | 91 +++++++- .../datadog/buildlogic/smoketest/fake-mvnw | 18 ++ .../buildlogic/smoketest/fake-mvnw.cmd | 19 ++ .../apm-tracing-disabled/build.gradle | 2 +- dd-smoke-tests/armeria-grpc/build.gradle | 2 +- dd-smoke-tests/kafka-2/build.gradle | 2 +- dd-smoke-tests/kafka-3/build.gradle | 2 +- dd-smoke-tests/openfeature/build.gradle | 2 +- dd-smoke-tests/quarkus-native/build.gradle | 2 +- dd-smoke-tests/quarkus/build.gradle | 2 +- .../spring-boot-2.7-webflux/build.gradle | 2 +- .../spring-boot-3.0-native/build.gradle | 2 +- .../spring-boot-3.0-webflux/build.gradle | 2 +- .../spring-boot-3.0-webmvc/build.gradle | 2 +- .../spring-boot-3.3-webmvc/build.gradle | 2 +- .../springboot-freemarker/build.gradle | 2 +- .../springboot-java-11/build.gradle | 2 +- .../springboot-java-17/build.gradle | 2 +- .../springboot-jetty-jsp/build.gradle | 2 +- dd-smoke-tests/springboot-jpa/build.gradle | 2 +- .../springboot-openliberty-20/build.gradle | 49 ++--- .../springboot-openliberty-23/build.gradle | 49 ++--- .../springboot-thymeleaf/build.gradle | 2 +- .../springboot-tomcat-jsp/build.gradle | 2 +- dd-smoke-tests/springboot-tomcat/build.gradle | 2 +- .../springboot-velocity/build.gradle | 2 +- dd-smoke-tests/vertx-3.4/build.gradle | 2 +- .../vertx-3.9-resteasy/build.gradle | 2 +- dd-smoke-tests/vertx-3.9/build.gradle | 2 +- dd-smoke-tests/vertx-4.2/build.gradle | 2 +- 37 files changed, 672 insertions(+), 160 deletions(-) create mode 100644 build-logic/smoke-test/src/main/kotlin/datadog/buildlogic/smoketest/NestedMavenBuild.kt create mode 100644 build-logic/smoke-test/src/main/kotlin/datadog/buildlogic/smoketest/OperatingSystem.kt create mode 100644 build-logic/smoke-test/src/test/resources/datadog/buildlogic/smoketest/fake-mvnw create mode 100644 build-logic/smoke-test/src/test/resources/datadog/buildlogic/smoketest/fake-mvnw.cmd diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cf1cb6d91b5..780fb720177 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -242,8 +242,9 @@ default: EOF - mkdir -p .gradle - export GRADLE_USER_HOME=$(pwd)/.gradle - # replace maven central part by MAVEN_REPOSITORY_PROXY in .mvn/wrapper/maven-wrapper.properties - - sed -i "s|https://repo.maven.apache.org/maven2/|$MAVEN_REPOSITORY_PROXY|g" .mvn/wrapper/maven-wrapper.properties + # Apache Maven Wrapper supports MVNW_REPOURL for repository-manager downloads: + # https://maven.apache.org/tools/wrapper/#Using_a_Maven_Repository_Manager + - export MVNW_REPOURL=${MAVEN_REPOSITORY_PROXY%/} # Route Gradle distribution download through MASS pull-through cache - | mass_read_host="${MASS_READ_URL#https://}" @@ -784,7 +785,9 @@ muzzle-dep-report: # and Gradle does `chmod 700 .gradle` on startup which requires user ownership. - sudo chown -R 1001:1001 .gradle - export GRADLE_USER_HOME=$(pwd)/.gradle - - sed -i "s|https://repo.maven.apache.org/maven2/|$MAVEN_REPOSITORY_PROXY|g" .mvn/wrapper/maven-wrapper.properties + # Apache Maven Wrapper supports MVNW_REPOURL for repository-manager downloads: + # https://maven.apache.org/tools/wrapper/#Using_a_Maven_Repository_Manager + - export MVNW_REPOURL=${MAVEN_REPOSITORY_PROXY%/} - *normalize_node_index - *prepare_test_env # Disable CDS in forked JVMs to avoid SIGSEGVs on Linux arm64. diff --git a/build-logic/smoke-test/src/main/kotlin/datadog/buildlogic/smoketest/NestedGradleBuild.kt b/build-logic/smoke-test/src/main/kotlin/datadog/buildlogic/smoketest/NestedGradleBuild.kt index 2e7f06c93ab..33da53475d1 100644 --- a/build-logic/smoke-test/src/main/kotlin/datadog/buildlogic/smoketest/NestedGradleBuild.kt +++ b/build-logic/smoke-test/src/main/kotlin/datadog/buildlogic/smoketest/NestedGradleBuild.kt @@ -113,6 +113,11 @@ abstract class NestedGradleBuild @Inject constructor( @get:Input abstract val buildCacheEnabled: Property + /** Timeout, in seconds, for stopping the nested Gradle daemon after the build. */ + @get:Input + @get:Optional + abstract val stopTimeoutSeconds: Property + /** * Extra environment variables for the nested Gradle daemon. Merged on top of the outer process * environment; Gradle launcher variables are reserved by this task so nested builds do not @@ -236,9 +241,17 @@ abstract class NestedGradleBuild @Inject constructor( } val process = processBuilder.start() - if (!process.waitFor(GRADLE_STOP_TIMEOUT_SECONDS, TimeUnit.SECONDS)) { + val timeoutSeconds = stopTimeoutSeconds.orNull + val completed = + if (timeoutSeconds == null) { + process.waitFor() + true + } else { + process.waitFor(timeoutSeconds, TimeUnit.SECONDS) + } + if (!completed) { process.destroyForcibly() - logger.warn("Timed out while stopping nested Gradle daemon") + logger.warn("Timed out after {} seconds while stopping nested Gradle daemon", timeoutSeconds) return } val exitCode = process.exitValue() @@ -270,13 +283,6 @@ abstract class NestedGradleBuild @Inject constructor( file.parentFile?.name == "bin" } - private fun gradleExecutableName(): String = - if (System.getProperty("os.name").lowercase().contains("windows")) { - "gradle.bat" - } else { - "gradle" - } - private fun createGradleUserHome(): File { val directory = temporaryDir.resolve("gradle-user-home") deleteGradleUserHome(directory) @@ -294,8 +300,13 @@ abstract class NestedGradleBuild @Inject constructor( } } - private companion object { - const val GRADLE_STOP_TIMEOUT_SECONDS = 30L + companion object { + internal fun gradleExecutableName(osName: String = System.getProperty("os.name")): String = + if (isWindows(osName)) { + "gradle.bat" + } else { + "gradle" + } } } diff --git a/build-logic/smoke-test/src/main/kotlin/datadog/buildlogic/smoketest/NestedMavenBuild.kt b/build-logic/smoke-test/src/main/kotlin/datadog/buildlogic/smoketest/NestedMavenBuild.kt new file mode 100644 index 00000000000..28234528be2 --- /dev/null +++ b/build-logic/smoke-test/src/main/kotlin/datadog/buildlogic/smoketest/NestedMavenBuild.kt @@ -0,0 +1,201 @@ +package datadog.buildlogic.smoketest + +import org.gradle.api.DefaultTask +import org.gradle.api.GradleException +import org.gradle.api.file.DirectoryProperty +import org.gradle.api.file.FileTree +import org.gradle.api.file.RegularFileProperty +import org.gradle.api.model.ObjectFactory +import org.gradle.api.provider.ListProperty +import org.gradle.api.provider.MapProperty +import org.gradle.api.provider.Property +import org.gradle.api.tasks.CacheableTask +import org.gradle.api.tasks.IgnoreEmptyDirectories +import org.gradle.api.tasks.Input +import org.gradle.api.tasks.InputFile +import org.gradle.api.tasks.InputFiles +import org.gradle.api.tasks.Internal +import org.gradle.api.tasks.Nested +import org.gradle.api.tasks.Optional +import org.gradle.api.tasks.OutputDirectory +import org.gradle.api.tasks.PathSensitive +import org.gradle.api.tasks.PathSensitivity +import org.gradle.api.tasks.TaskAction +import org.gradle.jvm.toolchain.JavaLanguageVersion +import org.gradle.jvm.toolchain.JavaLauncher +import org.gradle.jvm.toolchain.JavaToolchainService +import java.io.File +import java.util.concurrent.TimeUnit +import javax.inject.Inject + +/** + * Runs a nested Maven build inside [applicationDir] via the root Maven wrapper. + * + * The nested build is expected to honour `-Dtarget.dir=` and write outputs under that + * directory so Gradle can track the artifact under [applicationBuildDir]. + */ +@CacheableTask +abstract class NestedMavenBuild @Inject constructor( + private val objects: ObjectFactory, + javaToolchains: JavaToolchainService, +) : DefaultTask() { + + init { + javaLauncher.convention( + javaToolchains.launcherFor { + languageVersion.set(JavaLanguageVersion.of(DEFAULT_NESTED_JAVA_VERSION)) + }, + ) + goals.convention(listOf("package")) + arguments.convention(emptyList()) + environment.convention(emptyMap()) + mavenOpts.convention("") + useMavenLocalRepository.convention(false) + } + + @get:Internal + abstract val applicationDir: DirectoryProperty + + @get:InputFiles + @get:IgnoreEmptyDirectories + @get:PathSensitive(PathSensitivity.RELATIVE) + val applicationSources: FileTree = + objects.fileTree().from(applicationDir).matching { + exclude("target/**") + } + + @get:OutputDirectory + abstract val applicationBuildDir: DirectoryProperty + + @get:InputFile + @get:PathSensitive(PathSensitivity.RELATIVE) + abstract val mavenExecutable: RegularFileProperty + + @get:InputFiles + @get:IgnoreEmptyDirectories + @get:PathSensitive(PathSensitivity.RELATIVE) + val mavenWrapperFiles: FileTree = + objects.fileTree().from(project.rootProject.layout.projectDirectory.dir(".mvn/wrapper")).matching { + include("maven-wrapper.properties", "maven-wrapper.jar") + } + + @get:Nested + abstract val javaLauncher: Property + + @get:Input + abstract val goals: ListProperty + + @get:Input + abstract val arguments: ListProperty + + @get:Input + abstract val environment: MapProperty + + @get:Input + @get:Optional + abstract val mavenOpts: Property + + @get:Input + @get:Optional + abstract val mavenRepositoryProxy: Property + + @get:Input + abstract val useMavenLocalRepository: Property + + /** Timeout, in seconds, for the nested Maven build process. */ + @get:Input + @get:Optional + abstract val buildTimeoutSeconds: Property + + @get:Internal + abstract val mavenLocalRepository: DirectoryProperty + + @TaskAction + fun runNestedBuild() { + val appDir = applicationDir.get().asFile + val appBuildDirFile = applicationBuildDir.get().asFile + val targetDir = appBuildDirFile.resolve("target") + val daemonJavaHome = javaLauncher.get().metadata.installationPath.asFile + val command = mavenCommand(mavenExecutable.get().asFile).apply { + add("-Dtarget.dir=${targetDir.absolutePath}") + if (useMavenLocalRepository.get()) { + add("-Dmaven.repo.local=${mavenLocalRepository.get().asFile.absolutePath}") + } + addAll(arguments.get()) + addAll(goals.get()) + } + + val process = ProcessBuilder(command) + .directory(appDir) + .redirectOutput(ProcessBuilder.Redirect.INHERIT) + .redirectError(ProcessBuilder.Redirect.INHERIT) + .apply { + environment().apply { + clear() + putAll(nestedEnvironment(daemonJavaHome)) + } + } + .start() + + try { + val timeoutSeconds = buildTimeoutSeconds.orNull + val completed = + if (timeoutSeconds == null) { + process.waitFor() + true + } else { + process.waitFor(timeoutSeconds, TimeUnit.SECONDS) + } + if (!completed) { + process.destroyForcibly() + throw GradleException( + "Nested Maven build timed out after $timeoutSeconds seconds: " + + command.joinToString(" "), + ) + } + } catch (e: InterruptedException) { + process.destroyForcibly() + Thread.currentThread().interrupt() + throw GradleException("Interrupted while running nested Maven build", e) + } + val exitCode = process.exitValue() + if (exitCode != 0) { + throw GradleException( + "Nested Maven build failed with exit code $exitCode: ${command.joinToString(" ")}", + ) + } + } + + private fun nestedEnvironment(daemonJavaHome: File): Map { + val env = System.getenv().toMutableMap() + val repositoryProxy = mavenRepositoryProxy.orNull?.takeIf { it.isNotBlank() } + if (repositoryProxy != null) { + env["MAVEN_REPOSITORY_PROXY"] = repositoryProxy + env.putIfAbsent("MVNW_REPOURL", repositoryProxy.trimEnd('/')) + } + val opts = mavenOpts.orNull + if (!opts.isNullOrBlank()) { + env["MAVEN_OPTS"] = opts + } + env["JAVA_HOME"] = daemonJavaHome.absolutePath + env.putAll(environment.get()) + return env + } + + private fun mavenCommand(executable: File): MutableList = + if (isWindows()) { + mutableListOf("cmd", "/c", executable.absolutePath) + } else { + mutableListOf(executable.absolutePath) + } + + companion object { + internal fun mavenWrapperName(osName: String = System.getProperty("os.name")): String = + if (isWindows(osName)) { + "mvnw.cmd" + } else { + "mvnw" + } + + } +} diff --git a/build-logic/smoke-test/src/main/kotlin/datadog/buildlogic/smoketest/OperatingSystem.kt b/build-logic/smoke-test/src/main/kotlin/datadog/buildlogic/smoketest/OperatingSystem.kt new file mode 100644 index 00000000000..a7e46fc640e --- /dev/null +++ b/build-logic/smoke-test/src/main/kotlin/datadog/buildlogic/smoketest/OperatingSystem.kt @@ -0,0 +1,7 @@ +package datadog.buildlogic.smoketest + +import java.util.Locale + +internal fun isWindows(osName: String = System.getProperty("os.name")): Boolean = + osName.lowercase(Locale.ROOT).contains("windows") + diff --git a/build-logic/smoke-test/src/main/kotlin/datadog/buildlogic/smoketest/SmokeTestAppExtension.kt b/build-logic/smoke-test/src/main/kotlin/datadog/buildlogic/smoketest/SmokeTestAppExtension.kt index 231816c547a..a34ee321cbc 100644 --- a/build-logic/smoke-test/src/main/kotlin/datadog/buildlogic/smoketest/SmokeTestAppExtension.kt +++ b/build-logic/smoke-test/src/main/kotlin/datadog/buildlogic/smoketest/SmokeTestAppExtension.kt @@ -5,6 +5,7 @@ import org.gradle.api.Project import org.gradle.api.artifacts.Configuration import org.gradle.api.file.DirectoryProperty import org.gradle.api.file.RegularFile +import org.gradle.api.file.RegularFileProperty import org.gradle.api.provider.ListProperty import org.gradle.api.provider.MapProperty import org.gradle.api.provider.Property @@ -22,10 +23,10 @@ import java.util.Locale import javax.inject.Inject /** - * Project extension that wires a [NestedGradleBuild] task for a smoke-test application. + * Project extension that wires a nested build task for a smoke-test application. * - * The plugin only contributes a task when the consumer calls [application]; if the extension - * stays unconfigured, the plugin is a no-op and consumers can register [NestedGradleBuild] + * The plugin only contributes a task when the consumer calls [gradleApp] or [mavenApp]; if + * the extension stays unconfigured, the plugin is a no-op and consumers can register tasks * directly. */ abstract class SmokeTestAppExtension @Inject constructor( @@ -47,8 +48,8 @@ abstract class SmokeTestAppExtension @Inject constructor( abstract val gradleDistributionBaseUrl: Property /** - * JDK used by the nested daemon. Defaults to a [DEFAULT_NESTED_JAVA_VERSION] toolchain; - * override to pin a different JDK if the nested application's plugin chain requires it. + * JDK used by the nested build. Defaults to a [DEFAULT_NESTED_JAVA_VERSION] toolchain; + * override to pin a different JDK if the nested application's build chain requires it. * The inner build script is responsible for pinning the produced bytecode level (e.g. * `java { sourceCompatibility = JavaVersion.VERSION_1_8 }`). */ @@ -58,8 +59,9 @@ abstract class SmokeTestAppExtension @Inject constructor( abstract val applicationDir: DirectoryProperty /** - * Directory the nested build writes its outputs to. The nested build script is expected to - * honour `-PappBuildDir=`; see the existing smoke-test inner builds for the pattern. + * Directory the nested build writes its outputs to. Gradle applications are expected to + * honour `-PappBuildDir=`; Maven applications are expected to honour + * `-Dtarget.dir=`. */ abstract val applicationBuildDir: DirectoryProperty @@ -108,19 +110,19 @@ abstract class SmokeTestAppExtension @Inject constructor( /** * Register the nested-build task and wire the produced artifact into every `Test` task as * a system property. Calling this triggers task registration; consumers that prefer to - * register [NestedGradleBuild] manually can leave [application] uncalled. + * register [NestedGradleBuild] manually can leave [gradleApp] uncalled. */ - fun application(action: Action) { - val spec = project.objects.newInstance() + fun gradleApp(action: Action) { + val spec = project.objects.newInstance() action.execute(spec) val taskName = requireNotNull(spec.taskName.orNull) { - "smokeTestApp.application { taskName = ... } is required" + "smokeTestApp.gradleApp { taskName = ... } is required" } val artifactPath = requireNotNull(spec.artifactPath.orNull) { - "smokeTestApp.application { artifactPath = ... } is required" + "smokeTestApp.gradleApp { artifactPath = ... } is required" } val sysProperty = requireNotNull(spec.sysProperty.orNull) { - "smokeTestApp.application { sysProperty = ... } is required" + "smokeTestApp.gradleApp { sysProperty = ... } is required" } val nestedTasks = spec.nestedTasks.orNull?.takeIf { it.isNotEmpty() } ?: listOf(taskName) @@ -135,11 +137,61 @@ abstract class SmokeTestAppExtension @Inject constructor( buildArguments.set(spec.buildArguments) environment.set(spec.environment) buildCacheEnabled.set(spec.buildCacheEnabled) + spec.stopTimeoutSeconds.orNull?.let(stopTimeoutSeconds::set) projectJars.set(this@SmokeTestAppExtension.projectJars) } + wireTestTasks(taskProvider, artifactPath, sysProperty, spec.additionalSystemProperties) + } + + /** Register a Maven nested-build task and expose its artifact to every `Test` task. */ + fun mavenApp(action: Action) { + val spec = project.objects.newInstance() + spec.mavenExecutable.convention(rootMavenExecutable()) + spec.mavenRepositoryProxy.convention( + project.providers.environmentVariable("MAVEN_REPOSITORY_PROXY"), + ) + spec.mavenLocalRepository.convention(project.rootProject.layout.projectDirectory.dir(".mvn/caches")) + spec.useMavenLocalRepository.convention(isCiProvider()) + action.execute(spec) + + val taskName = requireNotNull(spec.taskName.orNull) { + "smokeTestApp.mavenApp { taskName = ... } is required" + } + val artifactPath = requireNotNull(spec.artifactPath.orNull) { + "smokeTestApp.mavenApp { artifactPath = ... } is required" + } + val sysProperty = requireNotNull(spec.sysProperty.orNull) { + "smokeTestApp.mavenApp { sysProperty = ... } is required" + } + + val taskProvider: TaskProvider = + project.tasks.register(taskName) { + applicationDir.set(this@SmokeTestAppExtension.applicationDir) + applicationBuildDir.set(this@SmokeTestAppExtension.applicationBuildDir) + javaLauncher.set(this@SmokeTestAppExtension.javaLauncher) + mavenExecutable.set(spec.mavenExecutable) + goals.set(spec.goals) + arguments.set(spec.arguments) + environment.set(spec.environment) + mavenOpts.set(spec.mavenOpts) + mavenRepositoryProxy.set(spec.mavenRepositoryProxy) + useMavenLocalRepository.set(spec.useMavenLocalRepository) + mavenLocalRepository.set(spec.mavenLocalRepository) + spec.buildTimeoutSeconds.orNull?.let(buildTimeoutSeconds::set) + } + + wireTestTasks(taskProvider, artifactPath, sysProperty, spec.additionalSystemProperties) + } + + private fun wireTestTasks( + taskProvider: TaskProvider<*>, + artifactPath: String, + sysProperty: String, + additionalSystemProperties: MapProperty, + ) { val artifactProvider: Provider = applicationBuildDir.file(artifactPath) - val extras = spec.additionalSystemProperties.get().mapValues { (_, relativePath) -> + val extras = additionalSystemProperties.get().mapValues { (_, relativePath) -> applicationBuildDir.file(relativePath) } project.tasks.withType().configureEach { @@ -229,16 +281,26 @@ abstract class SmokeTestAppExtension @Inject constructor( properties[name] = value } } + + private fun rootMavenExecutable(): Provider = + project.providers.provider { + project.rootProject.layout.projectDirectory.file(NestedMavenBuild.mavenWrapperName()) + } + + private fun isCiProvider(): Provider = + project.providers.environmentVariable("CI") + .map { it.equals("true", ignoreCase = true) } + .orElse(false) } -/** DSL describing the nested-build invocation for one smoke-test application. */ +/** Common DSL for a smoke-test application artifact. */ abstract class ApplicationSpec @Inject constructor() { init { - buildCacheEnabled.convention(false) + additionalSystemProperties.convention(emptyMap()) } - /** Outer task name; the nested daemon runs the same task by default. */ + /** Outer task name registered by the smoke-test plugin. */ abstract val taskName: Property /** Path to the produced artifact, relative to `applicationBuildDir`. */ @@ -247,6 +309,23 @@ abstract class ApplicationSpec @Inject constructor() { /** System property name set on Test tasks to point them at the produced artifact. */ abstract val sysProperty: Property + /** + * Additional system properties to forward to every `Test` task, keyed by property name with + * values resolved against `applicationBuildDir`. Use this for smoke tests that need more + * than the single primary artifact path (e.g. a separately unpacked server install). + */ + abstract val additionalSystemProperties: MapProperty +} + +/** DSL describing a nested Gradle invocation for one smoke-test application. */ +abstract class GradleAppSpec @Inject constructor() : ApplicationSpec() { + + init { + buildCacheEnabled.convention(false) + buildArguments.convention(emptyList()) + environment.convention(emptyMap()) + } + /** Tasks run inside the nested build. Defaults to `[taskName]`. */ abstract val nestedTasks: ListProperty @@ -261,13 +340,6 @@ abstract class ApplicationSpec @Inject constructor() { */ abstract val environment: MapProperty - /** - * Additional system properties to forward to every `Test` task, keyed by property name with - * values resolved against `applicationBuildDir`. Use this for smoke tests that need more - * than the single primary artifact path (e.g. a separately unpacked server install). - */ - abstract val additionalSystemProperties: MapProperty - /** * Whether to enable the build cache in the nested Gradle invocation. * Gradle's org.gradle.caching flag is resolved from many sources (project, @@ -278,6 +350,47 @@ abstract class ApplicationSpec @Inject constructor() { * `--build-cache` / `--no-build-cache` is passed explicitly either way. */ abstract val buildCacheEnabled: Property + + /** Timeout, in seconds, for stopping the nested Gradle daemon after the build. */ + abstract val stopTimeoutSeconds: Property +} + +/** DSL describing a nested Maven invocation for one smoke-test application. */ +abstract class MavenAppSpec @Inject constructor() : ApplicationSpec() { + + init { + goals.convention(listOf("package")) + arguments.convention(emptyList()) + environment.convention(emptyMap()) + mavenOpts.convention("") + } + + /** Goals run inside the nested Maven build. Defaults to `package`. */ + abstract val goals: ListProperty + + /** Extra arguments passed to the nested Maven invocation before [goals]. */ + abstract val arguments: ListProperty + + /** Extra environment variables exposed to the nested Maven process. */ + abstract val environment: MapProperty + + /** Optional `MAVEN_OPTS` value for the nested Maven process. */ + abstract val mavenOpts: Property + + /** Root Maven wrapper executable used to launch the nested build. */ + abstract val mavenExecutable: RegularFileProperty + + /** Maven repository proxy used by the wrapper and by Maven builds that read the env var. */ + abstract val mavenRepositoryProxy: Property + + /** Whether to pass [mavenLocalRepository] as `-Dmaven.repo.local`. Defaults to CI only. */ + abstract val useMavenLocalRepository: Property + + /** Local repository path used when [useMavenLocalRepository] is enabled. */ + abstract val mavenLocalRepository: DirectoryProperty + + /** Timeout, in seconds, for the nested Maven build process. */ + abstract val buildTimeoutSeconds: Property } /** @@ -288,8 +401,8 @@ abstract class ApplicationSpec @Inject constructor() { const val DEFAULT_NESTED_GRADLE_VERSION = "8.14.5" /** - * Default JDK language version for the nested daemon. JDK 21 is the version the root build - * requires for Gradle 9; standardising the nested daemon on the same JDK avoids pulling a + * Default JDK language version for the nested build. JDK 21 is the version the root build + * requires for Gradle 9; standardising nested builds on the same JDK avoids pulling a * second toolchain onto dev machines and CI runners. Inner build scripts cross-compile down * to their actual bytecode target via `java { sourceCompatibility = ... }`. */ diff --git a/build-logic/smoke-test/src/main/kotlin/datadog/buildlogic/smoketest/SmokeTestAppPlugin.kt b/build-logic/smoke-test/src/main/kotlin/datadog/buildlogic/smoketest/SmokeTestAppPlugin.kt index 06c97503202..30f2476debd 100644 --- a/build-logic/smoke-test/src/main/kotlin/datadog/buildlogic/smoketest/SmokeTestAppPlugin.kt +++ b/build-logic/smoke-test/src/main/kotlin/datadog/buildlogic/smoketest/SmokeTestAppPlugin.kt @@ -6,14 +6,13 @@ import org.gradle.kotlin.dsl.create import org.gradle.kotlin.dsl.withType /** - * Exposes the [NestedGradleBuild] task type plus a `smokeTestApp` extension that wires the - * nested-build task and Test-side system properties for a smoke-test application. + * Exposes nested build task types plus a `smokeTestApp` extension that wires a smoke-test + * application build and Test-side system properties. * * Consumers can either: - * - configure `smokeTestApp { application { ... } }` to let the plugin register the task and - * wire it into every `Test` task, or - * - leave the extension untouched and register a [NestedGradleBuild] task manually (for cases - * that need more control, e.g. additional `Exec`-like task wiring). + * - configure `smokeTestApp { gradleApp { ... } }` or `smokeTestApp { mavenApp { ... } }` to + * let the plugin register the task and wire it into every `Test` task, or + * - leave the extension untouched and register a task manually for cases that need more control. */ class SmokeTestAppPlugin : Plugin { override fun apply(project: Project) { diff --git a/build-logic/smoke-test/src/test/kotlin/datadog/buildlogic/smoketest/SmokeTestAppEndToEndTest.kt b/build-logic/smoke-test/src/test/kotlin/datadog/buildlogic/smoketest/SmokeTestAppEndToEndTest.kt index b8e8cd757f1..086accd5ce3 100644 --- a/build-logic/smoke-test/src/test/kotlin/datadog/buildlogic/smoketest/SmokeTestAppEndToEndTest.kt +++ b/build-logic/smoke-test/src/test/kotlin/datadog/buildlogic/smoketest/SmokeTestAppEndToEndTest.kt @@ -41,7 +41,7 @@ class SmokeTestAppEndToEndTest { fun `nested build produces the configured artifact`() { writeOuterSettings() writeSmokeTestAppBuild( - smokeTestApplication( + smokeTestGradleApplication( taskName = "buildJar", artifactPath = "libs/sample.jar", sysProperty = "sample.path", @@ -65,13 +65,70 @@ class SmokeTestAppEndToEndTest { assertThat(applicationOutput("libs/sample.jar")).exists() } + @Test + fun `nested Maven build produces the configured artifact`() { + writeOuterSettings() + writeFakeMavenWrapper() + writeSmokeTestAppBuild( + smokeTestMavenApplication( + taskName = "packageApp", + artifactPath = "target/sample.jar", + sysProperty = "sample.path", + additionalConfig = """ + mavenExecutable.set(layout.projectDirectory.file("${fakeMavenWrapperName()}")) + mavenOpts.set("-Xmx512M") + """, + ), + ) + File(applicationDir, "pom.xml").writeText("") + + val result = runner( + "packageApp", + environment = mapOf("MAVEN_REPOSITORY_PROXY" to "https://repo.example/maven2/"), + ).build() + + assertThat(result.task(":packageApp")?.outcome).isEqualTo(TaskOutcome.SUCCESS) + assertThat(applicationOutput("target/sample.jar")).exists() + assertThat(applicationOutput("target/maven-env.txt").readLines()).contains( + "MAVEN_OPTS=-Xmx512M", + "MVNW_REPOURL=https://repo.example/maven2", + ) + } + + @Test + fun `nested Maven build output is restored from the outer build cache`() { + writeOuterSettings(withLocalBuildCache = true) + writeFakeMavenWrapper() + writeSmokeTestAppBuild( + smokeTestMavenApplication( + taskName = "packageApp", + artifactPath = "target/sample.jar", + sysProperty = "sample.path", + additionalConfig = """ + mavenExecutable.set(layout.projectDirectory.file("${fakeMavenWrapperName()}")) + """, + ), + ) + File(applicationDir, "pom.xml").writeText("") + + val first = runner("packageApp", "--build-cache").build() + assertThat(first.task(":packageApp")?.outcome).isEqualTo(TaskOutcome.SUCCESS) + assertThat(applicationOutput("target/sample.jar")).exists() + + applicationBuildDir.deleteRecursively() + + val second = runner("packageApp", "--build-cache").build() + assertThat(second.task(":packageApp")?.outcome).isEqualTo(TaskOutcome.FROM_CACHE) + assertThat(applicationOutput("target/sample.jar")).exists() + } + @Test fun `nested build clears inherited Gradle launcher environment`() { writeOuterSettings() val inheritedGradleUserHome = projectDir.resolve("inherited-gradle-user-home").toFile() inheritedGradleUserHome.mkdirs() writeSmokeTestAppBuild( - smokeTestApplication( + smokeTestGradleApplication( taskName = "recordGradleEnvironment", artifactPath = "gradle-env.txt", sysProperty = "gradle.env.path", @@ -129,7 +186,7 @@ class SmokeTestAppEndToEndTest { File(projectDir.toFile(), "agent.jar").writeText("agent") writeSmokeTestAppBuild( """ - ${smokeTestApplication( + ${smokeTestGradleApplication( taskName = "recordNativeInputs", artifactPath = "native-inputs.txt", sysProperty = "native.inputs.path", @@ -176,7 +233,7 @@ class SmokeTestAppEndToEndTest { fun `init scripts are not added outside CI`() { writeOuterSettings() writeSmokeTestAppBuild( - smokeTestApplication( + smokeTestGradleApplication( taskName = "recordInitScripts", artifactPath = "init-script-count.txt", sysProperty = "init.script.count.path", @@ -216,7 +273,7 @@ class SmokeTestAppEndToEndTest { writeMavenArtifact(projectRepository, "com.example", "shared", "1.0", "project") writeMavenArtifact(projectRepository, "com.example", "project-only", "1.0", "project-only") writeSmokeTestAppBuild( - smokeTestApplication( + smokeTestGradleApplication( taskName = "resolveRepositories", artifactPath = "resolved-repositories.txt", sysProperty = "resolved.repositories.path", @@ -281,7 +338,7 @@ class SmokeTestAppEndToEndTest { ) { writeOuterSettings() writeSmokeTestAppBuild( - smokeTestApplication( + smokeTestGradleApplication( taskName = "recordCacheFlag", artifactPath = "cache-flag.txt", sysProperty = "cache.flag.path", @@ -331,7 +388,7 @@ class SmokeTestAppEndToEndTest { ) { writeOuterSettings(withLocalBuildCache = true) writeSmokeTestAppBuild( - smokeTestApplication( + smokeTestGradleApplication( taskName = "buildJar", artifactPath = "libs/sample.jar", sysProperty = "sample.path", @@ -370,6 +427,7 @@ class SmokeTestAppEndToEndTest { ).toTypedArray() val second = runner(*secondArgs).build() assertThat(second.task(":buildJar")?.outcome).isEqualTo(expectedSecondOutcome) + assertThat(applicationOutput("libs/sample.jar")).exists() } private fun writeOuterSettings(withLocalBuildCache: Boolean = false) { @@ -433,25 +491,63 @@ class SmokeTestAppEndToEndTest { ) } - private fun smokeTestApplication( + private fun smokeTestGradleApplication( taskName: String, artifactPath: String, sysProperty: String, additionalConfig: String = "", ): String { val config = additionalConfig.trimIndent() - return buildString { - appendLine("application {") - appendLine(" taskName.set(\"$taskName\")") - appendLine(" artifactPath.set(\"$artifactPath\")") - appendLine(" sysProperty.set(\"$sysProperty\")") - if (config.isNotBlank()) { - appendLine(config.prependIndent(" ")) + return listOfNotNull( + """ + gradleApp { + taskName.set("$taskName") + artifactPath.set("$artifactPath") + sysProperty.set("$sysProperty") + """.trimIndent(), + config.takeIf { it.isNotBlank() }?.prependIndent(" "), + "}", + ).joinToString(System.lineSeparator()) + } + + private fun smokeTestMavenApplication( + taskName: String, + artifactPath: String, + sysProperty: String, + additionalConfig: String = "", + ): String { + val config = additionalConfig.trimIndent() + return listOfNotNull( + """ + mavenApp { + taskName.set("$taskName") + artifactPath.set("$artifactPath") + sysProperty.set("$sysProperty") + """.trimIndent(), + config.takeIf { it.isNotBlank() }?.prependIndent(" "), + "}", + ).joinToString(System.lineSeparator()) + } + + private fun writeFakeMavenWrapper() { + val wrapper = File(projectDir.toFile(), fakeMavenWrapperName()) + val resource = + requireNotNull(javaClass.getResource(fakeMavenWrapperName())) { + "Missing fake Maven wrapper test resource" } - appendLine("}") + wrapper.writeBytes(resource.readBytes()) + if (!isWindows()) { + wrapper.setExecutable(true) } } + private fun fakeMavenWrapperName(): String = + if (isWindows()) { + "fake-mvnw.cmd" + } else { + "fake-mvnw" + } + private fun writeInnerSettings() { File(applicationDir, "settings.gradle.kts").writeText( """ @@ -542,7 +638,7 @@ class SmokeTestAppEndToEndTest { @JvmStatic fun buildCacheFlagCases(): List = listOf( - // (scenario name, DSL line added to the `application { … }` block, expected + // (scenario name, DSL line added to the `gradleApp { … }` block, expected // `gradle.startParameter.isBuildCacheEnabled` value seen by the nested daemon) Arguments.of("default off", "", "false"), Arguments.of("explicit true", "buildCacheEnabled.set(true)", "true"), diff --git a/build-logic/smoke-test/src/test/kotlin/datadog/buildlogic/smoketest/SmokeTestAppPluginTest.kt b/build-logic/smoke-test/src/test/kotlin/datadog/buildlogic/smoketest/SmokeTestAppPluginTest.kt index 9df643a976c..010af208667 100644 --- a/build-logic/smoke-test/src/test/kotlin/datadog/buildlogic/smoketest/SmokeTestAppPluginTest.kt +++ b/build-logic/smoke-test/src/test/kotlin/datadog/buildlogic/smoketest/SmokeTestAppPluginTest.kt @@ -1,5 +1,7 @@ package datadog.buildlogic.smoketest +import datadog.buildlogic.smoketest.NestedGradleBuild.Companion.gradleExecutableName +import datadog.buildlogic.smoketest.NestedMavenBuild.Companion.mavenWrapperName import org.assertj.core.api.Assertions.assertThat import org.gradle.api.plugins.JavaPlugin import org.gradle.jvm.toolchain.JavaLanguageVersion @@ -26,13 +28,14 @@ class SmokeTestAppPluginTest { } @Test - fun `plugin is a no-op when smokeTestApp_application is never called`() { + fun `plugin is a no-op when no smokeTestApp application is configured`() { val project = ProjectBuilder.builder().build() project.plugins.apply("dd-trace-java.smoke-test-app") - // No task of our type should be registered until `application { }` is invoked. + // No nested build task should be registered until `gradleApp { }` or `mavenApp { }` is invoked. assertThat(project.tasks.withType()).isEmpty() + assertThat(project.tasks.withType()).isEmpty() } @Test @@ -68,7 +71,7 @@ class SmokeTestAppPluginTest { } @Test - fun `application block registers NestedGradleBuild task with configured inputs`() { + fun `gradleApp block registers NestedGradleBuild task with configured inputs`() { val project = ProjectBuilder.builder().build() project.apply() project.plugins.apply("dd-trace-java.smoke-test-app") @@ -76,7 +79,7 @@ class SmokeTestAppPluginTest { val extension = project.extensions.getByType() extension.gradleVersion.set("8.14.5") extension.gradleDistributionBaseUrl.set("https://mass.example") - extension.application { + extension.gradleApp { taskName.set("packageApp") artifactPath.set("libs/test.jar") sysProperty.set("test.path") @@ -98,6 +101,86 @@ class SmokeTestAppPluginTest { assertThat(task.buildArguments.get()).containsExactly("-Ddemo=true") assertThat(task.environment.get()).containsEntry("DEMO_ENV", "true") assertThat(task.buildCacheEnabled.get()).isTrue() + assertThat(task.stopTimeoutSeconds.isPresent).isFalse() + } + + @Test + fun `mavenApp block registers NestedMavenBuild task with configured inputs`() { + val project = ProjectBuilder.builder().build() + val wrapperProperties = project.file(".mvn/wrapper/maven-wrapper.properties") + wrapperProperties.parentFile.mkdirs() + wrapperProperties.writeText("distributionUrl=https://repo.example/maven2/test.zip") + project.apply() + project.plugins.apply("dd-trace-java.smoke-test-app") + + val extension = project.extensions.getByType() + extension.mavenApp { + taskName.set("packageApp") + artifactPath.set("target/test.jar") + sysProperty.set("test.path") + goals.set(listOf("verify")) + arguments.add("-Ddemo=true") + environment.put("DEMO_ENV", "true") + mavenOpts.set("-Xmx512M") + mavenExecutable.set(project.layout.projectDirectory.file("mvnw")) + mavenRepositoryProxy.set("https://repo.example") + useMavenLocalRepository.set(true) + mavenLocalRepository.set(project.layout.projectDirectory.dir("m2")) + } + + val task = project.tasks.getByName("packageApp") as NestedMavenBuild + + assertThat(task.applicationDir.get().asFile) + .isEqualTo(project.layout.projectDirectory.dir("application").asFile) + assertThat(task.applicationBuildDir.get().asFile) + .isEqualTo(project.layout.buildDirectory.dir("application").get().asFile) + assertThat(task.goals.get()).containsExactly("verify") + assertThat(task.arguments.get()).containsExactly("-Ddemo=true") + assertThat(task.environment.get()).containsEntry("DEMO_ENV", "true") + assertThat(task.mavenOpts.get()).isEqualTo("-Xmx512M") + assertThat(task.mavenExecutable.get().asFile) + .isEqualTo(project.layout.projectDirectory.file("mvnw").asFile) + assertThat(task.mavenWrapperFiles.files).containsExactly(wrapperProperties) + assertThat(task.mavenRepositoryProxy.get()).isEqualTo("https://repo.example") + assertThat(task.useMavenLocalRepository.get()).isTrue() + assertThat(task.mavenLocalRepository.get().asFile) + .isEqualTo(project.layout.projectDirectory.dir("m2").asFile) + assertThat(task.buildTimeoutSeconds.isPresent).isFalse() + } + + @Test + fun `nested build timeouts can be overridden`() { + val project = ProjectBuilder.builder().build() + project.apply() + project.plugins.apply("dd-trace-java.smoke-test-app") + + val extension = project.extensions.getByType() + extension.gradleApp { + taskName.set("packageGradleApp") + artifactPath.set("libs/test.jar") + sysProperty.set("test.gradle.path") + stopTimeoutSeconds.set(45L) + } + extension.mavenApp { + taskName.set("packageMavenApp") + artifactPath.set("target/test.jar") + sysProperty.set("test.maven.path") + buildTimeoutSeconds.set(60L) + } + + val gradleTask = project.tasks.getByName("packageGradleApp") as NestedGradleBuild + val mavenTask = project.tasks.getByName("packageMavenApp") as NestedMavenBuild + + assertThat(gradleTask.stopTimeoutSeconds.get()).isEqualTo(45L) + assertThat(mavenTask.buildTimeoutSeconds.get()).isEqualTo(60L) + } + + @Test + fun `wrapper executable names follow the host operating system`() { + assertThat(mavenWrapperName("Windows 11")).isEqualTo("mvnw.cmd") + assertThat(mavenWrapperName("Mac OS X")).isEqualTo("mvnw") + assertThat(gradleExecutableName("Windows Server 2022")).isEqualTo("gradle.bat") + assertThat(gradleExecutableName("Linux")).isEqualTo("gradle") } @Test diff --git a/build-logic/smoke-test/src/test/resources/datadog/buildlogic/smoketest/fake-mvnw b/build-logic/smoke-test/src/test/resources/datadog/buildlogic/smoketest/fake-mvnw new file mode 100644 index 00000000000..7eaa9c6feae --- /dev/null +++ b/build-logic/smoke-test/src/test/resources/datadog/buildlogic/smoketest/fake-mvnw @@ -0,0 +1,18 @@ +#!/bin/sh +set -eu + +target="" +while [ "$#" -gt 0 ]; do + case "$1" in + -Dtarget.dir=*) target="${1#-Dtarget.dir=}" ;; + esac + shift +done + +[ -n "$target" ] || exit 2 +mkdir -p "$target" +printf "jar" > "$target/sample.jar" +{ + printf "MAVEN_OPTS=%s\n" "${MAVEN_OPTS:-}" + printf "MVNW_REPOURL=%s\n" "${MVNW_REPOURL:-}" +} > "$target/maven-env.txt" diff --git a/build-logic/smoke-test/src/test/resources/datadog/buildlogic/smoketest/fake-mvnw.cmd b/build-logic/smoke-test/src/test/resources/datadog/buildlogic/smoketest/fake-mvnw.cmd new file mode 100644 index 00000000000..0a1c101024c --- /dev/null +++ b/build-logic/smoke-test/src/test/resources/datadog/buildlogic/smoketest/fake-mvnw.cmd @@ -0,0 +1,19 @@ +@echo off +setlocal enabledelayedexpansion + +set "target=" +:parse +if "%~1"=="" goto run +set "arg=%~1" +if "!arg:~0,13!"=="-Dtarget.dir=" set "target=!arg:~13!" +shift +goto parse + +:run +if "%target%"=="" exit /b 2 +mkdir "%target%" 2>nul +echo jar>"%target%\sample.jar" +( + echo MAVEN_OPTS=%MAVEN_OPTS% + echo MVNW_REPOURL=%MVNW_REPOURL% +) > "%target%\maven-env.txt" diff --git a/dd-smoke-tests/apm-tracing-disabled/build.gradle b/dd-smoke-tests/apm-tracing-disabled/build.gradle index 7b5d43b11db..d1a5504043a 100644 --- a/dd-smoke-tests/apm-tracing-disabled/build.gradle +++ b/dd-smoke-tests/apm-tracing-disabled/build.gradle @@ -8,7 +8,7 @@ apply from: "$rootDir/gradle/java.gradle" description = 'ASM Standalone Billing Tests.' smokeTestApp { - application { + gradleApp { taskName = 'bootJar' artifactPath = 'libs/apm-tracing-disabled-smoketest.jar' sysProperty = 'datadog.smoketest.springboot.shadowJar.path' diff --git a/dd-smoke-tests/armeria-grpc/build.gradle b/dd-smoke-tests/armeria-grpc/build.gradle index ffc3ce45789..835d07ca040 100644 --- a/dd-smoke-tests/armeria-grpc/build.gradle +++ b/dd-smoke-tests/armeria-grpc/build.gradle @@ -43,7 +43,7 @@ protobuf { } smokeTestApp { - application { + gradleApp { taskName = 'armeriaBuild' nestedTasks = ['build'] artifactPath = 'libs/armeria-smoketest-all.jar' diff --git a/dd-smoke-tests/kafka-2/build.gradle b/dd-smoke-tests/kafka-2/build.gradle index 29a18a59f20..ec1e85d52e3 100644 --- a/dd-smoke-tests/kafka-2/build.gradle +++ b/dd-smoke-tests/kafka-2/build.gradle @@ -8,7 +8,7 @@ apply from: "$rootDir/gradle/java.gradle" description = 'Kafka 2.x Smoke Tests.' smokeTestApp { - application { + gradleApp { taskName = 'bootJar' artifactPath = 'libs/kafka-2-smoketest.jar' sysProperty = 'datadog.smoketest.springboot.shadowJar.path' diff --git a/dd-smoke-tests/kafka-3/build.gradle b/dd-smoke-tests/kafka-3/build.gradle index 9ae27138114..b21a187b8f2 100644 --- a/dd-smoke-tests/kafka-3/build.gradle +++ b/dd-smoke-tests/kafka-3/build.gradle @@ -12,7 +12,7 @@ testJvmConstraints { description = 'Kafka 3.x Smoke Tests.' smokeTestApp { - application { + gradleApp { taskName = 'bootJar' artifactPath = 'libs/kafka-3-smoketest.jar' sysProperty = 'datadog.smoketest.springboot.shadowJar.path' diff --git a/dd-smoke-tests/openfeature/build.gradle b/dd-smoke-tests/openfeature/build.gradle index cb2c83d112d..fb3a68a2638 100644 --- a/dd-smoke-tests/openfeature/build.gradle +++ b/dd-smoke-tests/openfeature/build.gradle @@ -11,7 +11,7 @@ testJvmConstraints { } smokeTestApp { - application { + gradleApp { taskName = 'bootJar' artifactPath = 'libs/openfeature-smoketest.jar' sysProperty = 'datadog.smoketest.springboot.shadowJar.path' diff --git a/dd-smoke-tests/quarkus-native/build.gradle b/dd-smoke-tests/quarkus-native/build.gradle index 447be38bcd7..d06e823c2d1 100644 --- a/dd-smoke-tests/quarkus-native/build.gradle +++ b/dd-smoke-tests/quarkus-native/build.gradle @@ -34,7 +34,7 @@ Provider graalvmHome = providers.provider({ } as Callable) smokeTestApp { - application { + gradleApp { taskName = 'quarkusNativeBuild' nestedTasks = ['build'] artifactPath = 'quarkus-native-smoketest--runner' diff --git a/dd-smoke-tests/quarkus/build.gradle b/dd-smoke-tests/quarkus/build.gradle index 9817589dc0a..f9967bbd48f 100644 --- a/dd-smoke-tests/quarkus/build.gradle +++ b/dd-smoke-tests/quarkus/build.gradle @@ -16,7 +16,7 @@ smokeTestApp { javaLauncher = javaToolchains.launcherFor { languageVersion = JavaLanguageVersion.of(11) } - application { + gradleApp { taskName = 'quarkusBuild' nestedTasks = ['build'] // Quarkus' uber-jar is named `-runner.jar`; here the inner project has no diff --git a/dd-smoke-tests/spring-boot-2.7-webflux/build.gradle b/dd-smoke-tests/spring-boot-2.7-webflux/build.gradle index b637f51a344..adae38e89e8 100644 --- a/dd-smoke-tests/spring-boot-2.7-webflux/build.gradle +++ b/dd-smoke-tests/spring-boot-2.7-webflux/build.gradle @@ -7,7 +7,7 @@ apply from: "$rootDir/gradle/java.gradle" description = 'Spring Boot 2.7 Webflux Smoke Tests.' smokeTestApp { - application { + gradleApp { taskName = 'webfluxBuild' nestedTasks = ['bootJar'] artifactPath = 'libs/webflux-2.7-smoketest.jar' diff --git a/dd-smoke-tests/spring-boot-3.0-native/build.gradle b/dd-smoke-tests/spring-boot-3.0-native/build.gradle index 91290953ef7..c986996bfd3 100644 --- a/dd-smoke-tests/spring-boot-3.0-native/build.gradle +++ b/dd-smoke-tests/spring-boot-3.0-native/build.gradle @@ -34,7 +34,7 @@ Provider graalvmHome = providers.provider({ } as Callable) smokeTestApp { - application { + gradleApp { taskName = 'springNativeBuild' nestedTasks = ['nativeCompile'] artifactPath = 'native/nativeCompile/native-3.0-smoketest' diff --git a/dd-smoke-tests/spring-boot-3.0-webflux/build.gradle b/dd-smoke-tests/spring-boot-3.0-webflux/build.gradle index 006f844ab11..2479e28ac89 100644 --- a/dd-smoke-tests/spring-boot-3.0-webflux/build.gradle +++ b/dd-smoke-tests/spring-boot-3.0-webflux/build.gradle @@ -11,7 +11,7 @@ testJvmConstraints { description = 'Spring Boot 3.0 Webflux Smoke Tests.' smokeTestApp { - application { + gradleApp { taskName = 'webfluxBuild30' nestedTasks = ['bootJar'] artifactPath = 'libs/webflux-3.0-smoketest.jar' diff --git a/dd-smoke-tests/spring-boot-3.0-webmvc/build.gradle b/dd-smoke-tests/spring-boot-3.0-webmvc/build.gradle index f8ec1ce3975..07e850c365a 100644 --- a/dd-smoke-tests/spring-boot-3.0-webmvc/build.gradle +++ b/dd-smoke-tests/spring-boot-3.0-webmvc/build.gradle @@ -11,7 +11,7 @@ testJvmConstraints { description = 'Spring Boot 3.0 WebMvc Smoke Tests.' smokeTestApp { - application { + gradleApp { taskName = 'webmvcBuild30' nestedTasks = ['bootJar'] artifactPath = 'libs/webmvc-3.0-smoketest.jar' diff --git a/dd-smoke-tests/spring-boot-3.3-webmvc/build.gradle b/dd-smoke-tests/spring-boot-3.3-webmvc/build.gradle index dc252457801..188088ad129 100644 --- a/dd-smoke-tests/spring-boot-3.3-webmvc/build.gradle +++ b/dd-smoke-tests/spring-boot-3.3-webmvc/build.gradle @@ -11,7 +11,7 @@ testJvmConstraints { description = 'Spring Boot 3.3 WebMvc Smoke Tests.' smokeTestApp { - application { + gradleApp { taskName = 'webmvcBuild3' nestedTasks = ['bootJar'] artifactPath = 'libs/webmvc-3.3-smoketest.jar' diff --git a/dd-smoke-tests/springboot-freemarker/build.gradle b/dd-smoke-tests/springboot-freemarker/build.gradle index ca3fd1c8991..3094e88112b 100644 --- a/dd-smoke-tests/springboot-freemarker/build.gradle +++ b/dd-smoke-tests/springboot-freemarker/build.gradle @@ -8,7 +8,7 @@ apply from: "$rootDir/gradle/java.gradle" description = 'SpringBoot Freemarker Smoke Tests.' smokeTestApp { - application { + gradleApp { taskName = 'bootJar' artifactPath = 'libs/springboot-freemarker-smoketest.jar' sysProperty = 'datadog.smoketest.springboot.shadowJar.path' diff --git a/dd-smoke-tests/springboot-java-11/build.gradle b/dd-smoke-tests/springboot-java-11/build.gradle index 142199fc645..3d1d775edaa 100644 --- a/dd-smoke-tests/springboot-java-11/build.gradle +++ b/dd-smoke-tests/springboot-java-11/build.gradle @@ -12,7 +12,7 @@ testJvmConstraints { } smokeTestApp { - application { + gradleApp { taskName = 'bootJar' artifactPath = 'libs/springboot-java-11-smoketest.jar' sysProperty = 'datadog.smoketest.springboot.shadowJar.path' diff --git a/dd-smoke-tests/springboot-java-17/build.gradle b/dd-smoke-tests/springboot-java-17/build.gradle index c896ee5efee..ca3a160449d 100644 --- a/dd-smoke-tests/springboot-java-17/build.gradle +++ b/dd-smoke-tests/springboot-java-17/build.gradle @@ -12,7 +12,7 @@ testJvmConstraints { } smokeTestApp { - application { + gradleApp { taskName = 'bootJar' artifactPath = 'libs/springboot-java-17-smoketest.jar' sysProperty = 'datadog.smoketest.springboot.shadowJar.path' diff --git a/dd-smoke-tests/springboot-jetty-jsp/build.gradle b/dd-smoke-tests/springboot-jetty-jsp/build.gradle index 29abca9fab9..09dbde5de64 100644 --- a/dd-smoke-tests/springboot-jetty-jsp/build.gradle +++ b/dd-smoke-tests/springboot-jetty-jsp/build.gradle @@ -8,7 +8,7 @@ apply from: "$rootDir/gradle/java.gradle" description = 'SpringBoot Jetty JSP Smoke Tests.' smokeTestApp { - application { + gradleApp { taskName = 'bootWar' artifactPath = 'libs/springboot-jetty-jsp-smoketest.war' sysProperty = 'datadog.smoketest.springboot.war.path' diff --git a/dd-smoke-tests/springboot-jpa/build.gradle b/dd-smoke-tests/springboot-jpa/build.gradle index b70934ee101..130752d60fc 100644 --- a/dd-smoke-tests/springboot-jpa/build.gradle +++ b/dd-smoke-tests/springboot-jpa/build.gradle @@ -7,7 +7,7 @@ apply from: "$rootDir/gradle/java.gradle" description = 'SpringBoot JPA Smoke Tests.' smokeTestApp { - application { + gradleApp { taskName = 'bootWar' artifactPath = 'libs/springboot-jpa-smoketest.war' sysProperty = 'datadog.smoketest.springboot.bootWar.path' diff --git a/dd-smoke-tests/springboot-openliberty-20/build.gradle b/dd-smoke-tests/springboot-openliberty-20/build.gradle index 0215eb17761..a277ba1ec49 100644 --- a/dd-smoke-tests/springboot-openliberty-20/build.gradle +++ b/dd-smoke-tests/springboot-openliberty-20/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.smoke-test-app' +} + apply from: "$rootDir/gradle/java.gradle" description = 'SpringBoot Open Liberty 20-22 Smoke Tests' @@ -5,53 +9,30 @@ dependencies { testImplementation project(':dd-smoke-tests') } -def appDir = "$projectDir/application" def jarName = "demo-open-liberty-app.jar" -def jarPath = "$buildDir/application/target/${jarName}" -def isWindows = System.getProperty("os.name").toLowerCase().contains("win") -def mvnwCommand = isWindows ? 'mvnw.cmd' : 'mvnw' - -// Keep the Maven wrapper here until more Maven smoke-test applications need nested builds. -// The smoke-test-app plugin is Gradle-focused, and a Maven sibling task is not worth the -// extra API surface for only the two OpenLiberty applications. -// compile the Open liberty spring boot server -tasks.register('mvnStage', Exec) { - workingDir("$appDir") - environment += [ - "MAVEN_OPTS": "-Xmx512M", - "JAVA_HOME": getLazyJavaHomeFor(8) - ] - List mvnArgs = ["$rootDir/${mvnwCommand}", "-Dtarget.dir=${buildDir}/application/target", "package"] - - // Specify caches folder on CI. - if (providers.environmentVariable("CI").isPresent()) { - mvnArgs.add(1, "-Dmaven.repo.local=$rootDir/.mvn/caches") +smokeTestApp { + javaLauncher = javaToolchains.launcherFor { + languageVersion = JavaLanguageVersion.of(8) + } + mavenApp { + taskName = 'mvnStage' + artifactPath = "target/${jarName}" + sysProperty = 'datadog.smoketest.openliberty.jar.path' + mavenOpts = '-Xmx512M' } - - commandLine(mvnArgs) - - inputs.dir "$appDir/src" - inputs.file "$appDir/pom.xml" - outputs.file jarPath } tasks.named("compileTestGroovy", GroovyCompile) { dependsOn 'mvnStage' outputs.upToDateWhen { - !mvnStage.didWork + !tasks.named('mvnStage').get().didWork } } -// compiled dir of the packaged spring boot app with embedded openliberty -tasks.withType(Test).configureEach { - jvmArgs "-Ddatadog.smoketest.openliberty.jar.path=${jarPath}" -} - - spotless { java { - target fileTree("$appDir") { + target fileTree("$projectDir/application") { include "**/*.java" } } diff --git a/dd-smoke-tests/springboot-openliberty-23/build.gradle b/dd-smoke-tests/springboot-openliberty-23/build.gradle index 43c7f8a193a..73e290faf2e 100644 --- a/dd-smoke-tests/springboot-openliberty-23/build.gradle +++ b/dd-smoke-tests/springboot-openliberty-23/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.smoke-test-app' +} + apply from: "$rootDir/gradle/java.gradle" description = 'SpringBoot Open Liberty Smoke Tests' @@ -5,53 +9,30 @@ dependencies { testImplementation project(':dd-smoke-tests') } -def appDir = "$projectDir/application" def jarName = "demo-open-liberty-app.jar" -def jarPath = "$buildDir/application/target/${jarName}" -def isWindows = System.getProperty("os.name").toLowerCase().contains("win") -def mvnwCommand = isWindows ? 'mvnw.cmd' : 'mvnw' - -// Keep the Maven wrapper here until more Maven smoke-test applications need nested builds. -// The smoke-test-app plugin is Gradle-focused, and a Maven sibling task is not worth the -// extra API surface for only the two OpenLiberty applications. -// compile the Open liberty spring boot server -tasks.register('mvnStage', Exec) { - workingDir("$appDir") - environment += [ - "MAVEN_OPTS": "-Xmx512M", - "JAVA_HOME": getLazyJavaHomeFor(8) - ] - List mvnArgs = ["$rootDir/${mvnwCommand}", "-Dtarget.dir=${buildDir}/application/target", "package"] - - // Specify caches folder on CI. - if (providers.environmentVariable("CI").isPresent()) { - mvnArgs.add(1, "-Dmaven.repo.local=$rootDir/.mvn/caches") +smokeTestApp { + javaLauncher = javaToolchains.launcherFor { + languageVersion = JavaLanguageVersion.of(8) + } + mavenApp { + taskName = 'mvnStage' + artifactPath = "target/${jarName}" + sysProperty = 'datadog.smoketest.openliberty.jar.path' + mavenOpts = '-Xmx512M' } - - commandLine(mvnArgs) - - inputs.dir "$appDir/src" - inputs.file "$appDir/pom.xml" - outputs.file jarPath } tasks.named("compileTestGroovy", GroovyCompile) { dependsOn 'mvnStage' outputs.upToDateWhen { - !mvnStage.didWork + !tasks.named('mvnStage').get().didWork } } -// compiled dir of the packaged spring boot app with embedded openliberty -tasks.withType(Test).configureEach { - jvmArgs "-Ddatadog.smoketest.openliberty.jar.path=${jarPath}" -} - - spotless { java { - target fileTree("$appDir") { + target fileTree("$projectDir/application") { include "**/*.java" } } diff --git a/dd-smoke-tests/springboot-thymeleaf/build.gradle b/dd-smoke-tests/springboot-thymeleaf/build.gradle index 4cd0d533f81..a92caa4098b 100644 --- a/dd-smoke-tests/springboot-thymeleaf/build.gradle +++ b/dd-smoke-tests/springboot-thymeleaf/build.gradle @@ -8,7 +8,7 @@ apply from: "$rootDir/gradle/java.gradle" description = 'SpringBoot thymeleaf 3 Smoke Tests.' smokeTestApp { - application { + gradleApp { taskName = 'bootJar' artifactPath = 'libs/springboot-thymeleaf-smoketest.jar' sysProperty = 'datadog.smoketest.springboot.shadowJar.path' diff --git a/dd-smoke-tests/springboot-tomcat-jsp/build.gradle b/dd-smoke-tests/springboot-tomcat-jsp/build.gradle index 0cf65d39298..b82c8fcdda7 100644 --- a/dd-smoke-tests/springboot-tomcat-jsp/build.gradle +++ b/dd-smoke-tests/springboot-tomcat-jsp/build.gradle @@ -8,7 +8,7 @@ apply from: "$rootDir/gradle/java.gradle" description = 'SpringBoot Tomcat JSP Smoke Tests.' smokeTestApp { - application { + gradleApp { taskName = 'bootWar' artifactPath = 'libs/springboot-tomcat-jsp-smoketest.war' sysProperty = 'datadog.smoketest.springboot.war.path' diff --git a/dd-smoke-tests/springboot-tomcat/build.gradle b/dd-smoke-tests/springboot-tomcat/build.gradle index d7029149a9d..5c506614081 100644 --- a/dd-smoke-tests/springboot-tomcat/build.gradle +++ b/dd-smoke-tests/springboot-tomcat/build.gradle @@ -35,7 +35,7 @@ configurations { } smokeTestApp { - application { + gradleApp { taskName = 'bootWar' artifactPath = 'libs/springboot-tomcat-smoketest.war' sysProperty = 'datadog.smoketest.springboot.war.path' diff --git a/dd-smoke-tests/springboot-velocity/build.gradle b/dd-smoke-tests/springboot-velocity/build.gradle index 79f63efeb90..7e18918b074 100644 --- a/dd-smoke-tests/springboot-velocity/build.gradle +++ b/dd-smoke-tests/springboot-velocity/build.gradle @@ -8,7 +8,7 @@ apply from: "$rootDir/gradle/java.gradle" description = 'SpringBoot Velocity Smoke Tests.' smokeTestApp { - application { + gradleApp { taskName = 'bootJar' artifactPath = 'libs/springboot-velocity-smoketest.jar' sysProperty = 'datadog.smoketest.springboot.shadowJar.path' diff --git a/dd-smoke-tests/vertx-3.4/build.gradle b/dd-smoke-tests/vertx-3.4/build.gradle index 77ae03e703d..3f268d856b6 100644 --- a/dd-smoke-tests/vertx-3.4/build.gradle +++ b/dd-smoke-tests/vertx-3.4/build.gradle @@ -9,7 +9,7 @@ apply from: "$rootDir/gradle/java.gradle" description = 'Vert.x 3.4 Smoke Tests.' smokeTestApp { - application { + gradleApp { taskName = 'vertxBuild' nestedTasks = ['assemble'] artifactPath = 'libs/vertx-3.4-1.0.0-SNAPSHOT-fat.jar' diff --git a/dd-smoke-tests/vertx-3.9-resteasy/build.gradle b/dd-smoke-tests/vertx-3.9-resteasy/build.gradle index 4bb83945540..b99c1f8ac74 100644 --- a/dd-smoke-tests/vertx-3.9-resteasy/build.gradle +++ b/dd-smoke-tests/vertx-3.9-resteasy/build.gradle @@ -8,7 +8,7 @@ apply from: "$rootDir/gradle/java.gradle" description = 'Vert.x 3.9 RestEasy Smoke Tests.' smokeTestApp { - application { + gradleApp { taskName = 'vertxBuild' nestedTasks = ['assemble'] artifactPath = 'libs/vertx-3.9-resteasy-1.0.0-SNAPSHOT-fat.jar' diff --git a/dd-smoke-tests/vertx-3.9/build.gradle b/dd-smoke-tests/vertx-3.9/build.gradle index 59255a35080..0747b1f6c35 100644 --- a/dd-smoke-tests/vertx-3.9/build.gradle +++ b/dd-smoke-tests/vertx-3.9/build.gradle @@ -8,7 +8,7 @@ apply from: "$rootDir/gradle/java.gradle" description = 'Vert.x 3.9 Smoke Tests.' smokeTestApp { - application { + gradleApp { taskName = 'vertxBuild' nestedTasks = ['assemble'] artifactPath = 'libs/vertx-3.9-1.0.0-SNAPSHOT-fat.jar' diff --git a/dd-smoke-tests/vertx-4.2/build.gradle b/dd-smoke-tests/vertx-4.2/build.gradle index 54465508016..57cba56c827 100644 --- a/dd-smoke-tests/vertx-4.2/build.gradle +++ b/dd-smoke-tests/vertx-4.2/build.gradle @@ -8,7 +8,7 @@ apply from: "$rootDir/gradle/java.gradle" description = 'Vert.x 4.2 Smoke Tests.' smokeTestApp { - application { + gradleApp { taskName = 'vertxBuild' nestedTasks = ['assemble'] artifactPath = 'libs/vertx-4.2-1.0.0-SNAPSHOT-fat.jar' From 31472e8c0dcc99e7777ea6bccf1bd6e673a1d141 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Tue, 23 Jun 2026 10:31:33 -0400 Subject: [PATCH 026/139] Restrict release trust policy to git tag versions (#11630) Restrict release tags Merge branch 'master' into sarahchen6/restrict-tag Fix quotes Co-authored-by: sarah.chen --- .github/chainguard/self.gitlab.release.sts.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/chainguard/self.gitlab.release.sts.yaml b/.github/chainguard/self.gitlab.release.sts.yaml index 74ee1b28899..fcf34ec47aa 100644 --- a/.github/chainguard/self.gitlab.release.sts.yaml +++ b/.github/chainguard/self.gitlab.release.sts.yaml @@ -1,11 +1,11 @@ issuer: https://gitlab.ddbuild.io -subject_pattern: "project_path:DataDog/apm-reliability/dd-trace-java:ref_type:tag:ref:v.*" +subject_pattern: 'project_path:DataDog/apm-reliability/dd-trace-java:ref_type:tag:ref:v\d+\.\d+\.\d+' claim_pattern: project_path: "DataDog/apm-reliability/dd-trace-java" ref_type: "tag" - ref: "v.*" + ref: 'v\d+\.\d+\.\d+' permissions: contents: "write" From b95abbab840e41940599956faae8f9a93a509a66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20=C3=81lvarez=20=C3=81lvarez?= Date: Tue, 23 Jun 2026 16:32:08 +0200 Subject: [PATCH 027/139] perf: improve performance of regexps in IAST and query obfuscator (#11649) perf: improve performance of regexps in IAST and query obfuscator Migrate the IAST evidence-redaction regexps to RE2/J for linear-time matching. RE2/J has no back-references, so the SQL tokenizer is reworked to find Postgres dollar-quoted literals via a precomputed tag index (binary search) and to enumerate Oracle q'...' delimiters explicitly instead of relying on a back-reference. Configured redaction patterns that are valid under java.util.regex but unsupported by RE2/J fall back to the defaults instead of failing to compile. Replace the query obfuscator's `while (matcher.find())` + per-match `Strings.replace` loop (O(N*Q)) with a single appendReplacement / appendTail pass (O(Q)). Add JUnit 5 tests for the tokenizers and the obfuscator, a tokenizer JMH benchmark, and migrate SensitiveHandlerTest from Groovy to JUnit 5. Co-Authored-By: Claude Opus 4.8 (1M context) Co-authored-by: devflow.devflow-routing-intake --- dd-java-agent/agent-iast/build.gradle | 1 + .../SensitiveTokenizerBenchmark.java | 231 ++++++++++++++++++ .../iast/model/json/EvidenceAdapter.java | 16 +- .../sensitive/AbstractRegexTokenizer.java | 4 +- .../sensitive/CommandRegexpTokenizer.java | 2 +- .../iast/sensitive/HeaderRegexpTokenizer.java | 2 +- .../iast/sensitive/LdapRegexTokenizer.java | 4 +- .../iast/sensitive/SensitiveHandlerImpl.java | 44 +++- .../iast/sensitive/SqlRegexpTokenizer.java | 210 +++++++++++++--- .../iast/sensitive/UrlRegexpTokenizer.java | 6 +- .../sensitive/SensitiveHandlerTest.groovy | 34 --- .../iast/model/json/EvidenceAdapterTest.java | 62 +++++ .../sensitive/CommandRegexpTokenizerTest.java | 44 ++++ .../sensitive/HeaderRegexpTokenizerTest.java | 58 +++++ .../sensitive/LdapRegexTokenizerTest.java | 45 ++++ .../iast/sensitive/SensitiveHandlerTest.java | 52 ++++ .../sensitive/SqlRegexpTokenizerTest.java | 160 ++++++++++++ .../sensitive/UrlRegexpTokenizerTest.java | 44 ++++ .../datadog/trace/api/ConfigDefaults.java | 4 +- dd-trace-core/build.gradle | 3 +- .../core/tagprocessor/QueryObfuscator.java | 20 +- gradle/dependencies.gradle | 6 +- gradle/libs.versions.toml | 2 + 23 files changed, 949 insertions(+), 105 deletions(-) create mode 100644 dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/sensitive/SensitiveTokenizerBenchmark.java delete mode 100644 dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sensitive/SensitiveHandlerTest.groovy create mode 100644 dd-java-agent/agent-iast/src/test/java/com/datadog/iast/model/json/EvidenceAdapterTest.java create mode 100644 dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sensitive/CommandRegexpTokenizerTest.java create mode 100644 dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sensitive/HeaderRegexpTokenizerTest.java create mode 100644 dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sensitive/LdapRegexTokenizerTest.java create mode 100644 dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sensitive/SensitiveHandlerTest.java create mode 100644 dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sensitive/SqlRegexpTokenizerTest.java create mode 100644 dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sensitive/UrlRegexpTokenizerTest.java diff --git a/dd-java-agent/agent-iast/build.gradle b/dd-java-agent/agent-iast/build.gradle index 55d0fbbe9e8..2433fd496b0 100644 --- a/dd-java-agent/agent-iast/build.gradle +++ b/dd-java-agent/agent-iast/build.gradle @@ -45,6 +45,7 @@ dependencies { implementation libs.moshi implementation libs.bundles.asm implementation libs.instrument.java + implementation libs.re2j testImplementation project(':utils:test-utils') testImplementation project(':dd-java-agent:agent-bootstrap') diff --git a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/sensitive/SensitiveTokenizerBenchmark.java b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/sensitive/SensitiveTokenizerBenchmark.java new file mode 100644 index 00000000000..c3d86674e09 --- /dev/null +++ b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/sensitive/SensitiveTokenizerBenchmark.java @@ -0,0 +1,231 @@ +package com.datadog.iast.sensitive; + +import static datadog.trace.api.iast.sink.SqlInjectionModule.DATABASE_PARAMETER; +import static java.util.concurrent.TimeUnit.MICROSECONDS; +import static java.util.concurrent.TimeUnit.MILLISECONDS; + +import com.datadog.iast.model.Evidence; +import com.datadog.iast.sensitive.SensitiveHandler.Tokenizer; +import java.util.Arrays; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.BenchmarkMode; +import org.openjdk.jmh.annotations.Fork; +import org.openjdk.jmh.annotations.Level; +import org.openjdk.jmh.annotations.Measurement; +import org.openjdk.jmh.annotations.Mode; +import org.openjdk.jmh.annotations.OutputTimeUnit; +import org.openjdk.jmh.annotations.Param; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.Warmup; + +/** Tracks the cost of the IAST evidence-redaction "sensitive analyzer" tokenizers. */ +@Warmup(iterations = 2, time = 250, timeUnit = MILLISECONDS) +@Measurement(iterations = 3, time = 250, timeUnit = MILLISECONDS) +@Fork(1) +@OutputTimeUnit(MICROSECONDS) +@BenchmarkMode(Mode.AverageTime) +@State(Scope.Benchmark) +public class SensitiveTokenizerBenchmark { + + /** Each scenario pairs a malformed payload shape with the tokenizer that processes it. */ + public enum Scenario { + /** LDAP filter opened, never closed, packed with operators — quadratic: {@code "(" + "="*n}. */ + LDAP_UNCLOSED_FILTER { + @Override + String payload(final int n) { + return "(" + repeat('=', n - 1); + } + + @Override + Tokenizer tokenizer(final String payload) { + return new LdapRegexTokenizer(new Evidence(payload)); + } + }, + /** Repeated open-group + operator — CUBIC, the worst found: {@code "(="*n}. */ + LDAP_NESTED_OPEN_EQ { + @Override + String payload(final int n) { + return repeatUnit("(=", n); + } + + @Override + Tokenizer tokenizer(final String payload) { + return new LdapRegexTokenizer(new Evidence(payload)); + } + }, + /** ANSI SQL string literal opened but never closed — stack overflow: {@code "'" + "a"*n}. */ + SQL_ANSI_UNTERMINATED_STRING { + @Override + String payload(final int n) { + return "'" + repeat('a', n - 1); + } + + @Override + Tokenizer tokenizer(final String payload) { + return sql(payload, null); + } + }, + /** Oracle {@code q' ...} escaped literal with no matching close — stack overflow. */ + SQL_ORACLE_ESCAPED_LITERAL { + @Override + String payload(final int n) { + return "q'~" + repeat('a', n - 3); + } + + @Override + Tokenizer tokenizer(final String payload) { + return sql(payload, "oracle"); + } + }, + /** MySQL double-quoted string literal opened but never closed — stack overflow. */ + SQL_MYSQL_UNTERMINATED_STRING { + @Override + String payload(final int n) { + return "\"" + repeat('a', n - 1); + } + + @Override + Tokenizer tokenizer(final String payload) { + return sql(payload, "mysql"); + } + }, + /** URL query separator + long key, no {@code =} value — linear baseline. */ + URL_QUERY { + @Override + String payload(final int n) { + return "http://h/p?" + repeat('a', n - 11); + } + + @Override + Tokenizer tokenizer(final String payload) { + return new UrlRegexpTokenizer(new Evidence(payload)); + } + }, + /** Run of {@code ?} (also matched by {@code [^=&;]}) — quadratic: {@code "?"*n}. */ + URL_QUESTION_RUN { + @Override + String payload(final int n) { + return repeat('?', n); + } + + @Override + Tokenizer tokenizer(final String payload) { + return new UrlRegexpTokenizer(new Evidence(payload)); + } + }, + /** URL authority started with {@code //}, no {@code @} terminator — linear baseline. */ + URL_AUTHORITY { + @Override + String payload(final int n) { + return "//" + repeat('a', n - 2); + } + + @Override + Tokenizer tokenizer(final String payload) { + return new UrlRegexpTokenizer(new Evidence(payload)); + } + }, + /** Single command + long argument — linear baseline. */ + COMMAND_SINGLE_TOKEN { + @Override + String payload(final int n) { + return "cmd " + repeat('a', n - 4); + } + + @Override + Tokenizer tokenizer(final String payload) { + return new CommandRegexpTokenizer(new Evidence(payload)); + } + }, + /** + * Blank lines exploit MULTILINE {@code ^} + {@code \s*} backtracking — quadratic: {@code + * "\n"*n}. + */ + COMMAND_BLANK_LINES { + @Override + String payload(final int n) { + return repeat('\n', n); + } + + @Override + Tokenizer tokenizer(final String payload) { + return new CommandRegexpTokenizer(new Evidence(payload)); + } + }; + + abstract String payload(int sizeBytes); + + abstract Tokenizer tokenizer(String payload); + + static Tokenizer sql(final String payload, final String dialect) { + final Evidence evidence = new Evidence(payload); + if (dialect != null) { + evidence.getContext().put(DATABASE_PARAMETER, dialect); + } + return new SqlRegexpTokenizer(evidence); + } + + static String repeat(final char c, final int count) { + final int n = Math.max(count, 0); + final char[] chars = new char[n]; + Arrays.fill(chars, c); + return new String(chars); + } + + static String repeatUnit(final String unit, final int totalLen) { + final int n = Math.max(totalLen, 0); + final StringBuilder sb = new StringBuilder(n); + while (sb.length() < n) { + sb.append(unit); + } + sb.setLength(n); + return sb.toString(); + } + } + + @Param({ + "LDAP_UNCLOSED_FILTER", + "LDAP_NESTED_OPEN_EQ", + "SQL_ANSI_UNTERMINATED_STRING", + "SQL_ORACLE_ESCAPED_LITERAL", + "SQL_MYSQL_UNTERMINATED_STRING", + "URL_QUERY", + "URL_QUESTION_RUN", + "URL_AUTHORITY", + "COMMAND_SINGLE_TOKEN", + "COMMAND_BLANK_LINES" + }) + Scenario scenario; + + @Param({"512", "1024", "2048"}) + int sizeBytes; + + private String payload; + + @Setup(Level.Trial) + public void setup() { + payload = scenario.payload(sizeBytes); + } + + /** + * Builds the tokenizer and fully drains it, exactly as evidence redaction does. Returns the + * number of tokens (consumed by JMH). A pathological pattern may overflow the stack; we catch it + * so the run stays stable and report {@code -1} — see the class javadoc. + */ + @Benchmark + public long tokenize() { + try { + final Tokenizer tokenizer = scenario.tokenizer(payload); + long count = 0; + while (tokenizer.next()) { + tokenizer.current(); + count++; + } + return count; + } catch (final Throwable pathological) { + return -1; + } + } +} diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/EvidenceAdapter.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/EvidenceAdapter.java index 9aa13db2e56..666d5c7c0c8 100644 --- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/EvidenceAdapter.java +++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/model/json/EvidenceAdapter.java @@ -446,9 +446,12 @@ public void write(final Context ctx, final JsonWriter writer) throws IOException private List split(final RedactionContext redaction) { final List parts = new ArrayList<>(); + // Identical sensitive chunks redact to the same pattern (the first occurrence in the source), + // so cache chunk -> offset to avoid an O(sourceLength) indexOf per repeated occurrence. + final Map matchingOffsets = new HashMap<>(); if (redaction.isSensitive()) { // redact the full tainted value as the source is sensitive (password, certificate, ...) - addValuePart(0, value.length(), redaction, true, parts); + addValuePart(0, value.length(), redaction, matchingOffsets, true, parts); } else { // redact only sensitive parts int index = 0; @@ -456,13 +459,13 @@ private List split(final RedactionContext redaction) { final int start = sensitive.getStart(); final int end = sensitive.getStart() + sensitive.getLength(); // append previous tainted chunk (if any) - addValuePart(index, start, redaction, false, parts); + addValuePart(index, start, redaction, matchingOffsets, false, parts); // append current sensitive tainted chunk - addValuePart(start, end, redaction, true, parts); + addValuePart(start, end, redaction, matchingOffsets, true, parts); index = end; } // append last tainted chunk (if any) - addValuePart(index, value.length(), redaction, false, parts); + addValuePart(index, value.length(), redaction, matchingOffsets, false, parts); } return parts; } @@ -471,6 +474,7 @@ private void addValuePart( final int start, final int end, final RedactionContext ctx, + final Map matchingOffsets, final boolean redact, final List valueParts) { if (start < end) { @@ -484,7 +488,9 @@ private void addValuePart( final int length = chunk.length(); final String sourceValue = source.getValue(); final String redactedValue = ctx.getRedactedValue(); - final int matching = (sourceValue == null) ? -1 : sourceValue.indexOf(chunk); + final int matching = + matchingOffsets.computeIfAbsent( + chunk, c -> sourceValue == null ? -1 : sourceValue.indexOf(c)); final String pattern; if (matching >= 0 && redactedValue != null) { // if matches append the matching part from the redacted value diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/AbstractRegexTokenizer.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/AbstractRegexTokenizer.java index 54c73669be3..f43f00df26f 100644 --- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/AbstractRegexTokenizer.java +++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/AbstractRegexTokenizer.java @@ -1,9 +1,9 @@ package com.datadog.iast.sensitive; import com.datadog.iast.util.Ranged; +import com.google.re2j.Matcher; +import com.google.re2j.Pattern; import java.util.NoSuchElementException; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import javax.annotation.Nullable; public abstract class AbstractRegexTokenizer implements SensitiveHandler.Tokenizer { diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/CommandRegexpTokenizer.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/CommandRegexpTokenizer.java index 970239e0207..b9108d103e8 100644 --- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/CommandRegexpTokenizer.java +++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/CommandRegexpTokenizer.java @@ -2,7 +2,7 @@ import com.datadog.iast.model.Evidence; import com.datadog.iast.util.Ranged; -import java.util.regex.Pattern; +import com.google.re2j.Pattern; public class CommandRegexpTokenizer extends AbstractRegexTokenizer { diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/HeaderRegexpTokenizer.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/HeaderRegexpTokenizer.java index dd2f1921365..ae3645879b3 100644 --- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/HeaderRegexpTokenizer.java +++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/HeaderRegexpTokenizer.java @@ -2,8 +2,8 @@ import com.datadog.iast.model.Evidence; import com.datadog.iast.util.Ranged; +import com.google.re2j.Pattern; import java.util.NoSuchElementException; -import java.util.regex.Pattern; import javax.annotation.Nullable; public class HeaderRegexpTokenizer implements SensitiveHandler.Tokenizer { diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/LdapRegexTokenizer.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/LdapRegexTokenizer.java index 72ec3e70d86..5e3f84adafa 100644 --- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/LdapRegexTokenizer.java +++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/LdapRegexTokenizer.java @@ -2,7 +2,7 @@ import com.datadog.iast.model.Evidence; import com.datadog.iast.util.Ranged; -import java.util.regex.Pattern; +import com.google.re2j.Pattern; /** * @see Lightweight Directory Access Protocol @@ -14,7 +14,7 @@ public class LdapRegexTokenizer extends AbstractRegexTokenizer { private static final Pattern LDAP_PATTERN = Pattern.compile( - String.format("\\(.*?(?:~=|=|<=|>=)(?<%s>[^)]+)\\)", LITERAL_GROUP), Pattern.MULTILINE); + String.format("\\(.*?(?:~=|=|<=|>=)(?P<%s>[^)]+)\\)", LITERAL_GROUP), Pattern.MULTILINE); public LdapRegexTokenizer(final Evidence evidence) { super(LDAP_PATTERN, evidence.getValue()); diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/SensitiveHandlerImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/SensitiveHandlerImpl.java index c0a500e9de6..3aaaa67a775 100644 --- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/SensitiveHandlerImpl.java +++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/SensitiveHandlerImpl.java @@ -3,21 +3,28 @@ import static com.datadog.iast.util.CharUtils.fillCharArray; import static com.datadog.iast.util.CharUtils.newCharArray; import static com.datadog.iast.util.CharUtils.newString; -import static java.util.regex.Pattern.CASE_INSENSITIVE; -import static java.util.regex.Pattern.MULTILINE; +import static com.google.re2j.Pattern.CASE_INSENSITIVE; +import static com.google.re2j.Pattern.MULTILINE; +import static datadog.trace.api.ConfigDefaults.DEFAULT_IAST_REDACTION_NAME_PATTERN; +import static datadog.trace.api.ConfigDefaults.DEFAULT_IAST_REDACTION_VALUE_PATTERN; import com.datadog.iast.model.Evidence; import com.datadog.iast.model.Source; import com.datadog.iast.model.VulnerabilityType; +import com.google.re2j.Pattern; +import com.google.re2j.PatternSyntaxException; import datadog.trace.api.Config; import java.util.HashMap; import java.util.Map; -import java.util.regex.Pattern; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class SensitiveHandlerImpl implements SensitiveHandler { + private static final Logger LOG = LoggerFactory.getLogger(SensitiveHandlerImpl.class); + static final SensitiveHandler INSTANCE = new SensitiveHandlerImpl(); private static final char[] REDACTED_SENSITIVE_BUFFER = newCharArray(16, '*'); @@ -35,10 +42,17 @@ public class SensitiveHandlerImpl implements SensitiveHandler { private final Map tokenizers; public SensitiveHandlerImpl() { - final Config config = Config.get(); - namePattern = Pattern.compile(config.getIastRedactionNamePattern(), CASE_INSENSITIVE); + this(Config.get().getIastRedactionNamePattern(), Config.get().getIastRedactionValuePattern()); + } + + SensitiveHandlerImpl(final String configuredNamePattern, final String configuredValuePattern) { + namePattern = + safeCompile(configuredNamePattern, DEFAULT_IAST_REDACTION_NAME_PATTERN, CASE_INSENSITIVE); valuePattern = - Pattern.compile(config.getIastRedactionValuePattern(), CASE_INSENSITIVE | MULTILINE); + safeCompile( + configuredValuePattern, + DEFAULT_IAST_REDACTION_VALUE_PATTERN, + CASE_INSENSITIVE | MULTILINE); tokenizers = new HashMap<>(); tokenizers.put(VulnerabilityType.SQL_INJECTION, SqlRegexpTokenizer::new); tokenizers.put(VulnerabilityType.LDAP_INJECTION, LdapRegexTokenizer::new); @@ -75,8 +89,8 @@ public String redactString(final String value) { @Override public Tokenizer tokenizeEvidence( @Nonnull final VulnerabilityType type, @Nonnull final Evidence evidence) { - final TokenizerSupplier supplier = tokenizers.computeIfAbsent(type, t -> emptyTokenizer()); - return supplier.tokenizerFor(evidence); + final TokenizerSupplier supplier = tokenizers.get(type); + return supplier == null ? Tokenizer.EMPTY : supplier.tokenizerFor(evidence); } private int computeLength(@Nullable final String value) { @@ -93,8 +107,18 @@ private int computeLength(@Nullable final String value) { return size; } - private TokenizerSupplier emptyTokenizer() { - return evidence -> Tokenizer.EMPTY; + private static Pattern safeCompile( + final String configured, final String fallback, final int flags) { + try { + return Pattern.compile(configured, flags); + } catch (final PatternSyntaxException e) { + LOG.error( + "Could not compile IAST redaction pattern with RE2J, falling back to the default: {} (configured: {})", + fallback, + configured, + e); + return Pattern.compile(fallback, flags); + } } private interface TokenizerSupplier { diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/SqlRegexpTokenizer.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/SqlRegexpTokenizer.java index 6c87aaf7a87..a52eedb402a 100644 --- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/SqlRegexpTokenizer.java +++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/SqlRegexpTokenizer.java @@ -4,23 +4,25 @@ import com.datadog.iast.model.Evidence; import com.datadog.iast.util.Ranged; +import com.google.re2j.Matcher; +import com.google.re2j.Pattern; import java.util.*; +import java.util.concurrent.ConcurrentHashMap; import java.util.function.Predicate; import java.util.function.Supplier; -import java.util.regex.Pattern; +import javax.annotation.Nullable; -public class SqlRegexpTokenizer extends AbstractRegexTokenizer { +public class SqlRegexpTokenizer implements SensitiveHandler.Tokenizer { private static final String STRING_LITERAL = "'(?:''|[^'])*'"; - private static final String ORACLE_ESCAPED_LITERAL = - "q'<.*?>'|q'\\(.*?\\)'|q'\\{.*?\\}'|q'\\[.*?\\]'|q'(?.).*?\\k'"; - private static final String POSTGRESQL_ESCAPED_LITERAL = - "\\$(?[^$]*?)\\$.*?\\$\\k\\$"; + private static final String ORACLE_ESCAPED_LITERAL = buildOracleEscapedLiteral(); + // $$ or $tag$ where tag is a SQL identifier + private static final String POSTGRESQL_ESCAPED_LITERAL = "\\$(?:[a-zA-Z_]\\w*)?\\$"; private static final String MYSQL_STRING_LITERAL = "\"(?:\\\"|[^\"])*\"|'(?:\\'|[^'])*'"; private static final String LINE_COMMENT = "--.*$"; private static final String BLOCK_COMMENT = "/\\*[\\s\\S]*\\*/"; private static final String EXPONENT = "(?:E[-+]?\\d+[fd]?)?"; - private static final String INTEGER_NUMBER = "(? PATTERNS = new EnumMap<>(Dialect.class); + private static final Map PATTERNS = new ConcurrentHashMap<>(); private final String sql; + private final Matcher matcher; + private int searchFrom; + @Nullable private Ranged current; + // Lazily built (Postgres only): every "$tag$" occurrence indexed by tag, so the matching close + // can be located with a binary search instead of an O(n) scan per opener. + @Nullable private Map dollarTagPositions; public SqlRegexpTokenizer(final Evidence evidence) { - super( - PATTERNS.computeIfAbsent(Dialect.fromEvidence(evidence), Dialect::buildPattern), - evidence.getValue()); this.sql = evidence.getValue(); + this.matcher = + PATTERNS + .computeIfAbsent(Dialect.fromEvidence(evidence), Dialect::buildPattern) + .matcher(sql); } @Override - protected Ranged buildNext() { - int start = matcher.start(); - int end = matcher.end(); - final char startChar = sql.charAt(start); - if (startChar == '\'' || startChar == '"') { - start++; - end--; - } else if (end > start + 1) { - final char nextChar = sql.charAt(start + 1); - if (startChar == '/' && nextChar == '*') { - start += 2; - end -= 2; - } else if (startChar == '-' && startChar == nextChar) { - start += 2; - } else if (Character.toLowerCase(startChar) == 'q' && nextChar == '\'') { - start += 3; - end -= 2; - } else if (startChar == '$') { - final String match = matcher.group(); - final int size = match.indexOf('$', 1) + 1; - if (size > 1) { - start += size; - end -= size; + public boolean next() { + while (matcher.find(searchFrom)) { + final int start = matcher.start(); + int end = matcher.end(); + int rangeStart = start; + int rangeEnd = end; + final char startChar = sql.charAt(start); + if (startChar == '$') { + // Postgres dollar-quoting: the regex matched the opening "$tag$"; find the matching close. + final String tag = sql.substring(start, end); + final int close = nextDollarTag(tag, end); + if (close < 0) { + // No matching close tag: not a dollar-quoted literal. Skip past the whole opener we + // already matched (not just one char) so find() does not re-scan it. + searchFrom = end; + continue; } + end = close + tag.length(); + rangeStart = start + tag.length(); + rangeEnd = close; + } else if (startChar == '\'' || startChar == '"') { + rangeStart++; + rangeEnd--; + } else if (end > start + 1) { + final char nextChar = sql.charAt(start + 1); + if (startChar == '/' && nextChar == '*') { + rangeStart += 2; + rangeEnd -= 2; + } else if (startChar == '-' && startChar == nextChar) { + rangeStart += 2; + } else if (Character.toLowerCase(startChar) == 'q' && nextChar == '\'') { + rangeStart += 3; + rangeEnd -= 2; + } + } + searchFrom = end; + current = Ranged.build(rangeStart, rangeEnd - rangeStart); + return true; + } + current = null; + return false; + } + + @Override + public Ranged current() { + if (current == null) { + throw new NoSuchElementException(); + } + return current; + } + + /** + * Returns the start offset of the first {@code "$tag$"} occurrence at or after {@code from}, or + * {@code -1} if there is none. Equivalent to {@code sql.indexOf(tag, from)} for dollar-quote tags + * but backed by a precomputed index so the whole tokenization stays near-linear instead of + * scanning to end-of-string once per opener. + */ + private int nextDollarTag(final String tag, final int from) { + final int[] positions = dollarTagPositions().get(tag); + if (positions == null) { + return -1; + } + // first position >= from + int lo = 0; + int hi = positions.length; + while (lo < hi) { + final int mid = (lo + hi) >>> 1; + if (positions[mid] < from) { + lo = mid + 1; + } else { + hi = mid; + } + } + return lo < positions.length ? positions[lo] : -1; + } + + private Map dollarTagPositions() { + if (dollarTagPositions == null) { + dollarTagPositions = buildDollarTagPositions(sql); + } + return dollarTagPositions; + } + + /** + * Single left-to-right pass collecting the start offset of every {@code "$tag$"} token (empty tag + * or a SQL identifier), keyed by the token text. Each character is visited once: the optional + * identifier run after a {@code '$'} contains no {@code '$'}, so runs from distinct openers never + * overlap, making the scan O(n). + */ + private static Map buildDollarTagPositions(final String sql) { + final Map> positions = new HashMap<>(); + final int length = sql.length(); + for (int i = 0; i < length; i++) { + if (sql.charAt(i) != '$') { + continue; + } + int end = i + 1; + if (end < length && isIdentifierStart(sql.charAt(end))) { + end++; + while (end < length && isIdentifierPart(sql.charAt(end))) { + end++; + } + } + if (end < length && sql.charAt(end) == '$') { + final String tag = sql.substring(i, end + 1); + positions.computeIfAbsent(tag, k -> new ArrayList<>()).add(i); + } + } + final Map result = new HashMap<>(positions.size() * 2); + for (final Map.Entry> entry : positions.entrySet()) { + final List list = entry.getValue(); + final int[] array = new int[list.size()]; + for (int i = 0; i < array.length; i++) { + array[i] = list.get(i); + } + result.put(entry.getKey(), array); + } + return result; + } + + private static boolean isIdentifierStart(final char c) { + return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || c == '_'; + } + + private static boolean isIdentifierPart(final char c) { + return isIdentifierStart(c) || (c >= '0' && c <= '9'); + } + + /** + * Builds the Oracle {@code q'…'} alternation: the four bracket-paired delimiters plus one branch + * per other printable single-character delimiter (RE2J has no back-reference to require the same + * closing char, so the finite delimiter alphabet is enumerated). + * + *

The enumeration is intentionally restricted to the printable ASCII range {@code 0x21..0x7e}. + * Oracle forbids whitespace (space, tab, carriage return) as a {@code q'} delimiter, so excluding + * those characters matches Oracle's own rules rather than dropping valid literals. Multi-byte + * (non-ASCII) delimiters, which Oracle does allow, are not enumerated; such literals fall back to + * being tokenized by the generic {@code STRING_LITERAL} branch. + */ + private static String buildOracleEscapedLiteral() { + final List alternatives = new ArrayList<>(); + alternatives.add("q'<.*?>'"); + alternatives.add("q'\\(.*?\\)'"); + alternatives.add("q'\\{.*?\\}'"); + alternatives.add("q'\\[.*?\\]'"); + for (char delim = 0x21; delim <= 0x7e; delim++) { + // brackets handled above; ' is ambiguous with the surrounding quotes. + if ("<>(){}[]'".indexOf(delim) >= 0) { + continue; } + final String escaped = escapeDelimiter(delim); + alternatives.add("q'" + escaped + ".*?" + escaped + "'"); } - return Ranged.build(start, end - start); + return String.join("|", alternatives); + } + + private static String escapeDelimiter(final char delim) { + return "\\.+*?^$|".indexOf(delim) >= 0 ? "\\" + delim : String.valueOf(delim); } private enum Dialect { diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/UrlRegexpTokenizer.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/UrlRegexpTokenizer.java index 30371a6d0b5..06e1001a637 100644 --- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/UrlRegexpTokenizer.java +++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/UrlRegexpTokenizer.java @@ -2,7 +2,7 @@ import com.datadog.iast.model.Evidence; import com.datadog.iast.util.Ranged; -import java.util.regex.Pattern; +import com.google.re2j.Pattern; /** * @see [^@]+)@", AUTHORITY_GROUP); + String.format("^(?:[^:]+:)?//(?P<%s>[^@]+)@", AUTHORITY_GROUP); private static final String QUERY_FRAGMENT = - String.format("[?#&]([^=&;]+)=(?<%s>[^?#&]+)", QUERY_FRAGMENT_GROUP); + String.format("[?#&]([^=&;]+)=(?P<%s>[^?#&]+)", QUERY_FRAGMENT_GROUP); private static final Pattern PATTERN = Pattern.compile(String.join("|", AUTHORITY, QUERY_FRAGMENT)); diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sensitive/SensitiveHandlerTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sensitive/SensitiveHandlerTest.groovy deleted file mode 100644 index 19dfdf1999e..00000000000 --- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sensitive/SensitiveHandlerTest.groovy +++ /dev/null @@ -1,34 +0,0 @@ -package com.datadog.iast.sensitive - -import datadog.trace.test.util.DDSpecification - -/** - * Most of the testing is done via {@link com.datadog.iast.model.json.EvidenceRedactionTest} - */ -class SensitiveHandlerTest extends DDSpecification { - - void 'test that empty tokenizer returns nothing'() { - given: - final tokenizer = SensitiveHandler.Tokenizer.EMPTY - - when: - final next = tokenizer.next() - - then: - !next - - when: - tokenizer.current() - - then: - thrown(NoSuchElementException) - } - - void 'test that current instance has a value'() { - when: - final current = SensitiveHandler.get() - - then: - current != null - } -} diff --git a/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/model/json/EvidenceAdapterTest.java b/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/model/json/EvidenceAdapterTest.java new file mode 100644 index 00000000000..a3189181c7f --- /dev/null +++ b/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/model/json/EvidenceAdapterTest.java @@ -0,0 +1,62 @@ +package com.datadog.iast.model.json; + +import static org.junit.jupiter.api.Assumptions.assumeTrue; + +import com.datadog.iast.model.Evidence; +import com.datadog.iast.model.Location; +import com.datadog.iast.model.Range; +import com.datadog.iast.model.Source; +import com.datadog.iast.model.Vulnerability; +import com.datadog.iast.model.VulnerabilityBatch; +import com.datadog.iast.model.VulnerabilityType; +import datadog.trace.api.Config; +import datadog.trace.api.iast.SourceTypes; +import datadog.trace.api.iast.VulnerabilityMarks; +import org.junit.jupiter.api.Test; +import org.skyscreamer.jsonassert.JSONAssert; +import org.skyscreamer.jsonassert.JSONCompareMode; + +class EvidenceAdapterTest { + + @Test + void repeatedSensitiveLiteralsRedactToTheSamePattern() throws Exception { + assumeTrue(Config.get().isIastRedactionEnabled(), "redaction must be enabled"); + + // The two 'abc' string literals are detected as sensitive ranges within the same tainted value. + // Both must map to the first occurrence of "abc" in the source (index 8 -> "ijk"), so they + // render with an identical pattern. This is the behavior preserved by the chunk -> offset + // memoization in EvidenceAdapter#addValuePart. + final String sql = "select 'abc' or 'abc'"; + final Source source = new Source(SourceTypes.REQUEST_PARAMETER_VALUE, "query", sql); + final Range range = new Range(0, sql.length(), source, VulnerabilityMarks.NOT_MARKED); + final Evidence evidence = new Evidence(sql, new Range[] {range}); + final Vulnerability vulnerability = + new Vulnerability( + VulnerabilityType.SQL_INJECTION, + Location.forClassAndMethodAndLine("Test", "test", 1), + evidence); + final VulnerabilityBatch batch = new VulnerabilityBatch(); + batch.add(vulnerability); + + final String json = VulnerabilityEncoding.toJson(batch); + + final String expected = + "{" + + " \"sources\": [" + + " { \"origin\": \"http.request.parameter\", \"name\": \"query\"," + + " \"redacted\": true, \"pattern\": \"abcdefghijklmnopqrstu\" }" + + " ]," + + " \"vulnerabilities\": [" + + " { \"type\": \"SQL_INJECTION\", \"evidence\": { \"valueParts\": [" + + " { \"source\": 0, \"value\": \"select '\" }," + + " { \"source\": 0, \"redacted\": true, \"pattern\": \"ijk\" }," + + " { \"source\": 0, \"value\": \"' or '\" }," + + " { \"source\": 0, \"redacted\": true, \"pattern\": \"ijk\" }," + + " { \"source\": 0, \"value\": \"'\" }" + + " ] } }" + + " ]" + + "}"; + + JSONAssert.assertEquals(expected, json, JSONCompareMode.LENIENT); + } +} diff --git a/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sensitive/CommandRegexpTokenizerTest.java b/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sensitive/CommandRegexpTokenizerTest.java new file mode 100644 index 00000000000..d43b3495713 --- /dev/null +++ b/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sensitive/CommandRegexpTokenizerTest.java @@ -0,0 +1,44 @@ +package com.datadog.iast.sensitive; + +import static java.util.Arrays.asList; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.params.provider.Arguments.arguments; + +import com.datadog.iast.model.Evidence; +import com.datadog.iast.sensitive.SensitiveHandler.Tokenizer; +import com.datadog.iast.util.Ranged; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Stream; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + +class CommandRegexpTokenizerTest { + + @ParameterizedTest(name = "{0}") + @MethodSource("redactsCommandArgumentsArguments") + void redactsCommandArguments( + final String description, final String command, final List expected) { + assertEquals(expected, tokenize(command)); + } + + static Stream redactsCommandArgumentsArguments() { + return Stream.of( + arguments("plain command keeps its arguments", "ls -la /tmp", asList("-la /tmp")), + arguments("sudo prefix is skipped", "sudo rm -rf /", asList("-rf /")), + arguments("doas prefix is skipped", "doas cat /etc/passwd", asList("/etc/passwd")), + arguments( + "everything after the binary is captured", "echo hello world", asList("hello world"))); + } + + private static List tokenize(String command) { + Tokenizer tokenizer = new CommandRegexpTokenizer(new Evidence(command)); + List tokens = new ArrayList<>(); + while (tokenizer.next()) { + Ranged range = tokenizer.current(); + tokens.add(command.substring(range.getStart(), range.getStart() + range.getLength())); + } + return tokens; + } +} diff --git a/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sensitive/HeaderRegexpTokenizerTest.java b/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sensitive/HeaderRegexpTokenizerTest.java new file mode 100644 index 00000000000..c24a2d4dd61 --- /dev/null +++ b/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sensitive/HeaderRegexpTokenizerTest.java @@ -0,0 +1,58 @@ +package com.datadog.iast.sensitive; + +import static com.google.re2j.Pattern.CASE_INSENSITIVE; +import static java.util.Collections.emptyList; +import static java.util.Collections.singletonList; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.params.provider.Arguments.arguments; + +import com.datadog.iast.model.Evidence; +import com.datadog.iast.sensitive.SensitiveHandler.Tokenizer; +import com.datadog.iast.util.Ranged; +import com.google.re2j.Pattern; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Stream; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + +class HeaderRegexpTokenizerTest { + + private static final Pattern NAME_PATTERN = + Pattern.compile("password|authorization", CASE_INSENSITIVE); + private static final Pattern VALUE_PATTERN = Pattern.compile("bearer\\s", CASE_INSENSITIVE); + + @ParameterizedTest(name = "{0}") + @MethodSource("redactsSensitiveHeadersArguments") + void redactsSensitiveHeaders( + final String description, final String header, final List expected) { + assertEquals(expected, tokenize(header)); + } + + static Stream redactsSensitiveHeadersArguments() { + return Stream.of( + arguments( + "sensitive name redacts the value", + "Authorization: Bearer xyz", + singletonList("Bearer xyz")), + arguments( + "sensitive value redacts the value", + "X-Auth: Bearer secret", + singletonList("Bearer secret")), + arguments("non-sensitive header is ignored", "Accept: text/html", emptyList()), + arguments("missing separator is ignored", "NoColonHeader", emptyList()), + arguments("missing value is ignored", "Empty:", emptyList())); + } + + private static List tokenize(String header) { + Tokenizer tokenizer = + new HeaderRegexpTokenizer(new Evidence(header), NAME_PATTERN, VALUE_PATTERN); + List tokens = new ArrayList<>(); + while (tokenizer.next()) { + Ranged range = tokenizer.current(); + tokens.add(header.substring(range.getStart(), range.getStart() + range.getLength())); + } + return tokens; + } +} diff --git a/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sensitive/LdapRegexTokenizerTest.java b/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sensitive/LdapRegexTokenizerTest.java new file mode 100644 index 00000000000..4060e00eca1 --- /dev/null +++ b/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sensitive/LdapRegexTokenizerTest.java @@ -0,0 +1,45 @@ +package com.datadog.iast.sensitive; + +import static java.util.Arrays.asList; +import static java.util.Collections.singletonList; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.params.provider.Arguments.arguments; + +import com.datadog.iast.model.Evidence; +import com.datadog.iast.sensitive.SensitiveHandler.Tokenizer; +import com.datadog.iast.util.Ranged; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Stream; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + +class LdapRegexTokenizerTest { + + @ParameterizedTest(name = "{0}") + @MethodSource("redactsFilterLiteralsArguments") + void redactsFilterLiterals( + final String description, final String filter, final List expected) { + assertEquals(expected, tokenize(filter)); + } + + static Stream redactsFilterLiteralsArguments() { + return Stream.of( + arguments("equality literal", "(cn=John Doe)", singletonList("John Doe")), + arguments("nested filter literals", "(&(uid=bob)(role=admin))", asList("bob", "admin")), + arguments("greater-or-equal operator", "(age>=21)", singletonList("21")), + arguments("less-or-equal operator", "(score<=100)", singletonList("100")), + arguments("approximate operator", "(attr~=approx)", singletonList("approx"))); + } + + private static List tokenize(String filter) { + Tokenizer tokenizer = new LdapRegexTokenizer(new Evidence(filter)); + List tokens = new ArrayList<>(); + while (tokenizer.next()) { + Ranged range = tokenizer.current(); + tokens.add(filter.substring(range.getStart(), range.getStart() + range.getLength())); + } + return tokens; + } +} diff --git a/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sensitive/SensitiveHandlerTest.java b/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sensitive/SensitiveHandlerTest.java new file mode 100644 index 00000000000..6f296eafb4e --- /dev/null +++ b/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sensitive/SensitiveHandlerTest.java @@ -0,0 +1,52 @@ +package com.datadog.iast.sensitive; + +import static datadog.trace.api.ConfigDefaults.DEFAULT_IAST_REDACTION_NAME_PATTERN; +import static datadog.trace.api.ConfigDefaults.DEFAULT_IAST_REDACTION_VALUE_PATTERN; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import com.datadog.iast.sensitive.SensitiveHandler.Tokenizer; +import java.util.NoSuchElementException; +import org.junit.jupiter.api.Test; + +/** Most of the testing is done via {@link com.datadog.iast.model.json.EvidenceRedactionTest}. */ +class SensitiveHandlerTest { + + // Valid under java.util.regex (named group + backreference) but rejected by RE2J, so + // SensitiveHandlerImpl must fall back to the default pattern instead of failing to compile. + private static final String RE2J_INCOMPATIBLE_PATTERN = "(?secret)\\k"; + + @Test + void emptyTokenizerReturnsNothing() { + final Tokenizer tokenizer = Tokenizer.EMPTY; + assertFalse(tokenizer.next()); + assertThrows(NoSuchElementException.class, tokenizer::current); + } + + @Test + void currentInstanceHasValue() { + assertNotNull(SensitiveHandler.get()); + } + + @Test + void incompatibleNamePatternFallsBackToDefault() { + final SensitiveHandlerImpl handler = + new SensitiveHandlerImpl(RE2J_INCOMPATIBLE_PATTERN, DEFAULT_IAST_REDACTION_VALUE_PATTERN); + + // the default name pattern is used instead of failing to compile + assertTrue(handler.isSensitiveName("password")); + assertFalse(handler.isSensitiveName("username")); + } + + @Test + void incompatibleValuePatternFallsBackToDefault() { + final SensitiveHandlerImpl handler = + new SensitiveHandlerImpl(DEFAULT_IAST_REDACTION_NAME_PATTERN, RE2J_INCOMPATIBLE_PATTERN); + + // the default value pattern is used instead of failing to compile + assertTrue(handler.isSensitiveValue("bearer abc123def456")); + assertFalse(handler.isSensitiveValue("not a secret value")); + } +} diff --git a/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sensitive/SqlRegexpTokenizerTest.java b/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sensitive/SqlRegexpTokenizerTest.java new file mode 100644 index 00000000000..4268b95539b --- /dev/null +++ b/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sensitive/SqlRegexpTokenizerTest.java @@ -0,0 +1,160 @@ +package com.datadog.iast.sensitive; + +import static datadog.trace.api.iast.sink.SqlInjectionModule.DATABASE_PARAMETER; +import static java.util.Arrays.asList; +import static java.util.Collections.emptyList; +import static java.util.Collections.singletonList; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively; +import static org.junit.jupiter.params.provider.Arguments.arguments; + +import com.datadog.iast.model.Evidence; +import com.datadog.iast.sensitive.SensitiveHandler.Tokenizer; +import com.datadog.iast.util.Ranged; +import java.time.Duration; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Stream; +import javax.annotation.Nullable; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + +class SqlRegexpTokenizerTest { + + @ParameterizedTest(name = "{0}") + @MethodSource("tokenizesSqlLiteralsArguments") + void tokenizesSqlLiterals( + final String description, + @Nullable final String dialect, + final String sql, + final List expected) { + assertEquals(expected, tokenize(dialect, sql)); + } + + static Stream tokenizesSqlLiteralsArguments() { + return Stream.of( + // ANSI (default dialect when no database is provided) + arguments( + "ansi single-quoted string", + null, + "SELECT name FROM u WHERE name = 'john'", + singletonList("john")), + arguments( + "ansi escaped single quote", null, "SELECT 'O''Brien'", singletonList("O''Brien")), + arguments("ansi integer literal", null, "SELECT 12345", singletonList("12345")), + arguments("ansi decimal literal", null, "SELECT 3.14", singletonList("3.14")), + arguments("ansi hex literal", null, "SELECT 0x1aF", singletonList("0x1aF")), + arguments("ansi line comment", null, "SELECT a -- bye", singletonList(" bye")), + arguments("ansi block comment", null, "SELECT /* hidden */ a", singletonList(" hidden ")), + arguments("ansi ignores double quotes", null, "SELECT \"x\" FROM t", emptyList()), + // MySQL family treats double-quoted strings as literals + arguments( + "mysql double-quoted string", + "mysql", + "SELECT \"secret\" FROM t", + singletonList("secret")), + // Oracle q'...' escaped literals (bracket pairs + enumerated single-char delimiters) + arguments( + "oracle q bracket literal", + "oracle", + "SELECT q'[hello]' FROM dual", + singletonList("hello")), + arguments( + "oracle q paren literal", + "oracle", + "SELECT q'(hello)' FROM dual", + singletonList("hello")), + arguments( + "oracle q custom delimiter", + "oracle", + "SELECT q'#hello#' FROM dual", + singletonList("hello")), + // Oracle forbids whitespace as a q' delimiter, so a space-delimited q' is intentionally + // NOT recognized as a q-literal; its content is still captured by the generic + // single-quoted-string branch (so the secret is still redacted, just not q-unwrapped). + arguments( + "oracle q whitespace delimiter is not a q-literal", + "oracle", + "SELECT q' secret ' FROM dual", + singletonList(" secret ")), + // PostgreSQL dollar-quoting + arguments( + "postgres dollar quote", + "postgresql", + "SELECT $tag$secret$tag$", + singletonList("secret")), + arguments( + "postgres empty-tag dollar quote", + "postgresql", + "SELECT $$secret$$", + singletonList("secret")), + arguments("postgres overlapping tags", "postgresql", "SELECT $a$x$a$", singletonList("x")), + arguments( + "postgres unterminated tag is skipped", "postgresql", "SELECT $tag$value", emptyList()), + // Boundary cases around buildDollarTagPositions: the scan must not read past end-of-string. + arguments("postgres lone dollar at end of string", "postgresql", "SELECT a$", emptyList()), + arguments( + "postgres identifier tag without closing dollar at end of string", + "postgresql", + "SELECT $tag", + emptyList()), + arguments( + "postgres empty-tag opener without close at end of string", + "postgresql", + "SELECT $$secret", + emptyList()), + // Parameter placeholders ($1, $2) must NOT be treated as dollar-quote openers; only their + // digits are tokenized as numeric literals. + arguments( + "postgres placeholders are not dollar quotes", + "postgresql", + "SELECT * FROM t WHERE a = $1 AND b = $2", + asList("1", "2"))); + } + + @Test + void manyUnterminatedDollarTagsRunInLinearTime() { + // Each "$tN$" is a distinct, valid but unterminated dollar-quote opener. The previous + // indexOf-per-opener implementation scanned to end-of-string once per opener (O(n^2)) and would + // not finish anywhere near this budget; the precomputed tag index keeps it near-linear. + StringBuilder builder = new StringBuilder(); + for (int i = 0; i < 60_000; i++) { + builder.append('$').append('t').append(i).append('$'); + } + String sql = builder.toString(); + + assertTimeoutPreemptively( + Duration.ofSeconds(10), + () -> { + Tokenizer tokenizer = new SqlRegexpTokenizer(postgresEvidence(sql)); + // None of the openers has a matching close, so tokenization yields nothing and must + // simply terminate quickly. + assertFalse(tokenizer.next()); + }); + } + + private static Evidence postgresEvidence(String sql) { + return evidence("postgresql", sql); + } + + private static Evidence evidence(@Nullable String dialect, String sql) { + Evidence evidence = new Evidence(sql); + if (dialect != null) { + evidence.getContext().put(DATABASE_PARAMETER, dialect); + } + return evidence; + } + + private static List tokenize(@Nullable String dialect, String sql) { + Tokenizer tokenizer = new SqlRegexpTokenizer(evidence(dialect, sql)); + List tokens = new ArrayList<>(); + while (tokenizer.next()) { + Ranged range = tokenizer.current(); + tokens.add(sql.substring(range.getStart(), range.getStart() + range.getLength())); + } + return tokens; + } +} diff --git a/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sensitive/UrlRegexpTokenizerTest.java b/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sensitive/UrlRegexpTokenizerTest.java new file mode 100644 index 00000000000..1e5fd780fd8 --- /dev/null +++ b/dd-java-agent/agent-iast/src/test/java/com/datadog/iast/sensitive/UrlRegexpTokenizerTest.java @@ -0,0 +1,44 @@ +package com.datadog.iast.sensitive; + +import static java.util.Arrays.asList; +import static java.util.Collections.singletonList; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.params.provider.Arguments.arguments; + +import com.datadog.iast.model.Evidence; +import com.datadog.iast.sensitive.SensitiveHandler.Tokenizer; +import com.datadog.iast.util.Ranged; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Stream; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + +class UrlRegexpTokenizerTest { + + @ParameterizedTest(name = "{0}") + @MethodSource("redactsUrlSecretsArguments") + void redactsUrlSecrets(final String description, final String url, final List expected) { + assertEquals(expected, tokenize(url)); + } + + static Stream redactsUrlSecretsArguments() { + return Stream.of( + arguments("userinfo authority", "https://user:pass@host/path", singletonList("user:pass")), + arguments("single user authority", "ftp://bob@server/file", singletonList("bob")), + arguments( + "query parameter values", "http://h/p?token=secret&id=42", asList("secret", "42")), + arguments("authority and query together", "https://user@host/p?q=v", asList("user", "v"))); + } + + private static List tokenize(String url) { + Tokenizer tokenizer = new UrlRegexpTokenizer(new Evidence(url)); + List tokens = new ArrayList<>(); + while (tokenizer.next()) { + Ranged range = tokenizer.current(); + tokens.add(url.substring(range.getStart(), range.getStart() + range.getLength())); + } + return tokens; + } +} diff --git a/dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java b/dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java index 4c9142eec2e..062687a458e 100644 --- a/dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java +++ b/dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java @@ -168,9 +168,9 @@ public final class ConfigDefaults { static final String DEFAULT_IAST_WEAK_CIPHER_ALGORITHMS = "^(?:PBEWITH(?:HMACSHA(?:2(?:24ANDAES_(?:128|256)|56ANDAES_(?:128|256))|384ANDAES_(?:128|256)|512ANDAES_(?:128|256)|1ANDAES_(?:128|256))|SHA1AND(?:RC(?:2_(?:128|40)|4_(?:128|40))|DESEDE)|MD5AND(?:TRIPLEDES|DES))|DES(?:EDE(?:WRAP)?)?|BLOWFISH|ARCFOUR|RC2).*$"; static final boolean DEFAULT_IAST_REDACTION_ENABLED = true; - static final String DEFAULT_IAST_REDACTION_NAME_PATTERN = + public static final String DEFAULT_IAST_REDACTION_NAME_PATTERN = "(?:p(?:ass)?w(?:or)?d|pass(?:_?phrase)?|secret|(?:api_?|private_?|public_?|access_?|secret_?)key(?:_?id)?|token|consumer_?(?:id|key|secret)|sign(?:ed|ature)?|auth(?:entication|orization)?)"; - static final String DEFAULT_IAST_REDACTION_VALUE_PATTERN = + public static final String DEFAULT_IAST_REDACTION_VALUE_PATTERN = "(?:bearer\\s+[a-z0-9\\._\\-]+|glpat-[\\w\\-]{20}|gh[opsu]_[0-9a-zA-Z]{36}|ey[I-L][\\w=\\-]+\\.ey[I-L][\\w=\\-]+(?:\\.[\\w.+/=\\-]+)?|(?:[\\-]{5}BEGIN[a-z\\s]+PRIVATE\\sKEY[\\-]{5}[^\\-]+[\\-]{5}END[a-z\\s]+PRIVATE\\sKEY[\\-]{5}|ssh-rsa\\s*[a-z0-9/\\.+]{100,}))"; public static final int DEFAULT_IAST_MAX_RANGE_COUNT = 10; static final boolean DEFAULT_IAST_STACKTRACE_LEAK_SUPPRESS = false; diff --git a/dd-trace-core/build.gradle b/dd-trace-core/build.gradle index 47199dab774..3df31b0388f 100644 --- a/dd-trace-core/build.gradle +++ b/dd-trace-core/build.gradle @@ -83,8 +83,7 @@ dependencies { implementation libs.slf4j implementation libs.moshi implementation libs.jctools - - implementation group: 'com.google.re2j', name: 're2j', version: '1.7' + implementation libs.re2j // sketches-java is shared compileOnly group: 'com.datadoghq', name: 'sketches-java', version: '0.8.3' diff --git a/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/QueryObfuscator.java b/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/QueryObfuscator.java index a1594e33eb6..2c99c50244b 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/QueryObfuscator.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/QueryObfuscator.java @@ -8,7 +8,6 @@ import datadog.trace.bootstrap.instrumentation.api.AppendableSpanLinks; import datadog.trace.bootstrap.instrumentation.api.Tags; import datadog.trace.core.DDSpanContext; -import datadog.trace.util.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,13 +46,20 @@ public QueryObfuscator(String regex) { } private String obfuscate(String query) { - if (pattern != null) { - Matcher matcher = pattern.matcher(query); - while (matcher.find()) { - query = Strings.replace(query, matcher.group(), ""); - } + if (pattern == null) { + return query; + } + final Matcher matcher = pattern.matcher(query); + if (!matcher.find()) { + return query; } - return query; + // TODO consider an upstream length cap too + final StringBuffer sb = new StringBuffer(query.length()); + do { + matcher.appendReplacement(sb, ""); + } while (matcher.find()); + matcher.appendTail(sb); + return sb.toString(); } @Override diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index ae4aa311ce1..e8daf61cd03 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -69,6 +69,9 @@ final class CachedData { // snakeyaml-engine and its transitives exclude(dependency('org.snakeyaml:snakeyaml-engine')) + + // re2j and its transitives + exclude(dependency('com.google.re2j:re2j')) } ] } @@ -95,7 +98,8 @@ CachedData.deps.shared = [ libs.moshi, libs.jctools, libs.lz4, - libs.aircompressor + libs.aircompressor, + libs.re2j ] ext { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 601f72be16e..39a030b31ea 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -56,6 +56,7 @@ guava = "[16.0,20.0]" # Last version to support Java 7 javaparser = "3.24.4" jctools = "4.0.6" lz4 = "1.11.0" +re2j = "1.8" # Logging slf4j = "1.7.30" @@ -140,6 +141,7 @@ javaparser = {module = "com.github.javaparser:javaparser-core", version.ref = "j javaparser-symbol-solver = {module = "com.github.javaparser:javaparser-symbol-solver-core", version.ref = "javaparser"} jctools = { module = "org.jctools:jctools-core-jdk11", version.ref = "jctools" } lz4 = { module = "at.yawk.lz4:lz4-java", version.ref = "lz4" } +re2j = { module = "com.google.re2j:re2j", version.ref = "re2j" } # Logging logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "logback" } From 2d6e0b08d2fb795734ded86acb2b5554fddb72b4 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Tue, 23 Jun 2026 11:00:08 -0400 Subject: [PATCH 028/139] Bumps `javaparser-symbol-solver-core` from `3.24.4` to `3.28.2` (#11704) Bump javaparser lib. Merge branch 'master' into alexeyk/bump-java-parser-lib Fixed review notes about lock files. Co-authored-by: alexey.kuznetsov --- buildSrc/build.gradle.kts | 3 +-- .../java/datadog/trace/plugin/csi/TypeResolver.java | 2 +- .../trace/plugin/csi/impl/TypeResolverPool.java | 12 +++++++++--- .../java/java-lang/java-lang-15.0/gradle.lockfile | 2 +- .../iast-util/iast-util-17/gradle.lockfile | 2 +- dd-smoke-tests/springboot-java-17/gradle.lockfile | 2 +- gradle/libs.versions.toml | 2 +- 7 files changed, 15 insertions(+), 10 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 206731e5519..441a90dcba0 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -93,9 +93,8 @@ dependencies { implementation("org.apache.maven", "maven-aether-provider", "3.3.9") implementation("com.github.zafarkhaja:java-semver:0.10.2") - implementation("com.github.javaparser", "javaparser-symbol-solver-core", "3.24.4") + implementation(libs.javaparser.symbol.solver) - implementation("com.google.guava", "guava", "20.0") implementation(libs.asm) implementation(libs.asm.tree) diff --git a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/TypeResolver.java b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/TypeResolver.java index 44b32c3bf87..666a460a3d1 100644 --- a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/TypeResolver.java +++ b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/TypeResolver.java @@ -1,6 +1,6 @@ package datadog.trace.plugin.csi; -import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; +import com.github.javaparser.resolution.TypeSolver; import datadog.trace.plugin.csi.HasErrors.HasErrorsException; import datadog.trace.plugin.csi.util.MethodType; import java.lang.reflect.Executable; diff --git a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/impl/TypeResolverPool.java b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/impl/TypeResolverPool.java index 0cfa4eadf9b..f1d5159a46a 100644 --- a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/impl/TypeResolverPool.java +++ b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/impl/TypeResolverPool.java @@ -3,9 +3,9 @@ import static datadog.trace.plugin.csi.util.CallSiteUtils.classNameToType; import static datadog.trace.plugin.csi.util.CallSiteUtils.repeat; +import com.github.javaparser.resolution.TypeSolver; import com.github.javaparser.resolution.declarations.ResolvedReferenceTypeDeclaration; -import com.github.javaparser.symbolsolver.model.resolution.SymbolReference; -import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; +import com.github.javaparser.resolution.model.SymbolReference; import com.github.javaparser.symbolsolver.reflectionmodel.ReflectionFactory; import datadog.trace.plugin.csi.HasErrors.Failure; import datadog.trace.plugin.csi.TypeResolver; @@ -147,7 +147,13 @@ public SymbolReference tryToSolveType(final St final Class clazz = resolveType(type); return SymbolReference.solved(ReflectionFactory.typeDeclarationFor(clazz, getRoot())); } catch (final Throwable e) { - return SymbolReference.unsolved(ResolvedReferenceTypeDeclaration.class); + return SymbolReference.unsolved(); } } + + @Override + public SymbolReference tryToSolveTypeInModule( + String qualifiedModuleName, String simpleTypeName) { + return tryToSolveType(simpleTypeName); + } } diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/gradle.lockfile b/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/gradle.lockfile index 174cd83af29..245eff58e71 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/gradle.lockfile @@ -13,8 +13,8 @@ com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileCla com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=latestDepTestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.javaparser:javaparser-core:3.24.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc +com.github.javaparser:javaparser-core:3.28.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jffi:1.3.15=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-a64asm:1.0.0=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-constants:0.10.4=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/iast-util/iast-util-17/gradle.lockfile b/dd-smoke-tests/iast-util/iast-util-17/gradle.lockfile index 03f8831845c..e8480656f44 100644 --- a/dd-smoke-tests/iast-util/iast-util-17/gradle.lockfile +++ b/dd-smoke-tests/iast-util/iast-util-17/gradle.lockfile @@ -20,8 +20,8 @@ com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.10.0=compileClasspath com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.10.0=compileClasspath com.fasterxml.jackson.module:jackson-module-parameter-names:2.10.0=compileClasspath com.fasterxml:classmate:1.3.4=compileClasspath -com.github.javaparser:javaparser-core:3.24.4=testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc +com.github.javaparser:javaparser-core:3.28.2=testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.github.jnr:jffi:1.3.15=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-a64asm:1.0.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-constants:0.10.4=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-java-17/gradle.lockfile b/dd-smoke-tests/springboot-java-17/gradle.lockfile index 9edefd1e028..c5cef077ac3 100644 --- a/dd-smoke-tests/springboot-java-17/gradle.lockfile +++ b/dd-smoke-tests/springboot-java-17/gradle.lockfile @@ -13,8 +13,8 @@ com.datadoghq:dd-instrument-java:0.0.4=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath -com.github.javaparser:javaparser-core:3.24.4=testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc +com.github.javaparser:javaparser-core:3.28.2=testRuntimeClasspath com.github.jnr:jffi:1.3.15=testRuntimeClasspath com.github.jnr:jnr-a64asm:1.0.0=testRuntimeClasspath com.github.jnr:jnr-constants:0.10.4=testRuntimeClasspath diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 39a030b31ea..9671e511d41 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -53,7 +53,7 @@ cafe_crypto = "0.1.0" # Common utils commons = "3.2" guava = "[16.0,20.0]" # Last version to support Java 7 -javaparser = "3.24.4" +javaparser = "3.28.2" jctools = "4.0.6" lz4 = "1.11.0" re2j = "1.8" From 741789f54c1fd8167cbff4fa4854fdc206168d12 Mon Sep 17 00:00:00 2001 From: Stuart McCulloch Date: Tue, 23 Jun 2026 16:19:11 +0100 Subject: [PATCH 029/139] Rename `AgentSpan.context()` to `AgentSpan.spanContext()` to disambiguate it from generic context (#11707) Rename AgentSpan.context() to AgentSpan.spanContext() to disambiguate it from generic context Rename some AgentSpanContext variables for consistency Rename terminatedContextLinks -> terminatedSpanLinks Merge branch 'master' into mcculls/disambiguate-agent-span-context Co-authored-by: devflow.devflow-routing-intake --- .../com/datadog/aiguard/AIGuardInternal.java | 2 +- .../decorator/BaseDecorator.java | 2 +- .../decorator/HttpServerDecorator.java | 2 +- .../decorator/WebsocketDecorator.java | 6 +- .../decorator/BaseDecoratorTest.groovy | 2 +- .../decorator/ClientDecoratorTest.groovy | 2 +- ...ocessingDatabaseClientDecoratorTest.groovy | 2 +- .../DatabaseClientDecoratorTest.groovy | 2 +- .../decorator/ServerDecoratorTest.groovy | 2 +- .../decorator/TestDecoratorImpl.java | 2 +- .../buildsystem/BuildSystemSessionImpl.java | 4 +- .../domain/headless/HeadlessTestModule.java | 2 +- .../domain/headless/HeadlessTestSession.java | 2 +- .../domain/manualapi/ManualApiTestModule.java | 2 +- .../manualapi/ManualApiTestSession.java | 2 +- .../decorator/TestDecoratorImplTest.groovy | 4 +- .../com/datadog/debugger/probe/LogProbe.java | 4 +- .../debugger/trigger/TriggerProbeTest.java | 4 +- .../trace/llmobs/domain/DDLLMObsSpan.java | 6 +- .../opentelemetry/shim/trace/OtelSpan.java | 4 +- .../shim/trace/OtelSpanContext.java | 2 +- .../test/InstrumentationSpecification.groovy | 2 +- .../agent/test/TrackingSpanDecorator.groovy | 4 +- .../test/AbstractInstrumentationTest.java | 2 +- .../test/assertions/SpanLinkMatcher.java | 2 +- .../grpc/server/TracingServerInterceptor.java | 2 +- .../aws/v0/TracingRequestHandler.java | 4 +- .../aws/v2/AwsSdkClientDecorator.java | 4 +- .../aws/v1/sqs/TracingIterator.java | 2 +- .../aws/v2/sqs/TracingIterator.java | 2 +- .../client/DatadogRequestTracer.java | 2 +- .../client/DatadogRequestTracer.java | 2 +- .../view/DropwizardViewInstrumentation.java | 2 +- .../graphqljava14/GraphQLInstrumentation.java | 5 +- .../graphqljava20/GraphQLInstrumentation.java | 4 +- .../graphqljava/InstrumentedDataFetcher.java | 2 +- .../grpc/server/TracingServerInterceptor.java | 2 +- .../hibernate/SessionMethodUtils.java | 2 +- .../java/lang/ProcessImplStartAdvice.java | 2 +- .../LoggerNodeInstrumentation.java | 2 +- .../instrumentation/jdbc/JDBCDecorator.java | 2 +- .../jms/DatadogMessageListener.java | 2 +- .../JMSMessageConsumerInstrumentation.java | 2 +- .../KafkaProducerInstrumentation.java | 2 +- .../kafka_clients/TracingIterator.java | 2 +- .../kafka_clients38/PayloadSizeAdvice.java | 2 +- .../kafka_clients38/TracingIterator.java | 2 +- .../KafkaStreamTaskInstrumentation.java | 4 +- .../karate/KarateTracingHook.java | 2 +- .../KotlinCoroutineInstrumentationTest.groovy | 8 +- .../KotlinCoroutineInstrumentationTest.groovy | 4 +- ...tKotlinCoroutineInstrumentationTest.groovy | 16 +-- .../log4j1/CategoryInstrumentation.java | 2 +- .../SpanDecoratingContextDataInjector.java | 4 +- .../logback/LogbackLoggerInstrumentation.java | 2 +- .../instrumentation/mule4/MuleDecorator.java | 2 +- .../ChannelFutureListenerInstrumentation.java | 2 +- .../ChannelFutureListenerInstrumentation.java | 2 +- .../ChannelFutureListenerInstrumentation.java | 2 +- .../ognl/OgnlInstrumentation.java | 2 +- .../SessionIdPropagationForkedTest.java | 3 +- .../opentelemetry/OtelSpan.java | 2 +- .../opentelemetry/OtelTracer.java | 4 +- .../src/test/groovy/OpenTelemetryTest.groovy | 2 +- .../opentelemetry14/OpenTelemetry14Test.java | 2 +- .../instrumentation/opentracing31/OTSpan.java | 2 +- .../opentracing31/OTTracer.java | 6 +- .../src/test/groovy/OpenTracing31Test.groovy | 2 +- .../instrumentation/opentracing32/OTSpan.java | 2 +- .../opentracing32/OTTracer.java | 6 +- .../src/test/groovy/OpenTracing32Test.groovy | 2 +- .../rabbitmq/amqp/RabbitDecorator.java | 9 +- .../rxjava/TracedOnSubscribe.java | 3 +- .../groovy/ScalaInstrumentationTest.groovy | 22 ++-- .../groovy/ScalaInstrumentationTest.groovy | 22 ++-- .../servlet3/AsyncContextInstrumentation.java | 2 +- .../RequestDispatcherInstrumentation.java | 4 +- .../spark/AbstractDatadogSparkListener.java | 14 +-- ...bstractSparkStructuredStreamingTest.groovy | 8 +- .../spark/AbstractSparkTest.groovy | 26 ++--- .../SpringBootBasedTest.groovy | 2 +- .../SpringBootBasedTest.groovy | 2 +- ...MappingResourceNameFilterForkedTest.groovy | 2 +- ...MappingResourceNameFilterForkedTest.groovy | 2 +- .../SynapseClientInstrumentation.java | 2 +- .../tibcobw5/TaskInstrumentation.java | 2 +- .../tibcobw6/BehaviorInstrumentation.java | 4 +- ...TinylogLoggingProviderInstrumentation.java | 2 +- .../VertxSqlClientDecorator.java | 2 +- .../src/test/groovy/WebsocketTest.groovy | 6 +- .../agent/test/asserts/LinksAssert.groovy | 2 +- .../common/writer/DDSpanJsonAdapter.java | 2 +- .../java/datadog/trace/core/CoreTracer.java | 107 +++++++++--------- .../main/java/datadog/trace/core/DDSpan.java | 4 +- .../datadog/trace/core/DDSpanContext.java | 8 +- .../java/datadog/trace/core/PendingTrace.java | 2 +- .../datadog/trace/core/TraceCollector.java | 5 +- .../trace/core/baggage/BaggagePropagator.java | 2 +- .../datastreams/DataStreamsPropagator.java | 4 +- .../DefaultDataStreamsMonitoring.java | 4 +- .../trace/core/otlp/trace/OtlpTraceProto.java | 6 +- .../trace/core/propagation/HttpCodec.java | 2 +- .../core/propagation/TracingPropagator.java | 2 +- .../core/propagation/XRayPropagator.java | 2 +- .../core/scopemanager/ContinuableScope.java | 2 +- .../scopemanager/ContinuableScopeManager.java | 6 +- .../common/writer/TraceMapperTest.groovy | 2 +- .../CiVisibilityTraceInterceptorTest.java | 4 +- .../ParentBasedAlwaysOnSamplerTest.java | 2 +- .../trace/core/CoreSpanBuilderTest.java | 64 ++++++----- .../datadog/trace/core/CoreTracerTest.java | 4 +- .../DDSpanContextPropagationTagsTest.java | 16 +-- .../datadog/trace/core/DDSpanContextTest.java | 40 +++---- .../trace/core/DDSpanSerializationTest.java | 6 +- .../java/datadog/trace/core/DDSpanTest.java | 31 +++-- .../trace/core/KnuthSamplingRateTest.java | 12 +- .../trace/core/PendingTraceBufferTest.java | 6 +- .../trace/core/PendingTraceTestBase.java | 25 ++-- .../trace/core/TraceInterceptorTest.java | 6 +- .../core/datastreams/CheckpointerTest.java | 2 +- .../DefaultPathwayContextTest.java | 20 ++-- .../core/otlp/logs/OtlpLogsProtoTest.java | 2 +- .../core/otlp/trace/OtlpTraceProtoTest.java | 4 +- .../core/propagation/HttpExtractorTest.java | 2 +- .../propagation/OrgGuardEndToEndTest.java | 6 +- .../propagation/TracingPropagatorTest.java | 4 +- .../core/propagation/W3CHttpInjectorTest.java | 6 +- .../core/scopemanager/ScopeManagerTest.java | 10 +- .../taginterceptor/TagInterceptorTest.java | 4 +- .../LatencyTraceInterceptorTest.java | 2 +- .../java/datadog/opentracing/DDTracer.java | 26 ++--- .../main/java/datadog/opentracing/OTSpan.java | 2 +- .../java/datadog/opentracing/OT31ApiTest.java | 4 +- .../java/datadog/opentracing/OT33ApiTest.java | 4 +- .../datadog/opentracing/DDTracerTest.java | 5 +- .../opentracing/OpenTracingAPITest.java | 4 +- .../trace/api/gateway/InferredProxySpan.java | 2 +- .../trace/api/propagation/W3CTraceParent.java | 2 +- .../instrumentation/api/AgentPropagation.java | 2 +- .../instrumentation/api/AgentSpan.java | 2 +- .../instrumentation/api/AgentSpanContext.java | 2 +- .../instrumentation/api/BlackHoleSpan.java | 2 +- .../instrumentation/api/ExtractedSpan.java | 2 +- .../instrumentation/api/NoopSpan.java | 2 +- .../instrumentation/api/NoopSpanContext.java | 2 +- .../instrumentation/api/TagContext.java | 16 +-- .../api/ExtractedSpanTest.groovy | 4 +- 147 files changed, 442 insertions(+), 425 deletions(-) diff --git a/dd-java-agent/agent-aiguard/src/main/java/com/datadog/aiguard/AIGuardInternal.java b/dd-java-agent/agent-aiguard/src/main/java/com/datadog/aiguard/AIGuardInternal.java index 1aabdff4598..55514ba0a52 100644 --- a/dd-java-agent/agent-aiguard/src/main/java/com/datadog/aiguard/AIGuardInternal.java +++ b/dd-java-agent/agent-aiguard/src/main/java/com/datadog/aiguard/AIGuardInternal.java @@ -269,7 +269,7 @@ public Evaluation evaluate(final List messages, final Options options) final AgentTracer.SpanBuilder builder = tracer.buildSpan(SPAN_NAME, SPAN_NAME); final AgentSpan parent = AgentTracer.activeSpan(); if (parent != null) { - builder.asChildOf(parent.context()); + builder.asChildOf(parent.spanContext()); } final AgentSpan span = builder.start(); final AgentSpan localRootSpan = span.getLocalRootSpan(); diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/BaseDecorator.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/BaseDecorator.java index 6a8767e523f..2628e9416cf 100644 --- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/BaseDecorator.java +++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/BaseDecorator.java @@ -100,7 +100,7 @@ public AgentSpan afterStart(final AgentSpan span) { // DQH - Could retrieve the value from componentEntry and cast to avoid the virtual call, // unclear which option is better here final CharSequence component = component(); - span.context().setIntegrationName(component); + span.spanContext().setIntegrationName(component); // null handled by setMetric span.setMetric(traceAnalyticsEntry); diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecorator.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecorator.java index 267d0149c3c..ed2b171778d 100644 --- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecorator.java +++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecorator.java @@ -434,7 +434,7 @@ public AgentSpan onRequest( protected static AgentSpanContext.Extracted getExtractedSpanContext(Context parentContext) { AgentSpan extractedSpan = AgentSpan.fromContext(parentContext); if (extractedSpan != null) { - AgentSpanContext extractedSpanContext = extractedSpan.context(); + AgentSpanContext extractedSpanContext = extractedSpan.spanContext(); if (extractedSpanContext instanceof AgentSpanContext.Extracted) { return (AgentSpanContext.Extracted) extractedSpanContext; } else { diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/WebsocketDecorator.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/WebsocketDecorator.java index 2123caa395d..6684c4a7043 100644 --- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/WebsocketDecorator.java +++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/WebsocketDecorator.java @@ -144,7 +144,7 @@ private AgentSpan onFrameStart( wsSpan.setTag(DECISION_MAKER_RESOURCE, handshakeSpan.getResourceName()); } } else { - wsSpan = startSpan(WEBSOCKET.toString(), operationName, handshakeSpan.context()); + wsSpan = startSpan(WEBSOCKET.toString(), operationName, handshakeSpan.spanContext()); } } else { wsSpan = startSpan(WEBSOCKET.toString(), operationName); @@ -167,8 +167,8 @@ private AgentSpan onFrameStart( wsSpan.addLink( SpanLink.from( inheritSampling - ? handshakeSpan.context() - : new NotSampledSpanContext(handshakeSpan.context()), + ? handshakeSpan.spanContext() + : new NotSampledSpanContext(handshakeSpan.spanContext()), SpanLink.DEFAULT_FLAGS, "", linkAttributes)); diff --git a/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/BaseDecoratorTest.groovy b/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/BaseDecoratorTest.groovy index 354a9c6bc4f..5b70cba2085 100644 --- a/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/BaseDecoratorTest.groovy +++ b/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/BaseDecoratorTest.groovy @@ -31,7 +31,7 @@ class BaseDecoratorTest extends DDSpecification { then: 1 * span.setSpanType(decorator.spanType()) 1 * span.setTag(TagMap.Entry.create(Tags.COMPONENT, "test-component")) - 1 * span.context() >> spanContext + 1 * span.spanContext() >> spanContext 1 * spanContext.setIntegrationName("test-component") _ * span.setTag(_) _ * span.setTag(_, _) // Want to allow other calls from child implementations. diff --git a/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/ClientDecoratorTest.groovy b/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/ClientDecoratorTest.groovy index 3b40a04a9bb..fec5748f089 100644 --- a/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/ClientDecoratorTest.groovy +++ b/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/ClientDecoratorTest.groovy @@ -24,7 +24,7 @@ class ClientDecoratorTest extends BaseDecoratorTest { } 1 * span.setMeasured(true) 1 * span.setTag(TagMap.Entry.create(Tags.COMPONENT, "test-component")) - 1 * span.context() >> spanContext + 1 * span.spanContext() >> spanContext 1 * spanContext.setIntegrationName("test-component") 1 * span.setTag(TagMap.Entry.create(Tags.SPAN_KIND, "client")) 1 * span.setSpanType(decorator.spanType()) diff --git a/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/DBTypeProcessingDatabaseClientDecoratorTest.groovy b/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/DBTypeProcessingDatabaseClientDecoratorTest.groovy index 85b9d6fd66a..624100fcc50 100644 --- a/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/DBTypeProcessingDatabaseClientDecoratorTest.groovy +++ b/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/DBTypeProcessingDatabaseClientDecoratorTest.groovy @@ -25,7 +25,7 @@ class DBTypeProcessingDatabaseClientDecoratorTest extends ClientDecoratorTest { } 1 * span.setMeasured(true) 1 * span.setTag(Tags.COMPONENT, "test-component") - 1 * span.context() >> spanContext + 1 * span.spanContext() >> spanContext 1 * spanContext.setIntegrationName("test-component") 1 * span.setTag(TagMap.Entry.create(Tags.SPAN_KIND, "client")) 1 * span.setSpanType("test-type") diff --git a/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/DatabaseClientDecoratorTest.groovy b/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/DatabaseClientDecoratorTest.groovy index 164138cbe0f..93852ccc88c 100644 --- a/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/DatabaseClientDecoratorTest.groovy +++ b/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/DatabaseClientDecoratorTest.groovy @@ -28,7 +28,7 @@ class DatabaseClientDecoratorTest extends ClientDecoratorTest { } 1 * span.setMeasured(true) 1 * span.setTag(TagMap.Entry.create(Tags.COMPONENT, "test-component")) - 1 * span.context() >> spanContext + 1 * span.spanContext() >> spanContext 1 * spanContext.setIntegrationName("test-component") 1 * span.setTag(TagMap.Entry.create(Tags.SPAN_KIND, "client")) 1 * span.setSpanType("test-type") diff --git a/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/ServerDecoratorTest.groovy b/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/ServerDecoratorTest.groovy index ae41a1f523b..d60c1534627 100644 --- a/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/ServerDecoratorTest.groovy +++ b/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/ServerDecoratorTest.groovy @@ -24,7 +24,7 @@ class ServerDecoratorTest extends BaseDecoratorTest { then: 1 * span.setTag(TagMap.Entry.create(LANGUAGE_TAG_KEY, LANGUAGE_TAG_VALUE)) 1 * span.setTag(TagMap.Entry.create(COMPONENT, "test-component")) - 1 * span.context() >> spanContext + 1 * span.spanContext() >> spanContext 1 * spanContext.setIntegrationName("test-component") 1 * span.setTag(TagMap.Entry.create(SPAN_KIND, "server")) 1 * span.setSpanType(decorator.spanType()) diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/decorator/TestDecoratorImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/decorator/TestDecoratorImpl.java index de2ab526728..26b278e0587 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/decorator/TestDecoratorImpl.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/decorator/TestDecoratorImpl.java @@ -51,7 +51,7 @@ public AgentSpan afterStart(final AgentSpan span) { span.setTag(DDTags.HOST_VCPU_COUNT, cpuCount); span.setTag(Tags.TEST_TYPE, testType()); span.setTag(Tags.COMPONENT, component()); - span.context().setIntegrationName(component()); + span.spanContext().setIntegrationName(component()); span.setTag(Tags.TEST_SESSION_NAME, sessionName); for (final Map.Entry ciTag : ciTags.entrySet()) { diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/BuildSystemSessionImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/BuildSystemSessionImpl.java index de116acf05c..3d33141dd19 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/BuildSystemSessionImpl.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/BuildSystemSessionImpl.java @@ -154,7 +154,7 @@ public BuildSystemModuleImpl testModuleStart( @Nullable JavaAgent jacocoAgent) { ExecutionSettings executionSettings = executionSettingsFactory.create(jvmInfo, moduleName); return new BuildSystemModuleImpl( - span.context(), + span.spanContext(), moduleName, startCommand, startTime, @@ -178,7 +178,7 @@ public BuildSystemModuleImpl testModuleStart( @Override public AgentSpan testTaskStart(String taskName) { - return startSpan("ci_visibility", taskName, span.context()); + return startSpan("ci_visibility", taskName, span.spanContext()); } private void onModuleFinish(AgentSpan moduleSpan) { diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java index 1c111bba967..f17fcd2a4c6 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java @@ -170,7 +170,7 @@ public TestSuiteImpl testSuiteStart( boolean parallelized, TestFrameworkInstrumentation instrumentation) { return new TestSuiteImpl( - span.context(), + span.spanContext(), moduleName, testSuiteName, executionStrategy.getExecutionSettings().getItrCorrelationId(), diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestSession.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestSession.java index 1024104361c..41edbef64cf 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestSession.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestSession.java @@ -67,7 +67,7 @@ public HeadlessTestSession( @Override public HeadlessTestModule testModuleStart(String moduleName, @Nullable Long startTime) { return new HeadlessTestModule( - span.context(), + span.spanContext(), moduleName, startTime, config, diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestModule.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestModule.java index 4b4fb8e8f1f..8ca29a07079 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestModule.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestModule.java @@ -65,7 +65,7 @@ public ManualApiTestSuite testSuiteStart( boolean parallelized) { TestSuiteImpl suite = new TestSuiteImpl( - span.context(), + span.spanContext(), moduleName, testSuiteName, null, diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestSession.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestSession.java index 917bf9ddbc0..728b7d09b21 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestSession.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestSession.java @@ -49,7 +49,7 @@ public ManualApiTestSession( @Override public ManualApiTestModule testModuleStart(String moduleName, @Nullable Long startTime) { return new ManualApiTestModule( - span.context(), + span.spanContext(), moduleName, startTime, config, diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/decorator/TestDecoratorImplTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/decorator/TestDecoratorImplTest.groovy index d1d415428df..1f7de97d672 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/decorator/TestDecoratorImplTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/decorator/TestDecoratorImplTest.groovy @@ -22,7 +22,7 @@ class TestDecoratorImplTest extends Specification { then: 1 * span.setTag(Tags.TEST_SESSION_NAME, "session-name") 1 * span.setTag(Tags.COMPONENT, "test-component") - 1 * span.context() >> context + 1 * span.spanContext() >> context 1 * context.setIntegrationName("test-component") 1 * span.setTag(Tags.TEST_TYPE, decorator.testType()) 1 * span.setSamplingPriority(PrioritySampling.SAMPLER_KEEP) @@ -48,7 +48,7 @@ class TestDecoratorImplTest extends Specification { decorator.afterStart(span) then: - 1 * span.context() >> context + 1 * span.spanContext() >> context 1 * context.setIntegrationName("test-component") 1 * span.setTag(Tags.TEST_SESSION_NAME, expectedSessionName) diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/LogProbe.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/LogProbe.java index 5cdc2354409..3418ea1af4d 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/LogProbe.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/LogProbe.java @@ -1179,8 +1179,8 @@ private static Map getDebugSessions() { if (tracer != null) { AgentSpan span = tracer.activeSpan(); if (span instanceof DDSpan) { - DDSpanContext context = (DDSpanContext) span.context(); - String debug = context.getPropagationTags().getDebugPropagation(); + DDSpanContext spanContext = (DDSpanContext) span.spanContext(); + String debug = spanContext.getPropagationTags().getDebugPropagation(); if (debug != null) { String[] entries = debug.split(","); for (String entry : entries) { diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/trigger/TriggerProbeTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/trigger/TriggerProbeTest.java index 6b895a9dc13..ea6f181b4d1 100644 --- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/trigger/TriggerProbeTest.java +++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/trigger/TriggerProbeTest.java @@ -79,7 +79,7 @@ public void conditions() throws IOException, URISyntaxException { .filter( span -> { DDSpan ddSpan = (DDSpan) span; - PropagationTags tags = ddSpan.context().getPropagationTags(); + PropagationTags tags = ddSpan.spanContext().getPropagationTags(); return (TRIGGER_PROBE_SESSION_ID + ":1").equals(tags.getDebugPropagation()); }) .count(); @@ -137,7 +137,7 @@ public void cooldown() throws IOException, URISyntaxException { .filter( span -> { DDSpan ddSpan = (DDSpan) span; - PropagationTags tags = ddSpan.context().getPropagationTags(); + PropagationTags tags = ddSpan.spanContext().getPropagationTags(); return (TRIGGER_PROBE_SESSION_ID + ":1").equals(tags.getDebugPropagation()); }) .count(); diff --git a/dd-java-agent/agent-llmobs/src/main/java/datadog/trace/llmobs/domain/DDLLMObsSpan.java b/dd-java-agent/agent-llmobs/src/main/java/datadog/trace/llmobs/domain/DDLLMObsSpan.java index 13d81701cd1..ac304698652 100644 --- a/dd-java-agent/agent-llmobs/src/main/java/datadog/trace/llmobs/domain/DDLLMObsSpan.java +++ b/dd-java-agent/agent-llmobs/src/main/java/datadog/trace/llmobs/domain/DDLLMObsSpan.java @@ -122,16 +122,16 @@ public DDLLMObsSpan( } span.setTag(LLMOBS_TAG_PREFIX + PARENT_ID_TAG_INTERNAL, parentSpanID); // Propagate the effective sessionId to descendant LLMObs spans via the context. - scope = LLMObsContext.attach(span.context(), sessionId); + scope = LLMObsContext.attach(span.spanContext(), sessionId); } @Override public String toString() { return super.toString() + ", trace_id=" - + span.context().getTraceId() + + span.spanContext().getTraceId() + ", span_id=" - + span.context().getSpanId() + + span.spanContext().getSpanId() + ", ml_app=" + span.getTag(LLMObsTags.ML_APP) + ", service=" diff --git a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelSpan.java b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelSpan.java index ffe6cce4ea6..34bf7f2a486 100644 --- a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelSpan.java +++ b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelSpan.java @@ -47,7 +47,7 @@ public OtelSpan(AgentSpan delegate) { } this.statusCode = UNSET; this.recording = true; - delegate.context().setIntegrationName("otel"); + delegate.spanContext().setIntegrationName("otel"); } public static Span invalid() { @@ -168,7 +168,7 @@ public AgentScope activate() { } public AgentSpanContext getAgentSpanContext() { - return this.delegate.context(); + return this.delegate.spanContext(); } @Override diff --git a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelSpanContext.java b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelSpanContext.java index 759e3ac4910..8a39a88b1dd 100644 --- a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelSpanContext.java +++ b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelSpanContext.java @@ -24,7 +24,7 @@ public OtelSpanContext( } public static SpanContext fromLocalSpan(AgentSpan span) { - AgentSpanContext delegate = span.context(); + AgentSpanContext delegate = span.spanContext(); AgentSpan localRootSpan = span.getLocalRootSpan(); Integer samplingPriority = localRootSpan.getSamplingPriority(); boolean sampled = samplingPriority != null && samplingPriority > 0; diff --git a/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/InstrumentationSpecification.groovy b/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/InstrumentationSpecification.groovy index be0b321216e..8f1a6cd6df4 100644 --- a/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/InstrumentationSpecification.groovy +++ b/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/InstrumentationSpecification.groovy @@ -624,7 +624,7 @@ abstract class InstrumentationSpecification extends DDSpecification implements A static void blockUntilChildSpansFinished(AgentSpan span, int numberOfSpans) { if (span instanceof DDSpan) { - def traceCollector = ((DDSpan) span).context().getTraceCollector() + def traceCollector = ((DDSpan) span).spanContext().getTraceCollector() if (!(traceCollector instanceof PendingTrace)) { throw new IllegalStateException("Expected $PendingTrace.name trace collector, got $traceCollector.class.name") } diff --git a/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/TrackingSpanDecorator.groovy b/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/TrackingSpanDecorator.groovy index a3aee830cf8..b9de4adad0e 100644 --- a/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/TrackingSpanDecorator.groovy +++ b/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/TrackingSpanDecorator.groovy @@ -261,8 +261,8 @@ class TrackingSpanDecorator implements AgentSpan { } @Override - AgentSpanContext context() { - return delegate.context() + AgentSpanContext spanContext() { + return delegate.spanContext() } @Override diff --git a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/AbstractInstrumentationTest.java b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/AbstractInstrumentationTest.java index a82c8319abd..5f724853972 100644 --- a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/AbstractInstrumentationTest.java +++ b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/AbstractInstrumentationTest.java @@ -196,7 +196,7 @@ protected void blockUntilChildSpansFinished(int numberOfSpans) { static void blockUntilChildSpansFinished(AgentSpan span, int numberOfSpans) { if (span instanceof DDSpan) { - TraceCollector traceCollector = ((DDSpan) span).context().getTraceCollector(); + TraceCollector traceCollector = ((DDSpan) span).spanContext().getTraceCollector(); if (!(traceCollector instanceof PendingTrace)) { throw new IllegalStateException( "Expected PendingTrace trace collector, got " + traceCollector.getClass().getName()); diff --git a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/SpanLinkMatcher.java b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/SpanLinkMatcher.java index ef70ace9764..c940565629c 100644 --- a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/SpanLinkMatcher.java +++ b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/SpanLinkMatcher.java @@ -37,7 +37,7 @@ private SpanLinkMatcher(Matcher traceIdMatcher, Matcher spanIdM * @return A {@code SpanLinkMatcher} that matches a span link to the given span. */ public static SpanLinkMatcher to(DDSpan span) { - return to(span.context()); + return to(span.spanContext()); } /** diff --git a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/TracingServerInterceptor.java b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/TracingServerInterceptor.java index be36634f48e..9661d73feaf 100644 --- a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/TracingServerInterceptor.java +++ b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/TracingServerInterceptor.java @@ -150,7 +150,7 @@ public static final class TracingServerCallListener @Override public void onMessage(final ReqT message) { final AgentSpan msgSpan = - startSpan(DECORATE.instrumentationNames()[0], GRPC_MESSAGE, this.span.context()) + startSpan(DECORATE.instrumentationNames()[0], GRPC_MESSAGE, this.span.spanContext()) .setTag("message.type", message.getClass().getName()); DECORATE.afterStart(msgSpan); try (AgentScope scope = activateSpan(msgSpan)) { diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/TracingRequestHandler.java b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/TracingRequestHandler.java index 89b49fa2c1b..8cb0a054342 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/TracingRequestHandler.java +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/TracingRequestHandler.java @@ -135,8 +135,8 @@ private void dsmCheckpoint(AgentSpan span, String streamArn, Response respons PathwayContext pathwayContext = dataStreamsMonitoring.newPathwayContext(); DataStreamsContext dataStreamsContext = create(tags, arrivalTime.getTime(), 0); pathwayContext.setCheckpoint(dataStreamsContext, dataStreamsMonitoring::add); - if (!span.context().getPathwayContext().isStarted()) { - span.context().mergePathwayContext(pathwayContext); + if (!span.spanContext().getPathwayContext().isStarted()) { + span.spanContext().mergePathwayContext(pathwayContext); } } } diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsSdkClientDecorator.java b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsSdkClientDecorator.java index b0c92a6c8e7..1404e1f8e9c 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsSdkClientDecorator.java +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsSdkClientDecorator.java @@ -365,8 +365,8 @@ public Context onSdkResponse( pathwayContext.setCheckpoint( create(tags, arrivalTime.toEpochMilli(), 0), dataStreamsMonitoring::add); - if (!span.context().getPathwayContext().isStarted()) { - span.context().mergePathwayContext(pathwayContext); + if (!span.spanContext().getPathwayContext().isStarted()) { + span.spanContext().mergePathwayContext(pathwayContext); } } } diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingIterator.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingIterator.java index 1d6f379145e..58943212038 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingIterator.java +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingIterator.java @@ -96,7 +96,7 @@ protected void startNewMessageSpan(Message message) { MILLISECONDS.toMicros(timeInQueueStart)); BROKER_DECORATE.afterStart(queueSpan); BROKER_DECORATE.onTimeInQueue(queueSpan, queueUrl); - spanContext = queueSpan.context(); + spanContext = queueSpan.spanContext(); // The queueSpan will be finished after inner span has been activated to ensure that // spans are written out together by TraceStructureWriter when running in strict mode } diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingIterator.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingIterator.java index 8a1214447c3..95018f1815a 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingIterator.java +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingIterator.java @@ -98,7 +98,7 @@ protected void startNewMessageSpan(Message message) { MILLISECONDS.toMicros(timeInQueueStart)); BROKER_DECORATE.afterStart(queueSpan); BROKER_DECORATE.onTimeInQueue(queueSpan, queueUrl, requestId); - spanContext = queueSpan.context(); + spanContext = queueSpan.spanContext(); // The queueSpan will be finished after inner span has been activated to ensure that // spans are written out together by TraceStructureWriter when running in strict mode } diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/DatadogRequestTracer.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/DatadogRequestTracer.java index 14c0105d31c..bd508d4bd85 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/DatadogRequestTracer.java +++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/DatadogRequestTracer.java @@ -52,7 +52,7 @@ public RequestSpan requestSpan(String requestName, RequestSpan requestParent) { AgentTracer.SpanBuilder builder = tracer.singleSpanBuilder("couchbase", spanName); if (null != parent) { - builder.asChildOf(parent.context()); + builder.asChildOf(parent.spanContext()); } AgentSpan span = builder.start(); CouchbaseClientDecorator.DECORATE.afterStart(span); diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/DatadogRequestTracer.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/DatadogRequestTracer.java index 6bdb7c0526a..8463e0e20b9 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/DatadogRequestTracer.java +++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/DatadogRequestTracer.java @@ -56,7 +56,7 @@ public RequestSpan requestSpan(String requestName, RequestSpan requestParent) { if (requestSpan == null) { AgentTracer.SpanBuilder builder = tracer.singleSpanBuilder("couchbase", spanName); if (null != parent) { - builder.asChildOf(parent.context()); + builder.asChildOf(parent.spanContext()); } AgentSpan span = builder.start(); CouchbaseClientDecorator.DECORATE.afterStart(span); diff --git a/dd-java-agent/instrumentation/dropwizard/dropwizard-views-0.7/src/main/java/datadog/trace/instrumentation/dropwizard/view/DropwizardViewInstrumentation.java b/dd-java-agent/instrumentation/dropwizard/dropwizard-views-0.7/src/main/java/datadog/trace/instrumentation/dropwizard/view/DropwizardViewInstrumentation.java index 3e88551ebc2..119516a05f3 100644 --- a/dd-java-agent/instrumentation/dropwizard/dropwizard-views-0.7/src/main/java/datadog/trace/instrumentation/dropwizard/view/DropwizardViewInstrumentation.java +++ b/dd-java-agent/instrumentation/dropwizard/dropwizard-views-0.7/src/main/java/datadog/trace/instrumentation/dropwizard/view/DropwizardViewInstrumentation.java @@ -71,7 +71,7 @@ public static AgentScope onEnter( } final AgentSpan span = startSpan("dropwizard-view", "view.render").setTag(Tags.COMPONENT, "dropwizard-view"); - span.context().setIntegrationName("dropwizard-view"); + span.spanContext().setIntegrationName("dropwizard-view"); span.setResourceName("View " + view.getTemplateName()); return activateSpan(span); } diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/src/main/java/datadog/trace/instrumentation/graphqljava14/GraphQLInstrumentation.java b/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/src/main/java/datadog/trace/instrumentation/graphqljava14/GraphQLInstrumentation.java index c7f0abf0705..14c2753d1c0 100644 --- a/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/src/main/java/datadog/trace/instrumentation/graphqljava14/GraphQLInstrumentation.java +++ b/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/src/main/java/datadog/trace/instrumentation/graphqljava14/GraphQLInstrumentation.java @@ -102,7 +102,7 @@ public InstrumentationContext beginParse( InstrumentationExecutionParameters parameters) { State state = parameters.getInstrumentationState(); final AgentSpan parsingSpan = - startSpan(GRAPHQL_JAVA.toString(), GRAPHQL_PARSING, state.getRequestSpan().context()); + startSpan(GRAPHQL_JAVA.toString(), GRAPHQL_PARSING, state.getRequestSpan().spanContext()); DECORATE.afterStart(parsingSpan); return new ParsingInstrumentationContext(parsingSpan, state, parameters.getQuery()); } @@ -113,7 +113,8 @@ public InstrumentationContext> beginValidation( State state = parameters.getInstrumentationState(); final AgentSpan validationSpan = - startSpan(GRAPHQL_JAVA.toString(), GRAPHQL_VALIDATION, state.getRequestSpan().context()); + startSpan( + GRAPHQL_JAVA.toString(), GRAPHQL_VALIDATION, state.getRequestSpan().spanContext()); DECORATE.afterStart(validationSpan); return new ValidationInstrumentationContext(validationSpan); } diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/src/main/java/datadog/trace/instrumentation/graphqljava20/GraphQLInstrumentation.java b/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/src/main/java/datadog/trace/instrumentation/graphqljava20/GraphQLInstrumentation.java index 0e736c6e4fb..5a88ec3dd81 100644 --- a/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/src/main/java/datadog/trace/instrumentation/graphqljava20/GraphQLInstrumentation.java +++ b/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/src/main/java/datadog/trace/instrumentation/graphqljava20/GraphQLInstrumentation.java @@ -120,7 +120,7 @@ public InstrumentationContext beginParse( AgentTracer.startSpan( GraphQLDecorator.GRAPHQL_JAVA.toString(), GraphQLDecorator.GRAPHQL_PARSING, - state.getRequestSpan().context()); + state.getRequestSpan().spanContext()); GraphQLDecorator.DECORATE.afterStart(parsingSpan); return new ParsingInstrumentationContext(parsingSpan, state, parameters.getQuery()); } @@ -137,7 +137,7 @@ public InstrumentationContext> beginValidation( AgentTracer.startSpan( GraphQLDecorator.GRAPHQL_JAVA.toString(), GraphQLDecorator.GRAPHQL_VALIDATION, - state.getRequestSpan().context()); + state.getRequestSpan().spanContext()); GraphQLDecorator.DECORATE.afterStart(validationSpan); return new ValidationInstrumentationContext(validationSpan); } diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/InstrumentedDataFetcher.java b/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/InstrumentedDataFetcher.java index 8faacaf0f32..3d74cb5f8a4 100644 --- a/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/InstrumentedDataFetcher.java +++ b/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/InstrumentedDataFetcher.java @@ -36,7 +36,7 @@ public Object get(DataFetchingEnvironment environment) throws Exception { } } else { final AgentSpan fieldSpan = - startSpan(GRAPHQL_JAVA.toString(), "graphql.field", this.requestSpan.context()); + startSpan(GRAPHQL_JAVA.toString(), "graphql.field", this.requestSpan.spanContext()); DECORATE.afterStart(fieldSpan); String parentType = GraphQLTypeUtil.simplePrint(environment.getParentType()); String fieldName = environment.getField().getName(); diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/TracingServerInterceptor.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/TracingServerInterceptor.java index db605914bb9..4726080cbe2 100644 --- a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/TracingServerInterceptor.java +++ b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/TracingServerInterceptor.java @@ -151,7 +151,7 @@ static final class TracingServerCallListener @Override public void onMessage(final ReqT message) { final AgentSpan msgSpan = - startSpan(COMPONENT_NAME.toString(), GRPC_MESSAGE, this.span.context()) + startSpan(COMPONENT_NAME.toString(), GRPC_MESSAGE, this.span.spanContext()) .setTag("message.type", message.getClass().getName()); DECORATE.afterStart(msgSpan); try (AgentScope scope = activateSpan(msgSpan)) { diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-common/src/main/java/datadog/trace/instrumentation/hibernate/SessionMethodUtils.java b/dd-java-agent/instrumentation/hibernate/hibernate-common/src/main/java/datadog/trace/instrumentation/hibernate/SessionMethodUtils.java index 2b95ae67ea9..ac81ce40f7b 100644 --- a/dd-java-agent/instrumentation/hibernate/hibernate-common/src/main/java/datadog/trace/instrumentation/hibernate/SessionMethodUtils.java +++ b/dd-java-agent/instrumentation/hibernate/hibernate-common/src/main/java/datadog/trace/instrumentation/hibernate/SessionMethodUtils.java @@ -42,7 +42,7 @@ public static SessionState startScopeFrom( final AgentScope scope; if (createSpan) { final AgentSpan span = - startSpan("java-hibernate", operationName, sessionState.getSessionSpan().context()); + startSpan("java-hibernate", operationName, sessionState.getSessionSpan().spanContext()); DECORATOR.afterStart(span); DECORATOR.onOperation(span, entity); scope = activateSpan(span); diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ProcessImplStartAdvice.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ProcessImplStartAdvice.java index ca368998c25..4ddccaf80a0 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ProcessImplStartAdvice.java +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ProcessImplStartAdvice.java @@ -30,7 +30,7 @@ public static AgentSpan beforeStart( span.setSpanType("system"); span.setResourceName(ProcessImplInstrumentationHelpers.determineResource(command)); span.setTag("component", "subprocess"); - span.context().setIntegrationName("subprocess"); + span.spanContext().setIntegrationName("subprocess"); ProcessImplInstrumentationHelpers.setTags(span, command); ProcessImplInstrumentationHelpers.cmdiRaspCheck(command); return span; diff --git a/dd-java-agent/instrumentation/jboss/jboss-logmanager-1.1/src/main/java/datadog/trace/instrumentation/jbosslogmanager/LoggerNodeInstrumentation.java b/dd-java-agent/instrumentation/jboss/jboss-logmanager-1.1/src/main/java/datadog/trace/instrumentation/jbosslogmanager/LoggerNodeInstrumentation.java index ea9bf2758ae..4e8cc81ef37 100644 --- a/dd-java-agent/instrumentation/jboss/jboss-logmanager-1.1/src/main/java/datadog/trace/instrumentation/jbosslogmanager/LoggerNodeInstrumentation.java +++ b/dd-java-agent/instrumentation/jboss/jboss-logmanager-1.1/src/main/java/datadog/trace/instrumentation/jbosslogmanager/LoggerNodeInstrumentation.java @@ -56,7 +56,7 @@ public static boolean attachContext(@Advice.Argument(0) ExtLogRecord record) { if (span != null && traceConfig(span).isLogsInjectionEnabled()) { InstrumentationContext.get(ExtLogRecord.class, AgentSpanContext.class) - .put(record, span.context()); + .put(record, span.spanContext()); } return true; diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/JDBCDecorator.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/JDBCDecorator.java index 439249c37be..76aacf64d5f 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/JDBCDecorator.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/JDBCDecorator.java @@ -276,7 +276,7 @@ private AgentSpan withQueryInfo(AgentSpan span, DBQueryInfo info, CharSequence c } else { span.setResourceName(DB_QUERY); } - span.context().setIntegrationName(component); + span.spanContext().setIntegrationName(component); return span.setTag(Tags.COMPONENT, component); } diff --git a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/DatadogMessageListener.java b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/DatadogMessageListener.java index 954dec71ad0..c597552fb27 100644 --- a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/DatadogMessageListener.java +++ b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/DatadogMessageListener.java @@ -58,7 +58,7 @@ public void onMessage(Message message) { consumerState.getBrokerServiceName()); consumerState.setTimeInQueueSpan(batchId, timeInQueue); } - span = startSpan("jms", JMS_CONSUME, timeInQueue.context()); + span = startSpan("jms", JMS_CONSUME, timeInQueue.spanContext()); } CONSUMER_DECORATE.afterStart(span); CONSUMER_DECORATE.onConsume(span, message, consumerState.getConsumerResourceName()); diff --git a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JMSMessageConsumerInstrumentation.java b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JMSMessageConsumerInstrumentation.java index 75a59e7406d..707876869db 100644 --- a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JMSMessageConsumerInstrumentation.java +++ b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JMSMessageConsumerInstrumentation.java @@ -156,7 +156,7 @@ public static void afterReceive( consumerState.getBrokerServiceName()); consumerState.setTimeInQueueSpan(batchId, timeInQueue); } - span = startSpan("jms", JMS_CONSUME, timeInQueue.context()); + span = startSpan("jms", JMS_CONSUME, timeInQueue.spanContext()); } CONSUMER_DECORATE.afterStart(span); diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java index 1887e0a5205..b425b7a67c6 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java @@ -287,7 +287,7 @@ public static class PayloadSizeAdvice { */ @Advice.OnMethodEnter(suppress = Throwable.class) public static void onEnter(@Advice.Argument(value = 0) int estimatedPayloadSize) { - StatsPoint saved = activeSpan().context().getPathwayContext().getSavedStats(); + StatsPoint saved = activeSpan().spanContext().getPathwayContext().getSavedStats(); if (saved != null) { // create new stats including the payload size StatsPoint updated = diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TracingIterator.java b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TracingIterator.java index bbf30914e3b..ada3c0f31c6 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TracingIterator.java +++ b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TracingIterator.java @@ -115,7 +115,7 @@ protected void startNewRecordSpan(ConsumerRecord val) { MILLISECONDS.toMicros(timeInQueueStart)); BROKER_DECORATE.afterStart(queueSpan); BROKER_DECORATE.onTimeInQueue(queueSpan, val); - span = startSpan(JAVA_KAFKA.toString(), operationName, queueSpan.context()); + span = startSpan(JAVA_KAFKA.toString(), operationName, queueSpan.spanContext()); BROKER_DECORATE.beforeFinish(queueSpan); // The queueSpan will be finished after inner span has been activated to ensure that // spans are written out together by TraceStructureWriter when running in strict mode diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/PayloadSizeAdvice.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/PayloadSizeAdvice.java index 7db4e95e711..3b4effb3979 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/PayloadSizeAdvice.java +++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/PayloadSizeAdvice.java @@ -15,7 +15,7 @@ public class PayloadSizeAdvice { */ @Advice.OnMethodEnter(suppress = Throwable.class) public static void onEnter(@Advice.Argument(value = 0) int estimatedPayloadSize) { - StatsPoint saved = activeSpan().context().getPathwayContext().getSavedStats(); + StatsPoint saved = activeSpan().spanContext().getPathwayContext().getSavedStats(); if (saved != null) { // create new stats including the payload size StatsPoint updated = diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/TracingIterator.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/TracingIterator.java index eb1f0633908..e38094ac392 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/TracingIterator.java +++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/TracingIterator.java @@ -111,7 +111,7 @@ protected void startNewRecordSpan(ConsumerRecord val) { MILLISECONDS.toMicros(timeInQueueStart)); KafkaDecorator.BROKER_DECORATE.afterStart(queueSpan); KafkaDecorator.BROKER_DECORATE.onTimeInQueue(queueSpan, val); - span = startSpan(JAVA_KAFKA.toString(), operationName, queueSpan.context()); + span = startSpan(JAVA_KAFKA.toString(), operationName, queueSpan.spanContext()); KafkaDecorator.BROKER_DECORATE.beforeFinish(queueSpan); // The queueSpan will be finished after inner span has been activated to ensure that // spans are written out together by TraceStructureWriter when running in strict mode diff --git a/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamTaskInstrumentation.java b/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamTaskInstrumentation.java index 26da9ec0018..4c3f94ee210 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamTaskInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamTaskInstrumentation.java @@ -288,7 +288,7 @@ public static void start( JAVA_KAFKA.toString(), KAFKA_DELIVER, MILLISECONDS.toMicros(timeInQueueStart)); BROKER_DECORATE.afterStart(queueSpan); BROKER_DECORATE.onTimeInQueue(queueSpan, record); - span = startSpan(JAVA_KAFKA.toString(), KAFKA_CONSUME, queueSpan.context()); + span = startSpan(JAVA_KAFKA.toString(), KAFKA_CONSUME, queueSpan.spanContext()); BROKER_DECORATE.beforeFinish(queueSpan); // The queueSpan will be finished after inner span has been activated to ensure that // spans are written out together by TraceStructureWriter when running in strict mode @@ -354,7 +354,7 @@ public static void start( JAVA_KAFKA.toString(), KAFKA_DELIVER, MILLISECONDS.toMicros(timeInQueueStart)); BROKER_DECORATE.afterStart(queueSpan); BROKER_DECORATE.onTimeInQueue(queueSpan, record); - span = startSpan(JAVA_KAFKA.toString(), KAFKA_CONSUME, queueSpan.context()); + span = startSpan(JAVA_KAFKA.toString(), KAFKA_CONSUME, queueSpan.spanContext()); BROKER_DECORATE.beforeFinish(queueSpan); // The queueSpan will be finished after inner span has been activated to ensure that // spans are written out together by TraceStructureWriter when running in strict mode diff --git a/dd-java-agent/instrumentation/karate-1.0/src/main/java/datadog/trace/instrumentation/karate/KarateTracingHook.java b/dd-java-agent/instrumentation/karate-1.0/src/main/java/datadog/trace/instrumentation/karate/KarateTracingHook.java index 1f56a1e7ebb..542d82ef641 100644 --- a/dd-java-agent/instrumentation/karate-1.0/src/main/java/datadog/trace/instrumentation/karate/KarateTracingHook.java +++ b/dd-java-agent/instrumentation/karate-1.0/src/main/java/datadog/trace/instrumentation/karate/KarateTracingHook.java @@ -205,7 +205,7 @@ public boolean beforeStep(Step step, ScenarioRuntime sr) { String stepName = step.getPrefix() + " " + step.getText(); span.setResourceName(stepName); span.setTag(Tags.COMPONENT, "karate"); - span.context().setIntegrationName("karate"); + span.spanContext().setIntegrationName("karate"); span.setTag("step.name", stepName); span.setTag("step.startLine", step.getLine()); span.setTag("step.endLine", step.getEndLine()); diff --git a/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/latestDepTest/groovy/KotlinCoroutineInstrumentationTest.groovy b/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/latestDepTest/groovy/KotlinCoroutineInstrumentationTest.groovy index 23f5c86bf70..04cc6b46e93 100644 --- a/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/latestDepTest/groovy/KotlinCoroutineInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/latestDepTest/groovy/KotlinCoroutineInstrumentationTest.groovy @@ -19,8 +19,8 @@ class KotlinCoroutineInstrumentationTest extends AbstractKotlinCoroutineInstrume expect: trace.size() == expectedNumberOfSpans trace[0].resourceName.toString() == "KotlinCoroutineTests.tracedAcrossFlows" - findSpan(trace, "produce_2").context().getParentId() == trace[0].context().getSpanId() - findSpan(trace, "consume_2").context().getParentId() == trace[0].context().getSpanId() + findSpan(trace, "produce_2").spanContext().getParentId() == trace[0].spanContext().getSpanId() + findSpan(trace, "consume_2").spanContext().getParentId() == trace[0].spanContext().getSpanId() where: [dispatcherName, dispatcher] << dispatchersToTest @@ -36,8 +36,8 @@ class KotlinCoroutineInstrumentationTest extends AbstractKotlinCoroutineInstrume expect: trace.size() == expectedNumberOfSpans trace[0].resourceName.toString() == "KotlinCoroutineTests.tracedAcrossFlows" - findSpan(trace, "produce_2").context().getParentId() == trace[0].context().getSpanId() - findSpan(trace, "consume_2").context().getParentId() == trace[0].context().getSpanId() + findSpan(trace, "produce_2").spanContext().getParentId() == trace[0].spanContext().getSpanId() + findSpan(trace, "consume_2").spanContext().getParentId() == trace[0].spanContext().getSpanId() where: [dispatcherName, dispatcher] << dispatchersToTest diff --git a/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/test/groovy/KotlinCoroutineInstrumentationTest.groovy b/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/test/groovy/KotlinCoroutineInstrumentationTest.groovy index d905b9d87f8..096cf1b7ca1 100644 --- a/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/test/groovy/KotlinCoroutineInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/test/groovy/KotlinCoroutineInstrumentationTest.groovy @@ -22,8 +22,8 @@ class KotlinCoroutineInstrumentationTest extends AbstractKotlinCoroutineInstrume expect: trace.size() == expectedNumberOfSpans trace[0].resourceName.toString() == "KotlinCoroutineTests.tracedAcrossChannels" - findSpan(trace, "produce_2").context().getParentId() == trace[0].context().getSpanId() - findSpan(trace, "consume_2").context().getParentId() == trace[0].context().getSpanId() + findSpan(trace, "produce_2").spanContext().getParentId() == trace[0].spanContext().getSpanId() + findSpan(trace, "consume_2").spanContext().getParentId() == trace[0].spanContext().getSpanId() where: [dispatcherName, dispatcher] << dispatchersToTest diff --git a/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/testFixtures/groovy/datadog/trace/instrumentation/kotlin/coroutines/AbstractKotlinCoroutineInstrumentationTest.groovy b/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/testFixtures/groovy/datadog/trace/instrumentation/kotlin/coroutines/AbstractKotlinCoroutineInstrumentationTest.groovy index a8d62eafa6b..4298933db84 100644 --- a/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/testFixtures/groovy/datadog/trace/instrumentation/kotlin/coroutines/AbstractKotlinCoroutineInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/testFixtures/groovy/datadog/trace/instrumentation/kotlin/coroutines/AbstractKotlinCoroutineInstrumentationTest.groovy @@ -30,7 +30,7 @@ abstract class AbstractKotlinCoroutineInstrumentationTest list, StringMap reusable) { } if (span != null) { - DDTraceId traceId = span.context().getTraceId(); + DDTraceId traceId = span.spanContext().getTraceId(); String traceIdValue = Config.get().isLogs128bitTraceIdEnabled() && traceId.toHighOrderLong() != 0 ? traceId.toHexString() : traceId.toString(); newContextData.putValue(CorrelationIdentifier.getTraceIdKey(), traceIdValue); newContextData.putValue( - CorrelationIdentifier.getSpanIdKey(), DDSpanId.toString(span.context().getSpanId())); + CorrelationIdentifier.getSpanIdKey(), DDSpanId.toString(span.spanContext().getSpanId())); } newContextData.putAll(contextData); diff --git a/dd-java-agent/instrumentation/logback-1.0/src/main/java/datadog/trace/instrumentation/logback/LogbackLoggerInstrumentation.java b/dd-java-agent/instrumentation/logback-1.0/src/main/java/datadog/trace/instrumentation/logback/LogbackLoggerInstrumentation.java index 7c3b9e6435d..b759323f9bd 100644 --- a/dd-java-agent/instrumentation/logback-1.0/src/main/java/datadog/trace/instrumentation/logback/LogbackLoggerInstrumentation.java +++ b/dd-java-agent/instrumentation/logback-1.0/src/main/java/datadog/trace/instrumentation/logback/LogbackLoggerInstrumentation.java @@ -78,7 +78,7 @@ public static void onEnter(@Advice.Argument(0) ILoggingEvent event) { if (span != null && traceConfig(span).isLogsInjectionEnabled()) { InstrumentationContext.get(ILoggingEvent.class, AgentSpanContext.class) - .put(event, span.context()); + .put(event, span.spanContext()); } } } diff --git a/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/MuleDecorator.java b/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/MuleDecorator.java index dd2645d04db..84db07d3e55 100644 --- a/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/MuleDecorator.java +++ b/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/MuleDecorator.java @@ -70,7 +70,7 @@ public AgentSpan onMuleSpan( if (parentSpan == null) { span = startSpan("mule", OPERATION_NAME); } else { - span = startSpan("mule", OPERATION_NAME, parentSpan.context()); + span = startSpan("mule", OPERATION_NAME, parentSpan.spanContext()); } // here we have to use the forEachAttribute since each specialized InitialSpanInfo class can add // different things through this method. Using the map version is not the same. diff --git a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelFutureListenerInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelFutureListenerInstrumentation.java index ba6060fced0..2757b52f7d9 100644 --- a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelFutureListenerInstrumentation.java +++ b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelFutureListenerInstrumentation.java @@ -109,7 +109,7 @@ public static AgentScope activateScope(@Advice.Argument(0) final ChannelFuture f final AgentScope parentScope = continuation.activate(); final AgentSpan errorSpan = startSpan("netty", NETTY_CONNECT).setTag(Tags.COMPONENT, "netty"); - errorSpan.context().setIntegrationName(NETTY); + errorSpan.spanContext().setIntegrationName(NETTY); try (final ContextScope scope = getCurrentContext().with(errorSpan).attach()) { DECORATE.onError(errorSpan, cause); DECORATE.beforeFinish(scope.context()); diff --git a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/ChannelFutureListenerInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/ChannelFutureListenerInstrumentation.java index b0be195bdfb..0bb84c90181 100644 --- a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/ChannelFutureListenerInstrumentation.java +++ b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/ChannelFutureListenerInstrumentation.java @@ -94,7 +94,7 @@ public static AgentScope activateScope(@Advice.Argument(0) final ChannelFuture f final AgentScope parentScope = continuation.activate(); final AgentSpan errorSpan = startSpan("netty", NETTY_CONNECT).setTag(Tags.COMPONENT, "netty"); - errorSpan.context().setIntegrationName(NETTY); + errorSpan.spanContext().setIntegrationName(NETTY); try (final ContextScope scope = getCurrentContext().with(errorSpan).attach()) { NettyHttpServerDecorator.DECORATE.onError(errorSpan, cause); NettyHttpServerDecorator.DECORATE.beforeFinish(scope.context()); diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/ChannelFutureListenerInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/ChannelFutureListenerInstrumentation.java index 831166a7923..1239363a25e 100644 --- a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/ChannelFutureListenerInstrumentation.java +++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/ChannelFutureListenerInstrumentation.java @@ -94,7 +94,7 @@ public static AgentScope activateScope(@Advice.Argument(0) final ChannelFuture f final AgentScope parentScope = continuation.activate(); final AgentSpan errorSpan = startSpan("netty", NETTY_CONNECT).setTag(Tags.COMPONENT, "netty"); - errorSpan.context().setIntegrationName(NETTY); + errorSpan.spanContext().setIntegrationName(NETTY); try (final ContextScope scope = getCurrentContext().with(errorSpan).attach()) { NettyHttpServerDecorator.DECORATE.onError(errorSpan, cause); NettyHttpServerDecorator.DECORATE.beforeFinish(scope.context()); diff --git a/dd-java-agent/instrumentation/ognl-appsec-3.3.2/src/main/java/datadog/trace/instrumentation/ognl/OgnlInstrumentation.java b/dd-java-agent/instrumentation/ognl-appsec-3.3.2/src/main/java/datadog/trace/instrumentation/ognl/OgnlInstrumentation.java index 32978abf35d..031ecd4982a 100644 --- a/dd-java-agent/instrumentation/ognl-appsec-3.3.2/src/main/java/datadog/trace/instrumentation/ognl/OgnlInstrumentation.java +++ b/dd-java-agent/instrumentation/ognl-appsec-3.3.2/src/main/java/datadog/trace/instrumentation/ognl/OgnlInstrumentation.java @@ -41,7 +41,7 @@ static void before(@Advice.Argument(0) String expression) { return; } - AgentSpan agentSpan = startSpan("ognl", "ognl.parse", parentSpan.context()); + AgentSpan agentSpan = startSpan("ognl", "ognl.parse", parentSpan.spanContext()); agentSpan.setTag("ognl.expression", expression); agentSpan.finish(); } diff --git a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/test/java/datadog/trace/instrumentation/openai_java/SessionIdPropagationForkedTest.java b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/test/java/datadog/trace/instrumentation/openai_java/SessionIdPropagationForkedTest.java index 581d6f3b459..19695ee9ea7 100644 --- a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/test/java/datadog/trace/instrumentation/openai_java/SessionIdPropagationForkedTest.java +++ b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/test/java/datadog/trace/instrumentation/openai_java/SessionIdPropagationForkedTest.java @@ -78,7 +78,8 @@ void openAiRequestSpanInheritsSessionIdFromActiveContext() throws Exception { AgentSpan parentSpan = AgentTracer.startSpan("test", "parent"); try (AgentScope ignored1 = AgentTracer.activateSpan(parentSpan)) { - try (ContextScope ignored2 = LLMObsContext.attach(parentSpan.context(), expectedSessionId)) { + try (ContextScope ignored2 = + LLMObsContext.attach(parentSpan.spanContext(), expectedSessionId)) { try { openAiClient.chat().completions().create(buildMinimalChatParams()); } catch (Exception ignored) { diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelSpan.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelSpan.java index 1920f28553c..66590e18cc2 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelSpan.java +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelSpan.java @@ -112,7 +112,7 @@ public void end(final EndSpanOptions endOptions) { @Override public SpanContext getContext() { - return converter.toSpanContext(delegate.context()); + return converter.toSpanContext(delegate.spanContext()); } @Override diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelTracer.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelTracer.java index 5d4bccb6244..529ec13aa65 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelTracer.java +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelTracer.java @@ -58,7 +58,7 @@ public SpanBuilder(final String spanName) { @Override public Span.Builder setParent(final Span parent) { parentSet = true; - delegate.asChildOf(converter.toAgentSpan(parent).context()); + delegate.asChildOf(converter.toAgentSpan(parent).spanContext()); return this; } @@ -163,7 +163,7 @@ public Span.Builder setStartTimestamp(final long startTimestamp) { @Override public Span startSpan() { final AgentSpan agentSpan = delegate.start(); - agentSpan.context().setIntegrationName("otel"); + agentSpan.spanContext().setIntegrationName("otel"); return converter.toSpan(agentSpan); } } diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/test/groovy/OpenTelemetryTest.groovy b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/test/groovy/OpenTelemetryTest.groovy index 3f24dad8eb5..62f315e6191 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/test/groovy/OpenTelemetryTest.groovy +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/test/groovy/OpenTelemetryTest.groovy @@ -82,7 +82,7 @@ class OpenTelemetryTest extends InstrumentationSpecification { } defaultTags() } - assert span.context().integrationName == "otel" + assert span.spanContext().integrationName == "otel" } } } diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/OpenTelemetry14Test.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/OpenTelemetry14Test.java index 847e4b16e71..9115cd1d046 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/OpenTelemetry14Test.java +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/OpenTelemetry14Test.java @@ -590,7 +590,7 @@ void testIntegrationName() throws Exception { writer.waitForTraces(1); DDSpan ddSpan = writer.firstTrace().get(0); - assertEquals("otel", ddSpan.context().getIntegrationName().toString()); + assertEquals("otel", ddSpan.spanContext().getIntegrationName().toString()); } static Stream testSpanKindsArguments() { diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/OTSpan.java b/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/OTSpan.java index fcdb7b759dc..e33c98fb54f 100644 --- a/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/OTSpan.java +++ b/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/OTSpan.java @@ -30,7 +30,7 @@ class OTSpan implements Span, MutableSpan, WithAgentSpan, SpanWrapper { @Override public SpanContext context() { - return converter.toSpanContext(delegate.context()); + return converter.toSpanContext(delegate.spanContext()); } @Override diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/OTTracer.java b/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/OTTracer.java index 1a121799024..32f62c86832 100644 --- a/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/OTTracer.java +++ b/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/OTTracer.java @@ -89,7 +89,7 @@ public Tracer.SpanBuilder asChildOf(final SpanContext parent) { @Override public Tracer.SpanBuilder asChildOf(final Span parent) { if (parent != null) { - delegate.asChildOf(converter.toAgentSpan(parent).context()); + delegate.asChildOf(converter.toAgentSpan(parent).spanContext()); } return this; } @@ -151,14 +151,14 @@ public Span startManual() { @Override public Span start() { final AgentSpan agentSpan = delegate.start(); - agentSpan.context().setIntegrationName("opentracing"); + agentSpan.spanContext().setIntegrationName("opentracing"); return converter.toSpan(agentSpan); } @Override public Scope startActive(final boolean finishSpanOnClose) { final AgentSpan agentSpan = delegate.start(); - agentSpan.context().setIntegrationName("opentracing"); + agentSpan.spanContext().setIntegrationName("opentracing"); return converter.toScope(tracer.activateManualSpan(agentSpan), finishSpanOnClose); } } diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/test/groovy/OpenTracing31Test.groovy b/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/test/groovy/OpenTracing31Test.groovy index 2c41794bcaa..8080a809009 100644 --- a/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/test/groovy/OpenTracing31Test.groovy +++ b/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/test/groovy/OpenTracing31Test.groovy @@ -112,7 +112,7 @@ class OpenTracing31Test extends InstrumentationSpecification { } defaultTags(addReference != null) } - assert span.context().integrationName == "opentracing" + assert span.spanContext().integrationName == "opentracing" } } } diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/OTSpan.java b/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/OTSpan.java index 8fd4213eb16..b8e60b6b4b7 100644 --- a/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/OTSpan.java +++ b/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/OTSpan.java @@ -31,7 +31,7 @@ class OTSpan implements Span, MutableSpan, WithAgentSpan, SpanWrapper { @Override public SpanContext context() { - return converter.toSpanContext(delegate.context()); + return converter.toSpanContext(delegate.spanContext()); } @Override diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/OTTracer.java b/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/OTTracer.java index ab4e2ebea92..ba2ce8313c0 100644 --- a/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/OTTracer.java +++ b/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/OTTracer.java @@ -105,7 +105,7 @@ public Tracer.SpanBuilder asChildOf(final SpanContext parent) { @Override public Tracer.SpanBuilder asChildOf(final Span parent) { if (parent != null) { - delegate.asChildOf(converter.toAgentSpan(parent).context()); + delegate.asChildOf(converter.toAgentSpan(parent).spanContext()); } return this; } @@ -173,14 +173,14 @@ public Span startManual() { @Override public Span start() { final AgentSpan agentSpan = delegate.start(); - agentSpan.context().setIntegrationName("opentracing"); + agentSpan.spanContext().setIntegrationName("opentracing"); return converter.toSpan(agentSpan); } @Override public Scope startActive(final boolean finishSpanOnClose) { final AgentSpan agentSpan = delegate.start(); - agentSpan.context().setIntegrationName("opentracing"); + agentSpan.spanContext().setIntegrationName("opentracing"); return converter.toScope(tracer.activateManualSpan(agentSpan), finishSpanOnClose); } } diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/test/groovy/OpenTracing32Test.groovy b/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/test/groovy/OpenTracing32Test.groovy index e262f947a14..99aaddfe1e0 100644 --- a/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/test/groovy/OpenTracing32Test.groovy +++ b/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/test/groovy/OpenTracing32Test.groovy @@ -118,7 +118,7 @@ class OpenTracing32Test extends InstrumentationSpecification { } defaultTags(addReference != null) } - assert span.context().integrationName == "opentracing" + assert span.spanContext().integrationName == "opentracing" } } } diff --git a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitDecorator.java b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitDecorator.java index 78703cf9790..8f8a734cf13 100644 --- a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitDecorator.java +++ b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitDecorator.java @@ -204,7 +204,7 @@ public static AgentScope startReceivingSpan( String queue) { final Map headers = propagate && null != properties ? properties.getHeaders() : null; - AgentSpanContext parentContext = + AgentSpanContext parentSpanContext = null != headers ? extractContextAndGetSpanContext(headers, ContextVisitors.objectValuesMap()) : null; @@ -226,17 +226,18 @@ public static AgentScope startReceivingSpan( startSpan( RABBITMQ_AMQP.toString(), OPERATION_AMQP_DELIVER, - parentContext, + parentSpanContext, TimeUnit.MILLISECONDS.toMicros(queueStartMillis)); BROKER_DECORATE.afterStart(queueSpan); BROKER_DECORATE.onTimeInQueue(queueSpan, queue, body); - parentContext = queueSpan.context(); + parentSpanContext = queueSpan.spanContext(); BROKER_DECORATE.beforeFinish(queueSpan); // The queueSpan will be finished after the inner span has been activated to ensure that the // spans are written out together by the TraceStructureWriter when running in strict mode } final AgentSpan span = - startSpan(RABBITMQ_AMQP.toString(), OPERATION_AMQP_INBOUND, parentContext, spanStartMicros); + startSpan( + RABBITMQ_AMQP.toString(), OPERATION_AMQP_INBOUND, parentSpanContext, spanStartMicros); if (null != body) { span.setTag("message.size", body.length); diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-1.0/src/main/java/datadog/trace/instrumentation/rxjava/TracedOnSubscribe.java b/dd-java-agent/instrumentation/rxjava/rxjava-1.0/src/main/java/datadog/trace/instrumentation/rxjava/TracedOnSubscribe.java index e18502fa092..dadbb510029 100644 --- a/dd-java-agent/instrumentation/rxjava/rxjava-1.0/src/main/java/datadog/trace/instrumentation/rxjava/TracedOnSubscribe.java +++ b/dd-java-agent/instrumentation/rxjava/rxjava-1.0/src/main/java/datadog/trace/instrumentation/rxjava/TracedOnSubscribe.java @@ -35,7 +35,8 @@ protected String instrumentationName() { @Override public void call(final Subscriber subscriber) { final AgentSpan span = - startSpan(instrumentationName(), operationName, parent != null ? parent.context() : null); + startSpan( + instrumentationName(), operationName, parent != null ? parent.spanContext() : null); afterStart(span); try (final AgentScope scope = activateSpan(span)) { diff --git a/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/latestDepTest/groovy/ScalaInstrumentationTest.groovy b/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/latestDepTest/groovy/ScalaInstrumentationTest.groovy index 1f18e42508a..dfc848ec74e 100644 --- a/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/latestDepTest/groovy/ScalaInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/latestDepTest/groovy/ScalaInstrumentationTest.groovy @@ -19,10 +19,10 @@ class ScalaInstrumentationTest extends InstrumentationSpecification { expect: trace.size() == expectedNumberOfSpans trace[0].resourceName.toString() == "ScalaConcurrentTests.traceWithFutureAndCallbacks" - findSpan(trace, "goodFuture").context().getParentId() == trace[0].context().getSpanId() - findSpan(trace, "badFuture").context().getParentId() == trace[0].context().getSpanId() - findSpan(trace, "good complete").context().getParentId() == trace[0].context().getSpanId() - findSpan(trace, "bad complete").context().getParentId() == trace[0].context().getSpanId() + findSpan(trace, "goodFuture").spanContext().getParentId() == trace[0].spanContext().getSpanId() + findSpan(trace, "badFuture").spanContext().getParentId() == trace[0].spanContext().getSpanId() + findSpan(trace, "good complete").spanContext().getParentId() == trace[0].spanContext().getSpanId() + findSpan(trace, "bad complete").spanContext().getParentId() == trace[0].spanContext().getSpanId() } def "scala propagates across futures with no traces"() { @@ -35,7 +35,7 @@ class ScalaInstrumentationTest extends InstrumentationSpecification { expect: trace.size() == expectedNumberOfSpans trace[0].resourceName.toString() == "ScalaConcurrentTests.tracedAcrossThreadsWithNoTrace" - findSpan(trace, "callback").context().getParentId() == trace[0].context().getSpanId() + findSpan(trace, "callback").spanContext().getParentId() == trace[0].spanContext().getSpanId() } def "scala either promise completion"() { @@ -49,9 +49,9 @@ class ScalaInstrumentationTest extends InstrumentationSpecification { TEST_WRITER.size() == 1 trace.size() == expectedNumberOfSpans trace[0].resourceName.toString() == "ScalaConcurrentTests.traceWithPromises" - findSpan(trace, "keptPromise").context().getParentId() == trace[0].context().getSpanId() - findSpan(trace, "keptPromise2").context().getParentId() == trace[0].context().getSpanId() - findSpan(trace, "brokenPromise").context().getParentId() == trace[0].context().getSpanId() + findSpan(trace, "keptPromise").spanContext().getParentId() == trace[0].spanContext().getSpanId() + findSpan(trace, "keptPromise2").spanContext().getParentId() == trace[0].spanContext().getSpanId() + findSpan(trace, "brokenPromise").spanContext().getParentId() == trace[0].spanContext().getSpanId() } def "scala first completed future"() { @@ -64,9 +64,9 @@ class ScalaInstrumentationTest extends InstrumentationSpecification { expect: TEST_WRITER.size() == 1 trace.size() == expectedNumberOfSpans - findSpan(trace, "timeout1").context().getParentId() == trace[0].context().getSpanId() - findSpan(trace, "timeout2").context().getParentId() == trace[0].context().getSpanId() - findSpan(trace, "timeout3").context().getParentId() == trace[0].context().getSpanId() + findSpan(trace, "timeout1").spanContext().getParentId() == trace[0].spanContext().getSpanId() + findSpan(trace, "timeout2").spanContext().getParentId() == trace[0].spanContext().getSpanId() + findSpan(trace, "timeout3").spanContext().getParentId() == trace[0].spanContext().getSpanId() } private DDSpan findSpan(List trace, String opName) { diff --git a/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/test/groovy/ScalaInstrumentationTest.groovy b/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/test/groovy/ScalaInstrumentationTest.groovy index 1f18e42508a..dfc848ec74e 100644 --- a/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/test/groovy/ScalaInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/test/groovy/ScalaInstrumentationTest.groovy @@ -19,10 +19,10 @@ class ScalaInstrumentationTest extends InstrumentationSpecification { expect: trace.size() == expectedNumberOfSpans trace[0].resourceName.toString() == "ScalaConcurrentTests.traceWithFutureAndCallbacks" - findSpan(trace, "goodFuture").context().getParentId() == trace[0].context().getSpanId() - findSpan(trace, "badFuture").context().getParentId() == trace[0].context().getSpanId() - findSpan(trace, "good complete").context().getParentId() == trace[0].context().getSpanId() - findSpan(trace, "bad complete").context().getParentId() == trace[0].context().getSpanId() + findSpan(trace, "goodFuture").spanContext().getParentId() == trace[0].spanContext().getSpanId() + findSpan(trace, "badFuture").spanContext().getParentId() == trace[0].spanContext().getSpanId() + findSpan(trace, "good complete").spanContext().getParentId() == trace[0].spanContext().getSpanId() + findSpan(trace, "bad complete").spanContext().getParentId() == trace[0].spanContext().getSpanId() } def "scala propagates across futures with no traces"() { @@ -35,7 +35,7 @@ class ScalaInstrumentationTest extends InstrumentationSpecification { expect: trace.size() == expectedNumberOfSpans trace[0].resourceName.toString() == "ScalaConcurrentTests.tracedAcrossThreadsWithNoTrace" - findSpan(trace, "callback").context().getParentId() == trace[0].context().getSpanId() + findSpan(trace, "callback").spanContext().getParentId() == trace[0].spanContext().getSpanId() } def "scala either promise completion"() { @@ -49,9 +49,9 @@ class ScalaInstrumentationTest extends InstrumentationSpecification { TEST_WRITER.size() == 1 trace.size() == expectedNumberOfSpans trace[0].resourceName.toString() == "ScalaConcurrentTests.traceWithPromises" - findSpan(trace, "keptPromise").context().getParentId() == trace[0].context().getSpanId() - findSpan(trace, "keptPromise2").context().getParentId() == trace[0].context().getSpanId() - findSpan(trace, "brokenPromise").context().getParentId() == trace[0].context().getSpanId() + findSpan(trace, "keptPromise").spanContext().getParentId() == trace[0].spanContext().getSpanId() + findSpan(trace, "keptPromise2").spanContext().getParentId() == trace[0].spanContext().getSpanId() + findSpan(trace, "brokenPromise").spanContext().getParentId() == trace[0].spanContext().getSpanId() } def "scala first completed future"() { @@ -64,9 +64,9 @@ class ScalaInstrumentationTest extends InstrumentationSpecification { expect: TEST_WRITER.size() == 1 trace.size() == expectedNumberOfSpans - findSpan(trace, "timeout1").context().getParentId() == trace[0].context().getSpanId() - findSpan(trace, "timeout2").context().getParentId() == trace[0].context().getSpanId() - findSpan(trace, "timeout3").context().getParentId() == trace[0].context().getSpanId() + findSpan(trace, "timeout1").spanContext().getParentId() == trace[0].spanContext().getSpanId() + findSpan(trace, "timeout2").spanContext().getParentId() == trace[0].spanContext().getSpanId() + findSpan(trace, "timeout3").spanContext().getParentId() == trace[0].spanContext().getSpanId() } private DDSpan findSpan(List trace, String opName) { diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/AsyncContextInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/AsyncContextInstrumentation.java index afb9e2a0859..d1a2432d16d 100644 --- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/AsyncContextInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/AsyncContextInstrumentation.java @@ -98,7 +98,7 @@ public static boolean enter( } final AgentSpan span = - startSpan(JAVA_WEB_SERVLET_DISPATCHER.toString(), SERVLET_DISPATCH, parent.context()); + startSpan(JAVA_WEB_SERVLET_DISPATCHER.toString(), SERVLET_DISPATCH, parent.spanContext()); // This span should get finished by Servlet3Advice // However, when using Jetty without servlets (directly org.eclipse.jetty.server.Handler), // that's not the case (see jetty's HandleAdvice) diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherInstrumentation.java index f112ba27f41..60cf8a49c95 100644 --- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherInstrumentation.java @@ -103,11 +103,11 @@ public static ContextScope start( final AgentSpanContext parent; if (servletSpan == null || (parentSpan != null && servletSpan.isSameTrace(parentSpan))) { // Use the parentSpan if the servletSpan is null or part of the same trace. - parent = parentSpan.context(); + parent = parentSpan.spanContext(); } else { // parentSpan is part of a different trace, so lets ignore it. // This can happen with the way Tomcat does error handling. - parent = servletSpan.context(); + parent = servletSpan.spanContext(); } final AgentSpan span = diff --git a/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/AbstractDatadogSparkListener.java b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/AbstractDatadogSparkListener.java index 817aa1f0d84..33299fb944d 100644 --- a/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/AbstractDatadogSparkListener.java +++ b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/AbstractDatadogSparkListener.java @@ -478,12 +478,12 @@ private AgentSpan getOrCreateSqlSpan( if (batchKey != null) { AgentSpan batchSpan = getOrCreateStreamingBatchSpan(batchKey, queryStart.time(), jobProperties); - spanBuilder.asChildOf(batchSpan.context()); + spanBuilder.asChildOf(batchSpan.spanContext()); } else if (isRunningOnDatabricks) { addDatabricksSpecificTags(spanBuilder, jobProperties, true); } else { initApplicationSpanIfNotInitialized(); - spanBuilder.asChildOf(applicationSpan.context()); + spanBuilder.asChildOf(applicationSpan.spanContext()); } AgentSpan sqlSpan = spanBuilder.start(); @@ -523,18 +523,18 @@ public synchronized void onJobStart(SparkListenerJobStart jobStart) { * spark.job */ if (sqlSpan != null) { - jobSpanBuilder.asChildOf(sqlSpan.context()); + jobSpanBuilder.asChildOf(sqlSpan.spanContext()); } else if (batchKey != null) { isStreamingJob = true; AgentSpan batchSpan = getOrCreateStreamingBatchSpan(batchKey, jobStart.time(), jobStart.properties()); - jobSpanBuilder.asChildOf(batchSpan.context()); + jobSpanBuilder.asChildOf(batchSpan.spanContext()); } else if (isRunningOnDatabricks) { addDatabricksSpecificTags(jobSpanBuilder, jobStart.properties(), true); } else { // In non-databricks, non-streaming env, the spark application is the local root span initApplicationSpanIfNotInitialized(); - jobSpanBuilder.asChildOf(applicationSpan.context()); + jobSpanBuilder.asChildOf(applicationSpan.spanContext()); } jobSpanBuilder.withTag(DDTags.RESOURCE_NAME, getSparkJobName(jobStart)); @@ -623,7 +623,7 @@ public synchronized void onStageSubmitted(SparkListenerStageSubmitted stageSubmi AgentSpan stageSpan = buildSparkSpan("spark.stage", stageSubmitted.properties()) - .asChildOf(jobSpan.context()) + .asChildOf(jobSpan.spanContext()) .withStartTimestamp(submissionTimeMs * 1000) .withTag("stage_id", stageId) .withTag( @@ -778,7 +778,7 @@ private void sendTaskSpan( AgentSpan stageSpan, SparkListenerTaskEnd taskEnd, Properties properties) { AgentSpan taskSpan = buildSparkSpan("spark.task", properties) - .asChildOf(stageSpan.context()) + .asChildOf(stageSpan.spanContext()) .withStartTimestamp(taskEnd.taskInfo().launchTime() * 1000) .withTag("task_id", taskEnd.taskInfo().taskId()) .withTag("task_attempt_id", taskEnd.taskInfo().attemptNumber()) diff --git a/dd-java-agent/instrumentation/spark/spark-common/src/testFixtures/groovy/datadog/trace/instrumentation/spark/AbstractSparkStructuredStreamingTest.groovy b/dd-java-agent/instrumentation/spark/spark-common/src/testFixtures/groovy/datadog/trace/instrumentation/spark/AbstractSparkStructuredStreamingTest.groovy index ebad7aec0bd..21698955136 100644 --- a/dd-java-agent/instrumentation/spark/spark-common/src/testFixtures/groovy/datadog/trace/instrumentation/spark/AbstractSparkStructuredStreamingTest.groovy +++ b/dd-java-agent/instrumentation/spark/spark-common/src/testFixtures/groovy/datadog/trace/instrumentation/spark/AbstractSparkStructuredStreamingTest.groovy @@ -92,8 +92,8 @@ class AbstractSparkStructuredStreamingTest extends InstrumentationSpecification resourceName "test-query" spanType "spark" parent() - assert span.context().getSamplingPriority() == PrioritySampling.USER_KEEP - assert span.context().getPropagationTags().createTagMap()["_dd.p.dm"] == (-SamplingMechanism.DATA_JOBS).toString() + assert span.spanContext().getSamplingPriority() == PrioritySampling.USER_KEEP + assert span.spanContext().getPropagationTags().createTagMap()["_dd.p.dm"] == (-SamplingMechanism.DATA_JOBS).toString() tags { defaultTags() // Streaming tags @@ -201,8 +201,8 @@ class AbstractSparkStructuredStreamingTest extends InstrumentationSpecification operationName "spark.streaming_batch" spanType "spark" assert span.tags["streaming_query.batch_id"] == 1 - assert span.context().getSamplingPriority() == PrioritySampling.USER_KEEP - assert span.context().getPropagationTags().createTagMap()["_dd.p.dm"] == (-SamplingMechanism.DATA_JOBS).toString() + assert span.spanContext().getSamplingPriority() == PrioritySampling.USER_KEEP + assert span.spanContext().getPropagationTags().createTagMap()["_dd.p.dm"] == (-SamplingMechanism.DATA_JOBS).toString() parent() } span { diff --git a/dd-java-agent/instrumentation/spark/spark-common/src/testFixtures/groovy/datadog/trace/instrumentation/spark/AbstractSparkTest.groovy b/dd-java-agent/instrumentation/spark/spark-common/src/testFixtures/groovy/datadog/trace/instrumentation/spark/AbstractSparkTest.groovy index 95748c054d3..f311d437a84 100644 --- a/dd-java-agent/instrumentation/spark/spark-common/src/testFixtures/groovy/datadog/trace/instrumentation/spark/AbstractSparkTest.groovy +++ b/dd-java-agent/instrumentation/spark/spark-common/src/testFixtures/groovy/datadog/trace/instrumentation/spark/AbstractSparkTest.groovy @@ -58,9 +58,9 @@ abstract class AbstractSparkTest extends InstrumentationSpecification { resourceName "spark.application" spanType "spark" errored false - assert span.context().getTraceId() != DDTraceId.ZERO - assert span.context().getSamplingPriority() == PrioritySampling.USER_KEEP - assert span.context().getPropagationTags().createTagMap()["_dd.p.dm"] == (-SamplingMechanism.DATA_JOBS).toString() + assert span.spanContext().getTraceId() != DDTraceId.ZERO + assert span.spanContext().getSamplingPriority() == PrioritySampling.USER_KEEP + assert span.spanContext().getPropagationTags().createTagMap()["_dd.p.dm"] == (-SamplingMechanism.DATA_JOBS).toString() parent() } span { @@ -363,8 +363,8 @@ abstract class AbstractSparkTest extends InstrumentationSpecification { spanType "spark" traceId 8944764253919609482G parentSpanId 15104224823446433673G - assert span.context().getSamplingPriority() == PrioritySampling.USER_KEEP - assert span.context().getPropagationTags().createTagMap()["_dd.p.dm"] == (-SamplingMechanism.DATA_JOBS).toString() + assert span.spanContext().getSamplingPriority() == PrioritySampling.USER_KEEP + assert span.spanContext().getPropagationTags().createTagMap()["_dd.p.dm"] == (-SamplingMechanism.DATA_JOBS).toString() assert span.tags["databricks_job_id"] == "1234" assert span.tags["databricks_job_run_id"] == "5678" assert span.tags["databricks_task_run_id"] == "9012" @@ -386,8 +386,8 @@ abstract class AbstractSparkTest extends InstrumentationSpecification { spanType "spark" traceId 5240384461065211484G parentSpanId 14128229261586201946G - assert span.context().getSamplingPriority() == PrioritySampling.USER_KEEP - assert span.context().getPropagationTags().createTagMap()["_dd.p.dm"] == (-SamplingMechanism.DATA_JOBS).toString() + assert span.spanContext().getSamplingPriority() == PrioritySampling.USER_KEEP + assert span.spanContext().getPropagationTags().createTagMap()["_dd.p.dm"] == (-SamplingMechanism.DATA_JOBS).toString() assert span.tags["databricks_job_id"] == "3456" assert span.tags["databricks_job_run_id"] == "901" assert span.tags["databricks_task_run_id"] == "7890" @@ -409,8 +409,8 @@ abstract class AbstractSparkTest extends InstrumentationSpecification { spanType "spark" traceId 2235374731114184741G parentSpanId 8956125882166502063G - assert span.context().getSamplingPriority() == PrioritySampling.USER_KEEP - assert span.context().getPropagationTags().createTagMap()["_dd.p.dm"] == (-SamplingMechanism.DATA_JOBS).toString() + assert span.spanContext().getSamplingPriority() == PrioritySampling.USER_KEEP + assert span.spanContext().getPropagationTags().createTagMap()["_dd.p.dm"] == (-SamplingMechanism.DATA_JOBS).toString() assert span.tags["databricks_job_id"] == "123" assert span.tags["databricks_job_run_id"] == "8765" assert span.tags["databricks_task_run_id"] == "456" @@ -431,8 +431,8 @@ abstract class AbstractSparkTest extends InstrumentationSpecification { operationName "spark.job" spanType "spark" parent() - assert span.context().getSamplingPriority() == PrioritySampling.USER_KEEP - assert span.context().getPropagationTags().createTagMap()["_dd.p.dm"] == (-SamplingMechanism.DATA_JOBS).toString() + assert span.spanContext().getSamplingPriority() == PrioritySampling.USER_KEEP + assert span.spanContext().getPropagationTags().createTagMap()["_dd.p.dm"] == (-SamplingMechanism.DATA_JOBS).toString() assert span.tags["databricks_job_id"] == null assert span.tags["databricks_job_run_id"] == "8765" assert span.tags["databricks_task_run_id"] == null @@ -590,8 +590,8 @@ abstract class AbstractSparkTest extends InstrumentationSpecification { spanType "spark" traceId 8944764253919609482G parentSpanId 15104224823446433673G - assert span.context().getSamplingPriority() == PrioritySampling.USER_KEEP - assert span.context().getPropagationTags().createTagMap()["_dd.p.dm"] == (-SamplingMechanism.DATA_JOBS).toString() + assert span.spanContext().getSamplingPriority() == PrioritySampling.USER_KEEP + assert span.spanContext().getPropagationTags().createTagMap()["_dd.p.dm"] == (-SamplingMechanism.DATA_JOBS).toString() } span { operationName "spark.job" diff --git a/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/test/groovy/datadog/trace/instrumentation/springsecurity5/SpringBootBasedTest.groovy b/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/test/groovy/datadog/trace/instrumentation/springsecurity5/SpringBootBasedTest.groovy index 8e869deb22c..15cb8cab358 100644 --- a/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/test/groovy/datadog/trace/instrumentation/springsecurity5/SpringBootBasedTest.groovy +++ b/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/test/groovy/datadog/trace/instrumentation/springsecurity5/SpringBootBasedTest.groovy @@ -279,7 +279,7 @@ class SpringBootBasedTest extends AppSecHttpServerTest key.startsWith('appsec.events.users.login') }.isEmpty() // single call to the appender 1 * appender.doAppend(_) >> { diff --git a/dd-java-agent/instrumentation/spring/spring-security/spring-security-6.0/src/test/groovy/datadog/trace/instrumentation/springsecurity6/SpringBootBasedTest.groovy b/dd-java-agent/instrumentation/spring/spring-security/spring-security-6.0/src/test/groovy/datadog/trace/instrumentation/springsecurity6/SpringBootBasedTest.groovy index d7e17fb8051..902cf1786b8 100644 --- a/dd-java-agent/instrumentation/spring/spring-security/spring-security-6.0/src/test/groovy/datadog/trace/instrumentation/springsecurity6/SpringBootBasedTest.groovy +++ b/dd-java-agent/instrumentation/spring/spring-security/spring-security-6.0/src/test/groovy/datadog/trace/instrumentation/springsecurity6/SpringBootBasedTest.groovy @@ -254,7 +254,7 @@ class SpringBootBasedTest extends AppSecHttpServerTest key.startsWith('appsec.events.users.login')}.isEmpty() // single call to the appender 1 * appender.doAppend(_) >> { diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/latestDepTest/groovy/datadog/trace/instrumentation/springweb/HandlerMappingResourceNameFilterForkedTest.groovy b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/latestDepTest/groovy/datadog/trace/instrumentation/springweb/HandlerMappingResourceNameFilterForkedTest.groovy index c4a179c1b44..8c0a93a178a 100644 --- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/latestDepTest/groovy/datadog/trace/instrumentation/springweb/HandlerMappingResourceNameFilterForkedTest.groovy +++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/latestDepTest/groovy/datadog/trace/instrumentation/springweb/HandlerMappingResourceNameFilterForkedTest.groovy @@ -39,7 +39,7 @@ class HandlerMappingResourceNameFilterForkedTest extends InstrumentationSpecific when: runUnderTrace("test-servlet", { - request.setAttribute(DD_CONTEXT_ATTRIBUTE, activeSpan().context()) + request.setAttribute(DD_CONTEXT_ATTRIBUTE, activeSpan().spanContext()) filter.doFilterInternal(request, response, filterChain) }) diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/test/groovy/datadog/trace/instrumentation/springweb/HandlerMappingResourceNameFilterForkedTest.groovy b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/test/groovy/datadog/trace/instrumentation/springweb/HandlerMappingResourceNameFilterForkedTest.groovy index c4a179c1b44..8c0a93a178a 100644 --- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/test/groovy/datadog/trace/instrumentation/springweb/HandlerMappingResourceNameFilterForkedTest.groovy +++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/test/groovy/datadog/trace/instrumentation/springweb/HandlerMappingResourceNameFilterForkedTest.groovy @@ -39,7 +39,7 @@ class HandlerMappingResourceNameFilterForkedTest extends InstrumentationSpecific when: runUnderTrace("test-servlet", { - request.setAttribute(DD_CONTEXT_ATTRIBUTE, activeSpan().context()) + request.setAttribute(DD_CONTEXT_ATTRIBUTE, activeSpan().spanContext()) filter.doFilterInternal(request, response, filterChain) }) diff --git a/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseClientInstrumentation.java b/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseClientInstrumentation.java index dc605dbd9d0..e81d069d1dc 100644 --- a/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseClientInstrumentation.java +++ b/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseClientInstrumentation.java @@ -87,7 +87,7 @@ public static ContextScope beginRequest( AgentSpan span; if (null != parentSpan) { - span = startSpan(SYNAPSE_CLIENT.toString(), SYNAPSE_REQUEST, parentSpan.context()); + span = startSpan(SYNAPSE_CLIENT.toString(), SYNAPSE_REQUEST, parentSpan.spanContext()); } else { span = startSpan(SYNAPSE_CLIENT.toString(), SYNAPSE_REQUEST); } diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/TaskInstrumentation.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/TaskInstrumentation.java index 9d64a23fad7..c4b3ca071a4 100644 --- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/TaskInstrumentation.java +++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/TaskInstrumentation.java @@ -68,7 +68,7 @@ public static boolean before( AgentSpan parent = map.getOrDefault(ddActivityInfo.parent, activeSpan()); span = startSpan( - "tibco_bw", TIBCO_ACTIVITY_OPERATION, parent != null ? parent.context() : null); + "tibco_bw", TIBCO_ACTIVITY_OPERATION, parent != null ? parent.spanContext() : null); DECORATE.afterStart(span); DECORATE.onActivityStart(span, ddActivityInfo.name); map.put(ddActivityInfo.id, span); diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/BehaviorInstrumentation.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/BehaviorInstrumentation.java index c6d968bc7ca..b0d7f8fbd33 100644 --- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/BehaviorInstrumentation.java +++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/BehaviorInstrumentation.java @@ -93,7 +93,7 @@ public static AgentScope activityBegin( startSpan( "tibco_bw", TibcoDecorator.TIBCO_ACTIVITY_OPERATION, - parentSpan != null ? parentSpan.context() : null); + parentSpan != null ? parentSpan.spanContext() : null); TibcoDecorator.DECORATE.afterStart(span); TibcoDecorator.DECORATE.onActivityStart(span, pmTask.getName(pmContext)); return activateSpan(span); @@ -144,7 +144,7 @@ public static void processStarts( startSpan( "tibco_bw", TibcoDecorator.TIBCO_PROCESS_OPERATION, - parent != null ? parentSpan.context() : null); + parent != null ? parentSpan.spanContext() : null); TibcoDecorator.DECORATE.afterStart(span); TibcoDecorator.DECORATE.onProcessStart(span, pmProcessInstance.getName(pmContext)); contextStore.put(pmProcessInstance, span); diff --git a/dd-java-agent/instrumentation/tinylog-2.0/src/main/java/datadog/trace/instrumentation/tinylog2/TinylogLoggingProviderInstrumentation.java b/dd-java-agent/instrumentation/tinylog-2.0/src/main/java/datadog/trace/instrumentation/tinylog2/TinylogLoggingProviderInstrumentation.java index 15b66a664d9..08379c059c4 100644 --- a/dd-java-agent/instrumentation/tinylog-2.0/src/main/java/datadog/trace/instrumentation/tinylog2/TinylogLoggingProviderInstrumentation.java +++ b/dd-java-agent/instrumentation/tinylog-2.0/src/main/java/datadog/trace/instrumentation/tinylog2/TinylogLoggingProviderInstrumentation.java @@ -54,7 +54,7 @@ public static void onEnter(@Advice.Argument(0) LogEntry event) { if (span != null && traceConfig(span).isLogsInjectionEnabled()) { InstrumentationContext.get(LogEntry.class, AgentSpanContext.class) - .put(event, span.context()); + .put(event, span.spanContext()); } } } diff --git a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/VertxSqlClientDecorator.java b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/VertxSqlClientDecorator.java index 6a9375ca9ea..d95a6c65137 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/VertxSqlClientDecorator.java +++ b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/VertxSqlClientDecorator.java @@ -100,7 +100,7 @@ public AgentSpan startAndDecorateSpanForStatement( span.setResourceName(DB_QUERY); } span.setTag(Tags.COMPONENT, component); - span.context().setIntegrationName(component); + span.spanContext().setIntegrationName(component); return span; } diff --git a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/test/groovy/WebsocketTest.groovy b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/test/groovy/WebsocketTest.groovy index b1ab4fc252c..f0b1170737e 100644 --- a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/test/groovy/WebsocketTest.groovy +++ b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/test/groovy/WebsocketTest.groovy @@ -582,7 +582,7 @@ class WebsocketTest extends InstrumentationSpecification { def clientHandshake = createHandshakeSpan("http.request", url) //simulate client span clientHandshake.setSamplingPriority(PrioritySampling.SAMPLER_DROP) // simulate sampler drop def serverHandshake = createHandshakeSpan("servlet.request", url, - new ExtractedContext(clientHandshake.context().getTraceId(), clientHandshake.context().getSpanId(), clientHandshake.context().getSamplingPriority(), + new ExtractedContext(clientHandshake.spanContext().getTraceId(), clientHandshake.spanContext().getSpanId(), clientHandshake.spanContext().getSamplingPriority(), "test", 0, ["example_baggage": "test"], TagMap.EMPTY, null, null, null, null)) // simulate server span def session = deployEndpointAndConnect(new Endpoints.TestEndpoint(new Endpoints.FullStringHandler()), clientHandshake, serverHandshake, url) @@ -626,8 +626,8 @@ class WebsocketTest extends InstrumentationSpecification { // check that the handshake trace state is inherited TEST_WRITER.flatten().findAll { span -> (span as DDSpan).getSpanType() == "websocket" && (span as DDSpan).getParentId() == 0}.each { assert (it as DDSpan).getSamplingPriority() == serverHandshake.getSamplingPriority() - assert (it as DDSpan).getOrigin() == serverHandshake.context().getOrigin() - assert (it as DDSpan).getBaggage() == serverHandshake.context().getBaggageItems() + assert (it as DDSpan).getOrigin() == serverHandshake.spanContext().getOrigin() + assert (it as DDSpan).getBaggage() == serverHandshake.spanContext().getBaggageItems() assert !(it as DDSpan).getBaggage().isEmpty() } } diff --git a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/LinksAssert.groovy b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/LinksAssert.groovy index 3d583398cac..2f560469de0 100644 --- a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/LinksAssert.groovy +++ b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/LinksAssert.groovy @@ -32,7 +32,7 @@ class LinksAssert { } def link(DDSpan linked, byte flags = SpanLink.DEFAULT_FLAGS, SpanAttributes attributes = SpanAttributes.EMPTY, String traceState = '') { - link(linked.context(), flags, attributes, traceState) + link(linked.spanContext(), flags, attributes, traceState) } def link(AgentSpanContext context, byte flags = SpanLink.DEFAULT_FLAGS, SpanAttributes attributes = SpanAttributes.EMPTY, String traceState = '') { diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/DDSpanJsonAdapter.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/DDSpanJsonAdapter.java index 93c6995d4e8..c1e5cb4db1c 100644 --- a/dd-trace-core/src/main/java/datadog/trace/common/writer/DDSpanJsonAdapter.java +++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/DDSpanJsonAdapter.java @@ -75,7 +75,7 @@ public void toJson(final com.squareup.moshi.JsonWriter writer, final DDSpan span writer.name("meta"); writer.beginObject(); final Map tags = span.getTags(); - for (final Map.Entry entry : span.context().getBaggageItems().entrySet()) { + for (final Map.Entry entry : span.spanContext().getBaggageItems().entrySet()) { if (!tags.containsKey(entry.getKey())) { writer.name(entry.getKey()); writer.value(entry.getValue()); diff --git a/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java b/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java index 375480a8792..59325f25632 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java @@ -1289,7 +1289,7 @@ void write(final SpanList trace) { boolean forceKeep = metricsAggregator.publish(writtenTrace); - TraceCollector traceCollector = writtenTrace.get(0).context().getTraceCollector(); + TraceCollector traceCollector = writtenTrace.get(0).spanContext().getTraceCollector(); traceCollector.setSamplingPriorityIfNecessary(); DDSpan rootSpan = traceCollector.getRootSpan(); @@ -1542,9 +1542,9 @@ public TraceSegment getTraceSegment() { if (activeSpan == null) { return null; } - AgentSpanContext ctx = activeSpan.context(); - if (ctx instanceof DDSpanContext) { - return ((DDSpanContext) ctx).getTraceSegment(); + AgentSpanContext spanContext = activeSpan.spanContext(); + if (spanContext instanceof DDSpanContext) { + return ((DDSpanContext) spanContext).getTraceSegment(); } return null; } @@ -1616,7 +1616,7 @@ protected static final DDSpan buildSpan( String serviceName, CharSequence operationName, String resourceName, - AgentSpanContext resolvedParentContext, + AgentSpanContext resolvedParentSpanContext, boolean ignoreScope, boolean errorFlag, CharSequence spanType, @@ -1636,7 +1636,7 @@ protected static final DDSpan buildSpan( serviceName, operationName, resourceName, - resolvedParentContext, + resolvedParentSpanContext, errorFlag, spanType, tagLedger, @@ -1662,30 +1662,30 @@ protected static final DDSpan buildSpanImpl( return span; } - private static final List addParentContextLink( - List links, AgentSpanContext parentContext) { + private static final List addParentSpanLink( + List links, AgentSpanContext parentSpanContext) { SpanLink link; - if (parentContext instanceof ExtractedContext) { - String headers = ((ExtractedContext) parentContext).getPropagationStyle().toString(); + if (parentSpanContext instanceof ExtractedContext) { + String headers = ((ExtractedContext) parentSpanContext).getPropagationStyle().toString(); SpanAttributes attributes = SpanAttributes.builder() .put("reason", "propagation_behavior_extract") .put("context_headers", headers) .build(); - link = DDSpanLink.from((ExtractedContext) parentContext, attributes); + link = DDSpanLink.from((ExtractedContext) parentSpanContext, attributes); } else { - link = SpanLink.from(parentContext); + link = SpanLink.from(parentSpanContext); } return addLink(links, link); } - protected static final List addTerminatedContextAsLinks( - List links, AgentSpanContext parentContext) { - if (parentContext instanceof TagContext) { - List terminatedContextLinks = - ((TagContext) parentContext).getTerminatedContextLinks(); - if (!terminatedContextLinks.isEmpty()) { - return addLinks(links, terminatedContextLinks); + protected static final List addTerminatedSpanAsLinks( + List links, AgentSpanContext parentSpanContext) { + if (parentSpanContext instanceof TagContext) { + List terminatedSpanLinks = + ((TagContext) parentSpanContext).getTerminatedSpanLinks(); + if (!terminatedSpanLinks.isEmpty()) { + return addLinks(links, terminatedSpanLinks); } } return links; @@ -1735,7 +1735,7 @@ protected static final AgentSpan startSpan( final CoreTracer tracer, String instrumentationName, CharSequence operationName, - AgentSpanContext specifiedParentContext, + AgentSpanContext specifiedParentSpanContext, boolean ignoreScope, long timestampMicros) { return startSpan( @@ -1746,7 +1746,7 @@ protected static final AgentSpan startSpan( null /* serviceName */, operationName, null /* resourceName */, - specifiedParentContext, + specifiedParentSpanContext, ignoreScope, false /* errorFlag */, null /* spanType */, @@ -1765,7 +1765,7 @@ protected static final AgentSpan startSpan( String serviceName, CharSequence operationName, String resourceName, - AgentSpanContext specifiedParentContext, + AgentSpanContext specifiedParentSpanContext, boolean ignoreScope, boolean errorFlag, CharSequence spanType, @@ -1775,34 +1775,34 @@ protected static final AgentSpan startSpan( Object builderRequestContextDataIast, Object builderCiVisibilityContextData) { // Find the parent context - AgentSpanContext parentContext = specifiedParentContext; - if (parentContext == null && !ignoreScope) { + AgentSpanContext parentSpanContext = specifiedParentSpanContext; + if (parentSpanContext == null && !ignoreScope) { // use the Scope as parent unless overridden or ignored. final AgentSpan activeSpan = tracer.scopeManager.activeSpan(); if (activeSpan != null) { - parentContext = activeSpan.context(); + parentSpanContext = activeSpan.spanContext(); } } - if (parentContext == BlackHoleSpan.Context.INSTANCE) { - return new BlackHoleSpan(parentContext.getTraceId()); + if (parentSpanContext == BlackHoleSpan.Context.INSTANCE) { + return new BlackHoleSpan(parentSpanContext.getTraceId()); } - // Handle remote terminated context as span links - if (parentContext != null && parentContext.isRemote()) { + // Handle remote terminated span context as span links + if (parentSpanContext != null && parentSpanContext.isRemote()) { switch (Config.get().getTracePropagationBehaviorExtract()) { case RESTART: - links = addParentContextLink(links, parentContext); - parentContext = null; + links = addParentSpanLink(links, parentSpanContext); + parentSpanContext = null; break; case IGNORE: - parentContext = null; + parentSpanContext = null; break; case CONTINUE: default: - links = addTerminatedContextAsLinks(links, specifiedParentContext); + links = addTerminatedSpanAsLinks(links, specifiedParentSpanContext); break; } } @@ -1815,7 +1815,7 @@ protected static final AgentSpan startSpan( serviceName, operationName, resourceName, - parentContext, + parentSpanContext, ignoreScope, errorFlag, spanType, @@ -1880,7 +1880,7 @@ public final CoreSpanBuilder asChildOf(final AgentSpanContext spanContext) { } public final CoreSpanBuilder asChildOf(final AgentSpan agentSpan) { - parent = agentSpan.context(); + parent = agentSpan.spanContext(); return this; } @@ -1954,7 +1954,7 @@ protected static final DDSpanContext buildSpanContext( String serviceName, CharSequence operationName, String resourceName, - AgentSpanContext resolvedParentContext, + AgentSpanContext resolvedParentSpanContext, boolean errorFlag, CharSequence spanType, TagMap.Ledger tagLedger, @@ -1988,9 +1988,9 @@ protected static final DDSpanContext buildSpanContext( CharSequence serviceNameSource = MANUAL; // Propagate internal trace. // Note: if we are not in the context of distributed tracing, and we are starting the first - // root span, parentContext will be null at this point. - if (resolvedParentContext instanceof DDSpanContext) { - final DDSpanContext ddsc = (DDSpanContext) resolvedParentContext; + // root span, parentSpanContext will be null at this point. + if (resolvedParentSpanContext instanceof DDSpanContext) { + final DDSpanContext ddsc = (DDSpanContext) resolvedParentSpanContext; traceId = ddsc.getTraceId(); parentSpanId = ddsc.getSpanId(); baggage = ddsc.getBaggageItems(); @@ -2007,7 +2007,8 @@ protected static final DDSpanContext buildSpanContext( if (serviceName == null) { serviceName = parentServiceName; } - RequestContext requestContext = ((DDSpanContext) resolvedParentContext).getRequestContext(); + RequestContext requestContext = + ((DDSpanContext) resolvedParentSpanContext).getRequestContext(); if (requestContext != null) { requestContextDataAppSec = requestContext.getData(RequestContextSlot.APPSEC); requestContextDataIast = requestContext.getData(RequestContextSlot.IAST); @@ -2021,21 +2022,21 @@ protected static final DDSpanContext buildSpanContext( } else { long endToEndStartTime; - if (resolvedParentContext instanceof ExtractedContext) { + if (resolvedParentSpanContext instanceof ExtractedContext) { // Propagate external trace - final ExtractedContext extractedContext = (ExtractedContext) resolvedParentContext; + final ExtractedContext extractedContext = (ExtractedContext) resolvedParentSpanContext; traceId = extractedContext.getTraceId(); parentSpanId = extractedContext.getSpanId(); samplingPriority = extractedContext.getSamplingPriority(); endToEndStartTime = extractedContext.getEndToEndStartTime(); propagationTags = extractedContext.getPropagationTags(); - } else if (resolvedParentContext != null) { + } else if (resolvedParentSpanContext != null) { traceId = - resolvedParentContext.getTraceId() == DDTraceId.ZERO + resolvedParentSpanContext.getTraceId() == DDTraceId.ZERO ? tracer.idGenerationStrategy.generateTraceId() - : resolvedParentContext.getTraceId(); - parentSpanId = resolvedParentContext.getSpanId(); - samplingPriority = resolvedParentContext.getSamplingPriority(); + : resolvedParentSpanContext.getTraceId(); + parentSpanId = resolvedParentSpanContext.getSpanId(); + samplingPriority = resolvedParentSpanContext.getSamplingPriority(); endToEndStartTime = 0; propagationTags = tracer.propagationTagsFactory.empty(); } else { @@ -2050,8 +2051,8 @@ protected static final DDSpanContext buildSpanContext( ConfigSnapshot traceConfig; // Get header tags and set origin whether propagating or not. - if (resolvedParentContext instanceof TagContext) { - TagContext tc = (TagContext) resolvedParentContext; + if (resolvedParentSpanContext instanceof TagContext) { + TagContext tc = (TagContext) resolvedParentSpanContext; traceConfig = (ConfigSnapshot) tc.getTraceConfig(); coreTags = tc.getTags(); coreTagsNeedsIntercept = true; // maybe intercept isn't needed? @@ -2087,10 +2088,10 @@ protected static final DDSpanContext buildSpanContext( // Use parent pathwayContext if present and started pathwayContext = - resolvedParentContext != null - && resolvedParentContext.getPathwayContext() != null - && resolvedParentContext.getPathwayContext().isStarted() - ? resolvedParentContext.getPathwayContext() + resolvedParentSpanContext != null + && resolvedParentSpanContext.getPathwayContext() != null + && resolvedParentSpanContext.getPathwayContext().isStarted() + ? resolvedParentSpanContext.getPathwayContext() : tracer.dataStreamsMonitoring.newPathwayContext(); // when removing fake services the best upward service name to pick is the local root one diff --git a/dd-trace-core/src/main/java/datadog/trace/core/DDSpan.java b/dd-trace-core/src/main/java/datadog/trace/core/DDSpan.java index 213f27825bf..ad46c7ecccc 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/DDSpan.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/DDSpan.java @@ -544,7 +544,7 @@ public U unsafeGetTag(CharSequence name) { @Override @Nonnull - public final DDSpanContext context() { + public final DDSpanContext spanContext() { return context; } @@ -967,7 +967,7 @@ public boolean isKind(SpanKindFilter filter) { @Override public void copyPropagationAndBaggage(final AgentSpan source) { if (source instanceof DDSpan) { - final DDSpanContext sourceSpanContext = ((DDSpan) source).context(); + final DDSpanContext sourceSpanContext = ((DDSpan) source).spanContext(); // align the sampling priority for this span context setSamplingPriority(sourceSpanContext.getSamplingPriority(), DEFAULT); // the sampling mechanism determine the dm tag hence we need to override and lock the current diff --git a/dd-trace-core/src/main/java/datadog/trace/core/DDSpanContext.java b/dd-trace-core/src/main/java/datadog/trace/core/DDSpanContext.java index e7038db5dbe..520311a20c1 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/DDSpanContext.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/DDSpanContext.java @@ -582,8 +582,8 @@ private DDSpanContext getRootSpanContextOrThis() { private DDSpanContext getRootSpanContextIfDifferent() { if (traceCollector != null) { final DDSpan rootSpan = traceCollector.getRootSpan(); - if (null != rootSpan && rootSpan.context() != this) { - return rootSpan.context(); + if (null != rootSpan && rootSpan.spanContext() != this) { + return rootSpan.spanContext(); } } return null; @@ -669,8 +669,8 @@ public boolean lockSamplingPriority() { // the priority is just CAS'd against UNSET/UNKNOWN, unless it's forced to USER_KEEP/MANUAL // but is maintained for backwards compatibility, and returns false when it used to final DDSpan rootSpan = traceCollector.getRootSpan(); - if (null != rootSpan && rootSpan.context() != this) { - return rootSpan.context().lockSamplingPriority(); + if (null != rootSpan && rootSpan.spanContext() != this) { + return rootSpan.spanContext().lockSamplingPriority(); } return SAMPLING_PRIORITY_UPDATER.get(this) != PrioritySampling.UNSET; diff --git a/dd-trace-core/src/main/java/datadog/trace/core/PendingTrace.java b/dd-trace-core/src/main/java/datadog/trace/core/PendingTrace.java index 11f8566cc48..04e97058aa0 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/PendingTrace.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/PendingTrace.java @@ -493,7 +493,7 @@ public static long getDurationNano(CoreSpan span) { return duration; } DDSpan ddSpan = (DDSpan) span; - TraceCollector traceCollector = ddSpan.context().getTraceCollector(); + TraceCollector traceCollector = ddSpan.spanContext().getTraceCollector(); if (!(traceCollector instanceof PendingTrace)) { throw new IllegalArgumentException( "Expected " diff --git a/dd-trace-core/src/main/java/datadog/trace/core/TraceCollector.java b/dd-trace-core/src/main/java/datadog/trace/core/TraceCollector.java index 777fc3889bf..2d97e895fb0 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/TraceCollector.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/TraceCollector.java @@ -68,8 +68,9 @@ public void setSamplingPriorityIfNecessary() { // ASM. if ((!Config.get().isApmTracingEnabled() && !ProductTraceSource.isProductMarked( - rootSpan.context().getPropagationTags().getTraceSource(), ProductTraceSource.ASM)) - || rootSpan.context().getSamplingPriority() == PrioritySampling.UNSET) { + rootSpan.spanContext().getPropagationTags().getTraceSource(), + ProductTraceSource.ASM)) + || rootSpan.spanContext().getSamplingPriority() == PrioritySampling.UNSET) { ((PrioritySampler) traceConfig.sampler).setSamplingPriority(rootSpan); } } diff --git a/dd-trace-core/src/main/java/datadog/trace/core/baggage/BaggagePropagator.java b/dd-trace-core/src/main/java/datadog/trace/core/baggage/BaggagePropagator.java index 6a601a0e9de..114f2668790 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/baggage/BaggagePropagator.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/baggage/BaggagePropagator.java @@ -129,7 +129,7 @@ public Context extract(Context context, C carrier, CarrierVisitor visitor // TODO: consider a better way to link baggage with the extracted (legacy) TagContext AgentSpan extractedSpan = AgentSpan.fromContext(context); if (extractedSpan != null) { - AgentSpanContext extractedSpanContext = extractedSpan.context(); + AgentSpanContext extractedSpanContext = extractedSpan.spanContext(); if (extractedSpanContext instanceof TagContext) { ((TagContext) extractedSpanContext).setW3CBaggage(baggage); } diff --git a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DataStreamsPropagator.java b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DataStreamsPropagator.java index 3aba15aca42..4258adce274 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DataStreamsPropagator.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DataStreamsPropagator.java @@ -43,7 +43,7 @@ public void inject(Context context, C carrier, CarrierSetter setter) { PathwayContext pathwayContext; DataStreamsContext dsmContext; if ((span = AgentSpan.fromContext(context)) == null - || (pathwayContext = span.context().getPathwayContext()) == null + || (pathwayContext = span.spanContext().getPathwayContext()) == null || (dsmContext = DataStreamsContext.fromContext(context)) == null || !traceConfig().isDataStreamsEnabled()) { return; @@ -97,7 +97,7 @@ private TagContext getSpanContextOrNull(Context context) { AgentSpan extractedSpan = AgentSpan.fromContext(context); AgentSpanContext extractedSpanContext; if (extractedSpan != null - && (extractedSpanContext = extractedSpan.context()) instanceof TagContext) { + && (extractedSpanContext = extractedSpan.spanContext()) instanceof TagContext) { return (TagContext) extractedSpanContext; } return null; diff --git a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoring.java b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoring.java index 32db178bc1a..4cbc02acd37 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoring.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoring.java @@ -262,7 +262,7 @@ public void mergePathwayContextIntoSpan(AgentSpan span, DataStreamsContextCarrie DataStreamsContextCarrierAdapter.INSTANCE, this.timeSource, getThreadServiceName()); - ((DDSpan) span).context().mergePathwayContext(pathwayContext); + ((DDSpan) span).spanContext().mergePathwayContext(pathwayContext); } } @@ -306,7 +306,7 @@ public void reportKafkaConfig( @Override public void setCheckpoint(AgentSpan span, DataStreamsContext context) { - PathwayContext pathwayContext = span.context().getPathwayContext(); + PathwayContext pathwayContext = span.spanContext().getPathwayContext(); if (pathwayContext != null) { pathwayContext.setCheckpoint(context, this::add); } diff --git a/dd-trace-core/src/main/java/datadog/trace/core/otlp/trace/OtlpTraceProto.java b/dd-trace-core/src/main/java/datadog/trace/core/otlp/trace/OtlpTraceProto.java index 5f317b40730..fa75f5c701d 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/otlp/trace/OtlpTraceProto.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/otlp/trace/OtlpTraceProto.java @@ -86,7 +86,7 @@ public static int recordSpanMessage( MetaWriter metaWriter, int nestedSpanLinkBytes, OtlpProtoBuffer protobuf) { - PropagationTags propagationTags = span.context().getPropagationTags(); + PropagationTags propagationTags = span.spanContext().getPropagationTags(); writeTag(buf, 1, LEN_WIRE_TYPE); writeTraceId(buf, span.getTraceId()); @@ -109,7 +109,7 @@ public static int recordSpanMessage( if (span.samplingPriority() > 0) { traceFlags |= SAMPLED_TRACE_FLAG; } - if (span.context().isRemote()) { + if (span.spanContext().isRemote()) { traceFlags |= REMOTE_TRACE_FLAG; } if (traceFlags != NO_TRACE_FLAGS) { @@ -126,7 +126,7 @@ public static int recordSpanMessage( } writeTag(buf, 6, VARINT_WIRE_TYPE); - writeVarInt(buf, spanKind(span.context().getSpanKindString())); + writeVarInt(buf, spanKind(span.spanContext().getSpanKindString())); writeTag(buf, 7, I64_WIRE_TYPE); writeI64(buf, span.getStartTime()); diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/HttpCodec.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/HttpCodec.java index d98245b443a..38783860e9b 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/HttpCodec.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/HttpCodec.java @@ -244,7 +244,7 @@ public TagContext extract( } } else { // Terminate extracted context and add it as span link - context.addTerminatedContextLink( + context.addTerminatedSpanLink( DDSpanLink.from( (ExtractedContext) extracted, SpanAttributes.builder() diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/TracingPropagator.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/TracingPropagator.java index 89bb8ea5d59..f9267c355d7 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/TracingPropagator.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/TracingPropagator.java @@ -47,7 +47,7 @@ public void inject(Context context, C carrier, CarrierSetter setter) { || (span = fromContext(context)) == null) { return; } - AgentSpanContext spanContext = span.context(); + AgentSpanContext spanContext = span.spanContext(); if (spanContext instanceof DDSpanContext) { DDSpanContext ddSpanContext = (DDSpanContext) spanContext; // Stop injection if tracing is disabled and tracing span is coming from tracing only diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/XRayPropagator.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/XRayPropagator.java index 1a706306781..bffb5835bd9 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/XRayPropagator.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/XRayPropagator.java @@ -43,7 +43,7 @@ public void inject(Context context, C carrier, CarrierSetter setter) { || (span = fromContext(context)) == null) { return; } - AgentSpanContext spanContext = span.context(); + AgentSpanContext spanContext = span.spanContext(); if (spanContext instanceof DDSpanContext) { DDSpanContext ddSpanContext = (DDSpanContext) spanContext; ddSpanContext.getTraceCollector().setSamplingPriorityIfNecessary(); diff --git a/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScope.java b/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScope.java index d4e7e332586..ba7e5288a68 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScope.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScope.java @@ -170,7 +170,7 @@ public final void beforeActivated() { return; } try { - scopeState.activate(span.context()); + scopeState.activate(span.spanContext()); } catch (Throwable e) { ContinuableScopeManager.ratelimitedLog.warn( "ScopeState {} threw exception in beforeActivated()", scopeState.getClass(), e); diff --git a/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScopeManager.java b/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScopeManager.java index 5d997f87b39..53e4d5b7da6 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScopeManager.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScopeManager.java @@ -122,7 +122,7 @@ public AgentScope.Continuation captureSpan(final AgentSpan span) { } private AgentScope.Continuation captureSpan(Context context, byte source, AgentSpan span) { - AgentTraceCollector traceCollector = span.context().getTraceCollector(); + AgentTraceCollector traceCollector = span.spanContext().getTraceCollector(); return new ScopeContinuation(this, context, source, traceCollector).register(); } @@ -357,8 +357,8 @@ private Stateful createScopeState(Context context) { // to encapsulate other scope lifecycle activities // FIXME DDSpanContext is always a ProfilerContext anyway... AgentSpan span = AgentSpan.fromContext(context); - if (span != null && span.context() instanceof ProfilerContext) { - return profilingContextIntegration.newScopeState((ProfilerContext) span.context()); + if (span != null && span.spanContext() instanceof ProfilerContext) { + return profilingContextIntegration.newScopeState((ProfilerContext) span.spanContext()); } return Stateful.DEFAULT; } diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/TraceMapperTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/TraceMapperTest.groovy index a81cee990c4..6f2173e8374 100644 --- a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/TraceMapperTest.groovy +++ b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/TraceMapperTest.groovy @@ -20,7 +20,7 @@ class TraceMapperTest extends DDCoreSpecification { DDSpan span = (DDSpan) tracer.buildSpan("datadog", null).withTag("service.name", "my-service") .withTag("elasticsearch.version", "7.0").start() span.setBaggageItem("baggage", "item") - span.context().setDataTop("mydata", "[1,2,3]") + span.spanContext().setDataTop("mydata", "[1,2,3]") def trace = [span] when: diff --git a/dd-trace-core/src/test/java/datadog/trace/civisibility/interceptor/CiVisibilityTraceInterceptorTest.java b/dd-trace-core/src/test/java/datadog/trace/civisibility/interceptor/CiVisibilityTraceInterceptorTest.java index 42cb3a52843..a90c99fd854 100644 --- a/dd-trace-core/src/test/java/datadog/trace/civisibility/interceptor/CiVisibilityTraceInterceptorTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/civisibility/interceptor/CiVisibilityTraceInterceptorTest.java @@ -52,7 +52,7 @@ void doNotDiscardATraceThatComesFromCiApp() { tracer.addTraceInterceptor(CiVisibilityTraceInterceptor.INSTANCE); DDSpan span = (DDSpan) tracer.buildSpan("datadog", "sample-span").start(); - span.context().setOrigin(CIConstants.CIAPP_TEST_ORIGIN); + span.spanContext().setOrigin(CIConstants.CIAPP_TEST_ORIGIN); span.finish(); // expect: @@ -72,7 +72,7 @@ void addTracerVersionToSpansOfType(@ConvertWith(DDSpanTypesConverter.class) Stri DDSpan span = (DDSpan) tracer.buildSpan("datadog", "sample-span").withSpanType(spanType).start(); - span.context().setOrigin(CIConstants.CIAPP_TEST_ORIGIN); + span.spanContext().setOrigin(CIConstants.CIAPP_TEST_ORIGIN); span.finish(); writer.waitForTraces(1); diff --git a/dd-trace-core/src/test/java/datadog/trace/common/sampling/ParentBasedAlwaysOnSamplerTest.java b/dd-trace-core/src/test/java/datadog/trace/common/sampling/ParentBasedAlwaysOnSamplerTest.java index 929a604aace..19369beeac9 100644 --- a/dd-trace-core/src/test/java/datadog/trace/common/sampling/ParentBasedAlwaysOnSamplerTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/common/sampling/ParentBasedAlwaysOnSamplerTest.java @@ -70,7 +70,7 @@ void childSpanInheritsSamplingPriorityFromLocalParent() { DDSpan rootSpan = (DDSpan) tracer.buildSpan("datadog", "root").start(); sampler.setSamplingPriority(rootSpan); DDSpan childSpan = - (DDSpan) tracer.buildSpan("datadog", "child").asChildOf(rootSpan.context()).start(); + (DDSpan) tracer.buildSpan("datadog", "child").asChildOf(rootSpan.spanContext()).start(); try { assertEquals(SAMPLER_KEEP, rootSpan.getSamplingPriority()); assertEquals(SAMPLER_KEEP, childSpan.getSamplingPriority()); diff --git a/dd-trace-core/src/test/java/datadog/trace/core/CoreSpanBuilderTest.java b/dd-trace-core/src/test/java/datadog/trace/core/CoreSpanBuilderTest.java index 016b7ceda8f..000598ca7c9 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/CoreSpanBuilderTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/CoreSpanBuilderTest.java @@ -118,14 +118,14 @@ void buildComplexSpan() { .withSpanType(expectedType) .start(); - DDSpanContext context = span.context(); - - assertEquals(expectedResource, context.getResourceName()); - assertTrue(context.getErrorFlag()); - assertEquals(expectedService, context.getServiceName()); - assertEquals(expectedType, context.getSpanType()); - assertEquals(Thread.currentThread().getName(), context.getTag(THREAD_NAME)); - assertEquals(Thread.currentThread().getId(), context.getTag(THREAD_ID)); + DDSpanContext spanContext = span.spanContext(); + + assertEquals(expectedResource, spanContext.getResourceName()); + assertTrue(spanContext.getErrorFlag()); + assertEquals(expectedService, spanContext.getServiceName()); + assertEquals(expectedType, spanContext.getSpanType()); + assertEquals(Thread.currentThread().getName(), spanContext.getTag(THREAD_NAME)); + assertEquals(Thread.currentThread().getId(), spanContext.getTag(THREAD_ID)); } @TableTest({ @@ -196,9 +196,9 @@ void shouldLinkToParentSpan() { .asChildOf(mockedContext) .start(); - DDSpanContext actualContext = span.context(); - assertEquals(expectedParentId, actualContext.getParentId()); - assertEquals(traceId, actualContext.getTraceId()); + DDSpanContext actualSpanContext = span.spanContext(); + assertEquals(expectedParentId, actualSpanContext.getParentId()); + assertEquals(traceId, actualSpanContext.getTraceId()); } @TableTest({ @@ -215,13 +215,13 @@ void shouldLinkToParentSpanImplicitly( noopParent ? noopSpan() : tracer.buildSpan("test", "parent").withServiceName("service").start())) { - long expectedParentId = noopParent ? DDSpanId.ZERO : parent.span().context().getSpanId(); + long expectedParentId = noopParent ? DDSpanId.ZERO : parent.span().spanContext().getSpanId(); DDSpan span = (DDSpan) tracer.buildSpan("test", "fakeName").withServiceName(serviceName).start(); - DDSpanContext actualContext = span.context(); - assertEquals(expectedParentId, actualContext.getParentId()); + DDSpanContext actualSpanContext = span.spanContext(); + assertEquals(expectedParentId, actualSpanContext.getParentId()); assertEquals(expectTopLevel, span.isTopLevel()); } } @@ -260,9 +260,9 @@ void shouldInheritTheDDParentAttributes() { assertEquals(expectedName, span.getOperationName()); assertEquals(expectedBaggageItemValue, span.getBaggageItem(expectedBaggageItemKey)); - assertEquals(expectedParentServiceName, span.context().getServiceName()); - assertEquals(expectedName, span.context().getResourceName()); - assertNull(span.context().getSpanType()); + assertEquals(expectedParentServiceName, span.spanContext().getServiceName()); + assertEquals(expectedName, span.spanContext().getResourceName()); + assertNull(span.spanContext().getSpanType()); assertTrue(span.isTopLevel()); // service names differ between parent and child // ServiceName and SpanType are always overwritten by the child if they are present @@ -278,9 +278,9 @@ void shouldInheritTheDDParentAttributes() { assertEquals(expectedName, span.getOperationName()); assertEquals(expectedBaggageItemValue, span.getBaggageItem(expectedBaggageItemKey)); - assertEquals(expectedChildServiceName, span.context().getServiceName()); - assertEquals(expectedChildResourceName, span.context().getResourceName()); - assertEquals(expectedChildType, span.context().getSpanType()); + assertEquals(expectedChildServiceName, span.spanContext().getServiceName()); + assertEquals(expectedChildResourceName, span.spanContext().getResourceName()); + assertEquals(expectedChildType, span.spanContext().getSpanType()); } @Test @@ -303,13 +303,15 @@ void shouldTrackAllSpansInTrace() { lastSpan.finish(); } - PendingTrace traceCollector = (PendingTrace) root.context().getTraceCollector(); + PendingTrace traceCollector = (PendingTrace) root.spanContext().getTraceCollector(); assertEquals(root, traceCollector.getRootSpan()); assertEquals(nbSamples, traceCollector.size()); assertTrue(traceCollector.getSpans().containsAll(spans)); DDSpan randomSpan = spans.get((int) (Math.random() * nbSamples)); assertTrue( - ((PendingTrace) randomSpan.context().getTraceCollector()).getSpans().containsAll(spans)); + ((PendingTrace) randomSpan.spanContext().getTraceCollector()) + .getSpans() + .containsAll(spans)); } static Stream extractedContextShouldPopulateNewSpanDetailsArguments() { @@ -351,13 +353,13 @@ void extractedContextShouldPopulateNewSpanDetails(ExtractedContext extractedCont assertEquals(extractedContext.getTraceId(), span.getTraceId()); assertEquals(extractedContext.getSpanId(), span.getParentId()); assertEquals(extractedContext.getSamplingPriority(), (int) span.getSamplingPriority()); - assertEquals(extractedContext.getOrigin(), span.context().getOrigin()); - assertEquals(extractedContext.getBaggage(), span.context().getBaggageItems()); + assertEquals(extractedContext.getOrigin(), span.spanContext().getOrigin()); + assertEquals(extractedContext.getBaggage(), span.spanContext().getBaggageItems()); assertEquals(thread.getId(), span.getTag(THREAD_ID)); assertEquals(thread.getName(), span.getTag(THREAD_NAME)); assertEquals( extractedContext.getPropagationTags().headerValue(PropagationTags.HeaderType.DATADOG), - span.context().getPropagationTags().headerValue(PropagationTags.HeaderType.DATADOG)); + span.spanContext().getPropagationTags().headerValue(PropagationTags.HeaderType.DATADOG)); } @Test @@ -434,8 +436,8 @@ void tagContextShouldPopulateDefaultSpanDetails( assertNotEquals(DDTraceId.ZERO, span.getTraceId()); assertEquals(DDSpanId.ZERO, span.getParentId()); assertNull(span.getSamplingPriority()); - assertEquals(tagContext.getOrigin(), span.context().getOrigin()); - assertEquals(Collections.emptyMap(), span.context().getBaggageItems()); + assertEquals(tagContext.getOrigin(), span.spanContext().getOrigin()); + assertEquals(Collections.emptyMap(), span.spanContext().getBaggageItems()); Map expectedTags = new HashMap<>(); if (tagContext.getTags() != null) { @@ -448,7 +450,7 @@ void tagContextShouldPopulateDefaultSpanDetails( expectedTags.put(PID_TAG, Config.get().getProcessId()); expectedTags.put(SCHEMA_VERSION_TAG_KEY, SpanNaming.instance().version()); expectedTags.putAll(productTags()); - assertEquals(expectedTags, span.context().getTags()); + assertEquals(expectedTags, span.spanContext().getTags()); } static Stream globalSpanTagsPopulatedOnEachSpanArguments() { @@ -495,7 +497,7 @@ void canOverwriteRequestContextDataWithBuilderFromEmpty() { AgentSpan span2 = tracer .buildSpan("test", "span2") - .asChildOf(span1.context()) + .asChildOf(span1.spanContext()) .withRequestContextData(RequestContextSlot.APPSEC, "override") .withRequestContextData(RequestContextSlot.CI_VISIBILITY, "override") .withRequestContextData(RequestContextSlot.IAST, "override") @@ -518,7 +520,7 @@ void canOverwriteRequestContextDataWithBuilder() { .withRequestContextDataAppSec("value"); AgentSpan span1 = tracer.buildSpan("test", "span1").asChildOf(context).start(); - AgentSpan span2 = tracer.buildSpan("test", "span2").asChildOf(span1.context()).start(); + AgentSpan span2 = tracer.buildSpan("test", "span2").asChildOf(span1.spanContext()).start(); assertEquals("value", span2.getRequestContext().getData(RequestContextSlot.APPSEC)); assertEquals("value", span2.getRequestContext().getData(RequestContextSlot.CI_VISIBILITY)); @@ -527,7 +529,7 @@ void canOverwriteRequestContextDataWithBuilder() { AgentSpan span3 = tracer .buildSpan("test", "span3") - .asChildOf(span2.context()) + .asChildOf(span2.spanContext()) .withRequestContextData(RequestContextSlot.APPSEC, "override") .withRequestContextData(RequestContextSlot.CI_VISIBILITY, "override") .withRequestContextData(RequestContextSlot.IAST, "override") diff --git a/dd-trace-core/src/test/java/datadog/trace/core/CoreTracerTest.java b/dd-trace-core/src/test/java/datadog/trace/core/CoreTracerTest.java index 897b80dc625..794af6d4650 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/CoreTracerTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/CoreTracerTest.java @@ -200,7 +200,7 @@ void rootTagsAppliedOnlyToRootSpans() { localRootSpanTags.put("only_root", "value"); CoreTracer tracer = tracerBuilder().localRootSpanTags(localRootSpanTags).build(); AgentSpan root = tracer.buildSpan("datadog", "my_root").start(); - AgentSpan child = tracer.buildSpan("datadog", "my_child").asChildOf(root.context()).start(); + AgentSpan child = tracer.buildSpan("datadog", "my_child").asChildOf(root.spanContext()).start(); try { assertTrue(root.getTags().containsKey("only_root")); assertFalse(child.getTags().containsKey("only_root")); @@ -232,7 +232,7 @@ void prioritySamplingSetWhenChildSpanComplete() throws Exception { try { DDSpan root = (DDSpan) tracer.buildSpan("datadog", "operation").start(); DDSpan child = - (DDSpan) tracer.buildSpan("datadog", "my_child").asChildOf(root.context()).start(); + (DDSpan) tracer.buildSpan("datadog", "my_child").asChildOf(root.spanContext()).start(); root.finish(); assertNull(root.getSamplingPriority()); diff --git a/dd-trace-core/src/test/java/datadog/trace/core/DDSpanContextPropagationTagsTest.java b/dd-trace-core/src/test/java/datadog/trace/core/DDSpanContextPropagationTagsTest.java index e56b8a92cbe..c027685ee2b 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/DDSpanContextPropagationTagsTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/DDSpanContextPropagationTagsTest.java @@ -58,7 +58,7 @@ void updateSpanPropagationTags( new ExtractedContext(DDTraceId.from(123), 456, priority, "789", propagationTags, DATADOG) .withRequestContextDataAppSec("dummy"); DDSpan span = (DDSpan) tracer.buildSpan("datadog", "top").asChildOf(extracted).start(); - PropagationTags dd = span.context().getPropagationTags(); + PropagationTags dd = span.spanContext().getPropagationTags(); span.setSamplingPriority(newPriority, newMechanism); @@ -90,9 +90,9 @@ void updateTracePropagationTags( new ExtractedContext(DDTraceId.from(123), 456, priority, "789", propagationTags, DATADOG) .withRequestContextDataAppSec("dummy"); DDSpan rootSpan = (DDSpan) tracer.buildSpan("datadog", "top").asChildOf(extracted).start(); - PropagationTags ddRoot = rootSpan.context().getPropagationTags(); + PropagationTags ddRoot = rootSpan.spanContext().getPropagationTags(); DDSpan span = - (DDSpan) tracer.buildSpan("datadog", "current").asChildOf(rootSpan.context()).start(); + (DDSpan) tracer.buildSpan("datadog", "current").asChildOf(rootSpan.spanContext()).start(); span.setSamplingPriority(newPriority, newMechanism); @@ -116,9 +116,9 @@ void forceKeepSpanPropagationTags( new ExtractedContext(DDTraceId.from(123), 456, priority, "789", propagationTags, DATADOG) .withRequestContextDataAppSec("dummy"); DDSpan span = (DDSpan) tracer.buildSpan("datadog", "top").asChildOf(extracted).start(); - PropagationTags dd = span.context().getPropagationTags(); + PropagationTags dd = span.spanContext().getPropagationTags(); - span.context().forceKeep(); + span.spanContext().forceKeep(); assertEquals(newHeader, dd.headerValue(PropagationTags.HeaderType.DATADOG)); assertEquals(tagMap, dd.createTagMap()); @@ -144,11 +144,11 @@ void forceKeepTracePropagationTags( new ExtractedContext(DDTraceId.from(123), 456, priority, "789", propagationTags, DATADOG) .withRequestContextDataAppSec("dummy"); DDSpan rootSpan = (DDSpan) tracer.buildSpan("datadog", "top").asChildOf(extracted).start(); - PropagationTags ddRoot = rootSpan.context().getPropagationTags(); + PropagationTags ddRoot = rootSpan.spanContext().getPropagationTags(); DDSpan span = - (DDSpan) tracer.buildSpan("datadog", "current").asChildOf(rootSpan.context()).start(); + (DDSpan) tracer.buildSpan("datadog", "current").asChildOf(rootSpan.spanContext()).start(); - span.context().forceKeep(); + span.spanContext().forceKeep(); assertEquals(rootHeader, ddRoot.headerValue(PropagationTags.HeaderType.DATADOG)); assertEquals(rootTagMap, ddRoot.createTagMap()); diff --git a/dd-trace-core/src/test/java/datadog/trace/core/DDSpanContextTest.java b/dd-trace-core/src/test/java/datadog/trace/core/DDSpanContextTest.java index 4185c9acdab..0c59c0c4f7b 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/DDSpanContextTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/DDSpanContextTest.java @@ -80,7 +80,7 @@ void nullValuesForTagsDeleteExistingTags(String name) throws Exception { .withResourceName("fakeResource") .withSpanType("fakeType") .start(); - DDSpanContext context = (DDSpanContext) span.context(); + DDSpanContext context = (DDSpanContext) span.spanContext(); context.setTag("some.tag", "asdf"); context.setTag(name, null); @@ -125,7 +125,7 @@ void specialTagsSetCertainValues(String scenario, String name, String expected, .withResourceName("fakeResource") .withSpanType("fakeType") .start(); - DDSpanContext context = (DDSpanContext) span.context(); + DDSpanContext context = (DDSpanContext) span.spanContext(); context.setTag(name, expected); span.finish(); @@ -170,7 +170,7 @@ void tagsCanBeAddedToContext(String name, Object value) throws Exception { .withResourceName("fakeResource") .withSpanType("fakeType") .start(); - DDSpanContext context = (DDSpanContext) span.context(); + DDSpanContext context = (DDSpanContext) span.spanContext(); context.setTag(name, value); span.finish(); @@ -206,7 +206,7 @@ void metricsUseExpectedTypes(Class expectedType, Number value) { .withServiceName("fakeService") .withResourceName("fakeResource") .start(); - DDSpanContext context = (DDSpanContext) span.context(); + DDSpanContext context = (DDSpanContext) span.spanContext(); context.setMetric("test", value); @@ -223,7 +223,7 @@ void forceKeepReallyKeepsTrace() { .withServiceName("fakeService") .withResourceName("fakeResource") .start(); - DDSpanContext context = (DDSpanContext) span.context(); + DDSpanContext context = (DDSpanContext) span.spanContext(); context.setSamplingPriority(SAMPLER_DROP, DEFAULT); assertEquals(SAMPLER_DROP, context.getSamplingPriority()); @@ -253,12 +253,12 @@ void setTraceSegmentTagsAndDataOnCorrectSpan() { AgentSpan top = tracer.buildSpan("datadog", "top").asChildOf((AgentSpanContext) extracted).start(); - DDSpanContext topC = (DDSpanContext) top.context(); + DDSpanContext topC = (DDSpanContext) top.spanContext(); TraceSegment topTS = top.getRequestContext().getTraceSegment(); - AgentSpan current = tracer.buildSpan("datadog", "current").asChildOf(top.context()).start(); + AgentSpan current = tracer.buildSpan("datadog", "current").asChildOf(top.spanContext()).start(); TraceSegment currentTS = current.getRequestContext().getTraceSegment(); - DDSpanContext currentC = (DDSpanContext) current.context(); + DDSpanContext currentC = (DDSpanContext) current.spanContext(); currentTS.setDataTop("ctd", "[1]"); currentTS.setTagTop("ctt", "t1"); @@ -300,7 +300,7 @@ void setSingleSpanSamplingTags(double rate, int limit) { .withServiceName("fakeService") .withResourceName("fakeResource") .start(); - DDSpanContext context = (DDSpanContext) span.context(); + DDSpanContext context = (DDSpanContext) span.spanContext(); assertEquals(UNSET, context.getSamplingPriority()); context.setSpanSamplingPriority(rate, limit); @@ -348,20 +348,20 @@ void settingOperationNameTriggersConstantEncoding() { verify(profilingContextIntegration, times(1)).encodeOperationName("fakeOperation"); verify(profilingContextIntegration, times(1)).encodeResourceName("fakeResource"); - assertEquals(1, ((DDSpanContext) span.context()).getEncodedOperationName()); - assertEquals(-1, ((DDSpanContext) span.context()).getEncodedResourceName()); + assertEquals(1, ((DDSpanContext) span.spanContext()).getEncodedOperationName()); + assertEquals(-1, ((DDSpanContext) span.spanContext()).getEncodedResourceName()); when(profilingContextIntegration.encodeOperationName("newOperationName")).thenReturn(2); span.setOperationName("newOperationName"); verify(profilingContextIntegration, times(1)).encodeOperationName("newOperationName"); - assertEquals(2, ((DDSpanContext) span.context()).getEncodedOperationName()); + assertEquals(2, ((DDSpanContext) span.spanContext()).getEncodedOperationName()); when(profilingContextIntegration.encodeResourceName("newResourceName")).thenReturn(-2); span.setResourceName("newResourceName"); verify(profilingContextIntegration, times(1)).encodeResourceName("newResourceName"); - assertEquals(-2, ((DDSpanContext) span.context()).getEncodedResourceName()); + assertEquals(-2, ((DDSpanContext) span.spanContext()).getEncodedResourceName()); span.finish(); } @@ -382,10 +382,10 @@ void spanIdsPrintedAsUnsignedLong() { .withServiceName("fakeService") .withResourceName("fakeResource") .withSpanId(-123456789) - .asChildOf(parent.context()) + .asChildOf(parent.spanContext()) .start(); - DDSpanContext context = (DDSpanContext) span.context(); + DDSpanContext context = (DDSpanContext) span.spanContext(); // even though span ID and parent ID are setup as negative numbers, they should be printed as // their unsigned value @@ -402,8 +402,8 @@ void serviceNameSourceIsPropagatedFromParentToChildSpan() { tracer.buildSpan("datadog", "parentOperation").withServiceName("fakeService").start(); AgentSpan child = - tracer.buildSpan("datadog", "childOperation").asChildOf(parent.context()).start(); - DDSpanContext childContext = (DDSpanContext) child.context(); + tracer.buildSpan("datadog", "childOperation").asChildOf(parent.spanContext()).start(); + DDSpanContext childContext = (DDSpanContext) child.spanContext(); assertEquals(ServiceNameSources.MANUAL, childContext.getServiceNameSource()); @@ -441,7 +441,7 @@ void spanKindOrdinalConstantsAndSpanKindValuesArrayStayInSync() { void setSpanKindOrdinalRoundTripsWithSpanKindValues( String scenario, String kindString, int expectedOrdinal) { AgentSpan span = tracer.buildSpan("test", "test").start(); - DDSpanContext context = (DDSpanContext) span.context(); + DDSpanContext context = (DDSpanContext) span.spanContext(); context.setSpanKindOrdinal(kindString); assertEquals(expectedOrdinal, context.getSpanKindOrdinal()); @@ -462,7 +462,7 @@ void builderLedgerRemovalOfSpanKindClearsCachedOrdinal() { .withTag(SPAN_KIND, Tags.SPAN_KIND_CLIENT) .withTag(SPAN_KIND, (Object) null) .start(); - DDSpanContext context = (DDSpanContext) span.context(); + DDSpanContext context = (DDSpanContext) span.spanContext(); assertNull(context.getTag(SPAN_KIND)); assertEquals(DDSpanContext.SPAN_KIND_UNSET, context.getSpanKindOrdinal()); @@ -537,7 +537,7 @@ void setTagThenRemoveTagClearsSpanKind(String kindString) { assertEquals(kindString, span.getTag(SPAN_KIND)); - ((DDSpan) span).context().removeTag(SPAN_KIND); + ((DDSpan) span).spanContext().removeTag(SPAN_KIND); assertNull(span.getTag(SPAN_KIND)); diff --git a/dd-trace-core/src/test/java/datadog/trace/core/DDSpanSerializationTest.java b/dd-trace-core/src/test/java/datadog/trace/core/DDSpanSerializationTest.java index 78c8dda3c94..cc27763caa3 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/DDSpanSerializationTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/DDSpanSerializationTest.java @@ -59,7 +59,7 @@ void serializeTraceWithIdAsInt(String scenario, String value, String spanType) t CoreTracer tracer = tracerBuilder().writer(writer).build(); DDTraceId traceId = DDTraceId.from(value); long spanId = DDSpanId.from(value); - DDSpanContext context = createContext(spanType, tracer, traceId, spanId); + DDSpanContext context = createSpanContext(spanType, tracer, traceId, spanId); DDSpan span = DDSpan.create("test", 0, context, null); CaptureBuffer capture = new CaptureBuffer(); MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(1024, capture)); @@ -116,7 +116,7 @@ void serializeTraceWithIdAsIntV05(String scenario, String value, String spanType CoreTracer tracer = tracerBuilder().writer(writer).build(); DDTraceId traceId = DDTraceId.from(value); long spanId = DDSpanId.from(value); - DDSpanContext context = createContext(spanType, tracer, traceId, spanId); + DDSpanContext context = createSpanContext(spanType, tracer, traceId, spanId); DDSpan span = DDSpan.create("test", 0, context, null); CaptureBuffer capture = new CaptureBuffer(); MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(1024, capture)); @@ -455,7 +455,7 @@ public void accept(int messageCount, ByteBuffer buffer) { } } - private DDSpanContext createContext( + private DDSpanContext createSpanContext( String spanType, CoreTracer tracer, DDTraceId traceId, long spanId) { Map baggage = new HashMap<>(); baggage.put("a-baggage", "value"); diff --git a/dd-trace-core/src/test/java/datadog/trace/core/DDSpanTest.java b/dd-trace-core/src/test/java/datadog/trace/core/DDSpanTest.java index 611c8806767..a05e9d982c4 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/DDSpanTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/DDSpanTest.java @@ -90,7 +90,7 @@ void gettersAndSetters() { span.setSamplingPriority(PrioritySampling.SAMPLER_KEEP); assertEquals(PrioritySampling.SAMPLER_KEEP, (int) span.getSamplingPriority()); - span.context().lockSamplingPriority(); + span.spanContext().lockSamplingPriority(); span.setSamplingPriority(PrioritySampling.USER_KEEP); assertEquals(PrioritySampling.SAMPLER_KEEP, (int) span.getSamplingPriority()); } @@ -253,18 +253,18 @@ void stoppingWithTimestampBeforeStartTimeYieldsMinDurationOfOne() { void prioritySamplingMetricSetOnlyOnRootSpan() { DDSpan parent = (DDSpan) tracer.buildSpan("datadog", "testParent").start(); DDSpan child1 = - (DDSpan) tracer.buildSpan("datadog", "testChild1").asChildOf(parent.context()).start(); + (DDSpan) tracer.buildSpan("datadog", "testChild1").asChildOf(parent.spanContext()).start(); child1.setSamplingPriority(PrioritySampling.SAMPLER_KEEP); - child1.context().lockSamplingPriority(); + child1.spanContext().lockSamplingPriority(); parent.setSamplingPriority(PrioritySampling.SAMPLER_DROP); child1.finish(); DDSpan child2 = - (DDSpan) tracer.buildSpan("datadog", "testChild2").asChildOf(parent.context()).start(); + (DDSpan) tracer.buildSpan("datadog", "testChild2").asChildOf(parent.spanContext()).start(); child2.finish(); parent.finish(); - assertEquals(PrioritySampling.SAMPLER_KEEP, parent.context().getSamplingPriority()); + assertEquals(PrioritySampling.SAMPLER_KEEP, parent.spanContext().getSamplingPriority()); assertEquals(PrioritySampling.SAMPLER_KEEP, (int) parent.getSamplingPriority()); assertTrue(parent.hasSamplingPriority()); assertEquals(parent.getSamplingPriority(), child1.getSamplingPriority()); @@ -293,10 +293,14 @@ void originSetOnlyOnRootSpan(String scenario, AgentSpanContext extractedContext) throws Exception { DDSpanContext parent = (DDSpanContext) - tracer.buildSpan("datadog", "testParent").asChildOf(extractedContext).start().context(); + tracer + .buildSpan("datadog", "testParent") + .asChildOf(extractedContext) + .start() + .spanContext(); DDSpanContext child = (DDSpanContext) - tracer.buildSpan("datadog", "testChild1").asChildOf(parent).start().context(); + tracer.buildSpan("datadog", "testChild1").asChildOf(parent).start().spanContext(); assertEquals("some-origin", parent.getOrigin().toString()); // Access field directly instead of getter. @@ -328,7 +332,8 @@ static Stream isRootSpanArguments() { void isRootSpanInAndNotInContextOfDistributedTracing( String scenario, AgentSpanContext extractedContext, boolean isTraceRootSpan) { DDSpan root = (DDSpan) tracer.buildSpan("datadog", "root").asChildOf(extractedContext).start(); - DDSpan child = (DDSpan) tracer.buildSpan("datadog", "child").asChildOf(root.context()).start(); + DDSpan child = + (DDSpan) tracer.buildSpan("datadog", "child").asChildOf(root.spanContext()).start(); assertEquals(isTraceRootSpan, root.isRootSpan()); assertFalse(child.isRootSpan()); @@ -356,7 +361,8 @@ static Stream getApplicationRootSpanArguments() { void getApplicationRootSpanInAndNotInContextOfDistributedTracing( String scenario, AgentSpanContext extractedContext) { DDSpan root = (DDSpan) tracer.buildSpan("datadog", "root").asChildOf(extractedContext).start(); - DDSpan child = (DDSpan) tracer.buildSpan("datadog", "child").asChildOf(root.context()).start(); + DDSpan child = + (DDSpan) tracer.buildSpan("datadog", "child").asChildOf(root.spanContext()).start(); assertEquals(root, root.getLocalRootSpan()); assertEquals(root, child.getLocalRootSpan()); @@ -373,7 +379,8 @@ void publishingOfRootSpanClosesRequestContextData() throws Exception { Closeable reqContextData = mock(Closeable.class); TagContext context = new TagContext().withRequestContextDataAppSec(reqContextData); DDSpan root = (DDSpan) tracer.buildSpan("datadog", "root").asChildOf(context).start(); - DDSpan child = (DDSpan) tracer.buildSpan("datadog", "child").asChildOf(root.context()).start(); + DDSpan child = + (DDSpan) tracer.buildSpan("datadog", "child").asChildOf(root.spanContext()).start(); assertEquals(reqContextData, root.getRequestContext().getData(RequestContextSlot.APPSEC)); assertEquals(reqContextData, child.getRequestContext().getData(RequestContextSlot.APPSEC)); @@ -525,12 +532,12 @@ void errorPrioritiesShouldBeRespected() { } private static int pendingReferenceCount(DDSpan span) { - PendingTrace trace = (PendingTrace) span.context().getTraceCollector(); + PendingTrace trace = (PendingTrace) span.spanContext().getTraceCollector(); return PendingTraceTestBridge.getPendingReferenceCount(trace); } private static Collection spans(DDSpan span) { - PendingTrace trace = (PendingTrace) span.context().getTraceCollector(); + PendingTrace trace = (PendingTrace) span.spanContext().getTraceCollector(); return trace.getSpans(); } } diff --git a/dd-trace-core/src/test/java/datadog/trace/core/KnuthSamplingRateTest.java b/dd-trace-core/src/test/java/datadog/trace/core/KnuthSamplingRateTest.java index 8ec4aefc178..324b50ecfe2 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/KnuthSamplingRateTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/KnuthSamplingRateTest.java @@ -83,7 +83,7 @@ void agentRateSamplerSetsKsrPropagatedTag(String scenario, double rate, String e .start(); serviceSampler.setSamplingPriority(span); - Map propagationMap = span.context().getPropagationTags().createTagMap(); + Map propagationMap = span.spanContext().getPropagationTags().createTagMap(); String ksr = propagationMap.get("_dd.p.ksr"); assertEquals(expectedKsr, ksr); @@ -114,7 +114,7 @@ void ruleBasedSamplerSetsKsrPropagatedTagWhenRuleMatches( .start(); ((PrioritySampler) sampler).setSamplingPriority(span); - Map propagationMap = span.context().getPropagationTags().createTagMap(); + Map propagationMap = span.spanContext().getPropagationTags().createTagMap(); String ksr = propagationMap.get("_dd.p.ksr"); assertEquals(expectedKsr, ksr); @@ -141,7 +141,7 @@ void ruleBasedSamplerFallbackToAgentSamplerSetsKsr() { .start(); ((PrioritySampler) sampler).setSamplingPriority(span); - Map propagationMap = span.context().getPropagationTags().createTagMap(); + Map propagationMap = span.spanContext().getPropagationTags().createTagMap(); String ksr = propagationMap.get("_dd.p.ksr"); // When falling back to agent sampler, ksr should still be set (agent rate = 1.0 by default) assertEquals("1", ksr); @@ -167,7 +167,7 @@ void serviceRuleSamplerSetsKsrPropagatedTag() { .start(); ((PrioritySampler) sampler).setSamplingPriority(span); - Map propagationMap = span.context().getPropagationTags().createTagMap(); + Map propagationMap = span.spanContext().getPropagationTags().createTagMap(); String ksr = propagationMap.get("_dd.p.ksr"); assertEquals("0.75", ksr); @@ -192,7 +192,7 @@ void defaultRateSamplerSetsKsrPropagatedTag() { .start(); ((PrioritySampler) sampler).setSamplingPriority(span); - Map propagationMap = span.context().getPropagationTags().createTagMap(); + Map propagationMap = span.spanContext().getPropagationTags().createTagMap(); String ksr = propagationMap.get("_dd.p.ksr"); assertEquals("0.25", ksr); @@ -221,7 +221,7 @@ void ksrIsPropagatedViaXDatadogTagsHeader() { serviceSampler.setSamplingPriority(span); String headerValue = - span.context().getPropagationTags().headerValue(PropagationTags.HeaderType.DATADOG); + span.spanContext().getPropagationTags().headerValue(PropagationTags.HeaderType.DATADOG); assertNotNull(headerValue); assertTrue(headerValue.contains("_dd.p.ksr=0.5")); diff --git a/dd-trace-core/src/test/java/datadog/trace/core/PendingTraceBufferTest.java b/dd-trace-core/src/test/java/datadog/trace/core/PendingTraceBufferTest.java index f64eb105be8..0c29b392623 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/PendingTraceBufferTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/PendingTraceBufferTest.java @@ -539,12 +539,12 @@ private static DDSpan newSpanOf(PendingTrace trace, int samplingPriority, long t } private static DDSpan newSpanOf(DDSpan parent) { - TraceCollector traceCollector = parent.context().getTraceCollector(); + TraceCollector traceCollector = parent.spanContext().getTraceCollector(); DDSpanContext context = new DDSpanContext( - parent.context().getTraceId(), + parent.spanContext().getTraceId(), 2, - parent.context().getSpanId(), + parent.spanContext().getSpanId(), null, "fakeService", "fakeOperation", diff --git a/dd-trace-core/src/test/java/datadog/trace/core/PendingTraceTestBase.java b/dd-trace-core/src/test/java/datadog/trace/core/PendingTraceTestBase.java index c6b5f5a54af..cafdcd50bb3 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/PendingTraceTestBase.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/PendingTraceTestBase.java @@ -33,7 +33,7 @@ void setup() throws Exception { writer = new ListWriter(); tracer = tracerBuilder().writer(writer).build(); rootSpan = (DDSpan) tracer.buildSpan("datadog", "fakeOperation").start(); - traceCollector = (PendingTrace) rootSpan.context().getTraceCollector(); + traceCollector = (PendingTrace) rootSpan.spanContext().getTraceCollector(); assertEquals(0, traceCollector.size()); assertEquals(1, traceCollector.getPendingReferenceCount()); @@ -60,7 +60,7 @@ void singleSpanWrittenWhenFinished() throws InterruptedException, TimeoutExcepti @Test void childFinishesBeforeParent() throws InterruptedException, TimeoutException { DDSpan child = - (DDSpan) tracer.buildSpan("datadog", "child").asChildOf(rootSpan.context()).start(); + (DDSpan) tracer.buildSpan("datadog", "child").asChildOf(rootSpan.spanContext()).start(); assertEquals(2, traceCollector.getPendingReferenceCount()); @@ -82,7 +82,7 @@ void childFinishesBeforeParent() throws InterruptedException, TimeoutException { @Test void parentFinishesBeforeChild() throws InterruptedException, TimeoutException { DDSpan child = - (DDSpan) tracer.buildSpan("datadog", "child").asChildOf(rootSpan.context()).start(); + (DDSpan) tracer.buildSpan("datadog", "child").asChildOf(rootSpan.spanContext()).start(); assertEquals(2, traceCollector.getPendingReferenceCount()); @@ -109,7 +109,7 @@ void childSpansCreatedAfterWrittenReportedSeparately() // may incorrectly add spans after the trace is reported. // in those cases we should still decrement the pending trace count DDSpan childSpan = - (DDSpan) tracer.buildSpan("datadog", "child").asChildOf(rootSpan.context()).start(); + (DDSpan) tracer.buildSpan("datadog", "child").asChildOf(rootSpan.spanContext()).start(); childSpan.finish(); writer.waitForTraces(2); @@ -135,13 +135,13 @@ void partialFlush() throws InterruptedException, TimeoutException { CoreTracer quickTracer = tracerBuilder().writer(writer).build(); try { DDSpan localRoot = (DDSpan) quickTracer.buildSpan("datadog", "root").start(); - PendingTrace trace = (PendingTrace) localRoot.context().getTraceCollector(); + PendingTrace trace = (PendingTrace) localRoot.spanContext().getTraceCollector(); DDSpan child1 = (DDSpan) - quickTracer.buildSpan("datadog", "child1").asChildOf(localRoot.context()).start(); + quickTracer.buildSpan("datadog", "child1").asChildOf(localRoot.spanContext()).start(); DDSpan child2 = (DDSpan) - quickTracer.buildSpan("datadog", "child2").asChildOf(localRoot.context()).start(); + quickTracer.buildSpan("datadog", "child2").asChildOf(localRoot.spanContext()).start(); assertEquals(3, trace.getPendingReferenceCount()); @@ -180,13 +180,13 @@ void partialFlushWithRootSpanClosedLast() throws InterruptedException, TimeoutEx CoreTracer quickTracer = tracerBuilder().writer(writer).build(); try { DDSpan localRoot = (DDSpan) quickTracer.buildSpan("datadog", "root").start(); - PendingTrace trace = (PendingTrace) localRoot.context().getTraceCollector(); + PendingTrace trace = (PendingTrace) localRoot.spanContext().getTraceCollector(); DDSpan child1 = (DDSpan) - quickTracer.buildSpan("datadog", "child1").asChildOf(localRoot.context()).start(); + quickTracer.buildSpan("datadog", "child1").asChildOf(localRoot.spanContext()).start(); DDSpan child2 = (DDSpan) - quickTracer.buildSpan("datadog", "child2").asChildOf(localRoot.context()).start(); + quickTracer.buildSpan("datadog", "child2").asChildOf(localRoot.spanContext()).start(); assertEquals(3, trace.getPendingReferenceCount()); @@ -240,7 +240,7 @@ void partialFlushConcurrencyTest(int threadCount, int spanCount) try { CountDownLatch latch = new CountDownLatch(1); DDSpan localRoot = (DDSpan) tracer.buildSpan("test", "root").start(); - PendingTrace localTraceCollector = (PendingTrace) localRoot.context().getTraceCollector(); + PendingTrace localTraceCollector = (PendingTrace) localRoot.spanContext().getTraceCollector(); List exceptions = new ArrayList<>(); List threads = new ArrayList<>(threadCount); @@ -252,7 +252,8 @@ void partialFlushConcurrencyTest(int threadCount, int spanCount) latch.await(); List spans = new ArrayList<>(spanCount); for (int s = 0; s < spanCount; s++) { - spans.add((DDSpan) tracer.startSpan("test", "child", localRoot.context())); + spans.add( + (DDSpan) tracer.startSpan("test", "child", localRoot.spanContext())); } for (DDSpan span : spans) { span.finish(); diff --git a/dd-trace-core/src/test/java/datadog/trace/core/TraceInterceptorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/TraceInterceptorTest.java index 0d6f6788ca6..c81b31b036b 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/TraceInterceptorTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/TraceInterceptorTest.java @@ -188,13 +188,13 @@ public int priority() { assertEquals(1, trace.size()); DDSpan span = trace.get(0); - assertEquals("modifiedON-test", span.context().getOperationName().toString()); + assertEquals("modifiedON-test", span.spanContext().getOperationName().toString()); assertTrue(span.getServiceName().startsWith("modifiedSN-")); assertEquals("modifiedRN-modifiedON-test", span.getResourceName().toString()); assertEquals("modifiedST-null", span.getSpanType()); - assertTrue(span.context().getErrorFlag()); + assertTrue(span.spanContext().getErrorFlag()); - TagMap tags = span.context().getTags(); + TagMap tags = span.spanContext().getTags(); assertEquals(true, tags.get("boolean-tag")); assertEquals(5.0, tags.get("number-tag")); assertEquals("howdy", tags.get("string-tag")); diff --git a/dd-trace-core/src/test/java/datadog/trace/core/datastreams/CheckpointerTest.java b/dd-trace-core/src/test/java/datadog/trace/core/datastreams/CheckpointerTest.java index 26e4a157aba..e4a084c872c 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/datastreams/CheckpointerTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/datastreams/CheckpointerTest.java @@ -45,7 +45,7 @@ void testSettingProduceAndConsumeCheckpoint() { carrier.entries().stream() .anyMatch(entry -> "dd-pathway-ctx-base64".equals(entry.getKey())); assertTrue(hasPathwayCtxBase64); - assertNotEquals(0L, ((DDSpan) span).context().getPathwayContext().getHash()); + assertNotEquals(0L, ((DDSpan) span).spanContext().getPathwayContext().getHash()); } static class CustomContextCarrier implements DataStreamsContextCarrier { diff --git a/dd-trace-core/src/test/java/datadog/trace/core/datastreams/DefaultPathwayContextTest.java b/dd-trace-core/src/test/java/datadog/trace/core/datastreams/DefaultPathwayContextTest.java index 013a73e2686..8860cf1571c 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/datastreams/DefaultPathwayContextTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/datastreams/DefaultPathwayContextTest.java @@ -534,9 +534,9 @@ void checkContextExtractorDecoratorBehavior(boolean dynamicConfigEnabled) throws assertEquals("L+lDG/Pa9hRkZA==", encoded); if (dynamicConfigEnabled) { assertNotNull(extractedSpan); - assertNotNull(extractedSpan.context()); - assertNotNull(extractedSpan.context().getPathwayContext()); - assertTrue(extractedSpan.context().getPathwayContext().isStarted()); + assertNotNull(extractedSpan.spanContext()); + assertNotNull(extractedSpan.spanContext().getPathwayContext()); + assertTrue(extractedSpan.spanContext().getPathwayContext().isStarted()); } } finally { // cleanup @@ -595,9 +595,9 @@ void checkContextExtractorDecoratorBehaviorWhenTraceDataIsNull(boolean globalDsm assertEquals("L+lDG/Pa9hRkZA==", encoded); if (globalDsmEnabled) { assertNotNull(extractedSpan); - assertNotNull(extractedSpan.context()); - assertNotNull(extractedSpan.context().getPathwayContext()); - assertTrue(extractedSpan.context().getPathwayContext().isStarted()); + assertNotNull(extractedSpan.spanContext()); + assertNotNull(extractedSpan.spanContext().getPathwayContext()); + assertTrue(extractedSpan.spanContext().getPathwayContext().isStarted()); } else { assertNull(extractedSpan); } @@ -667,15 +667,15 @@ void checkContextExtractorDecoratorBehaviorWhenLocalTraceConfigIsNull(boolean gl assertNotNull(extractedSpan); - Object extracted = extractedSpan.context(); + Object extracted = extractedSpan.spanContext(); assertNotNull(extracted); assertEquals("L+lDG/Pa9hRkZA==", encoded); if (globalDsmEnabled) { - assertNotNull(extractedSpan.context().getPathwayContext()); - assertTrue(extractedSpan.context().getPathwayContext().isStarted()); + assertNotNull(extractedSpan.spanContext().getPathwayContext()); + assertTrue(extractedSpan.spanContext().getPathwayContext().isStarted()); } else { - assertNull(extractedSpan.context().getPathwayContext()); + assertNull(extractedSpan.spanContext().getPathwayContext()); } } finally { // cleanup diff --git a/dd-trace-core/src/test/java/datadog/trace/core/otlp/logs/OtlpLogsProtoTest.java b/dd-trace-core/src/test/java/datadog/trace/core/otlp/logs/OtlpLogsProtoTest.java index a9ddef32e35..a17165ef95c 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/otlp/logs/OtlpLogsProtoTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/otlp/logs/OtlpLogsProtoTest.java @@ -473,7 +473,7 @@ private static AgentSpanContext resolveContext(List spans, LogSpec spec) return null; } DDSpan span = spans.get(spec.spanContextIndex); - return span.context(); + return span.spanContext(); } // ── grouping helper ─────────────────────────────────────────────────────── diff --git a/dd-trace-core/src/test/java/datadog/trace/core/otlp/trace/OtlpTraceProtoTest.java b/dd-trace-core/src/test/java/datadog/trace/core/otlp/trace/OtlpTraceProtoTest.java index 6c8c219cbc6..1e3b8df4b24 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/otlp/trace/OtlpTraceProtoTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/otlp/trace/OtlpTraceProtoTest.java @@ -714,7 +714,7 @@ private static List buildSpans(List specs) { TRACER.startSpan( "test", spec.operationName, - spans.get(spec.parentIndex).context(), + spans.get(spec.parentIndex).spanContext(), spec.startMicros); } else { agentSpan = TRACER.startSpan("test", spec.operationName, spec.startMicros); @@ -756,7 +756,7 @@ private static List buildSpans(List specs) { for (LinkSpec link : spec.links) { agentSpan.addLink( SpanLink.from( - spans.get(link.targetIndex).context(), + spans.get(link.targetIndex).spanContext(), link.traceFlags, link.traceState, link.attributes)); diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/HttpExtractorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/HttpExtractorTest.java index eb9727cc4a7..a950013ab7a 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/HttpExtractorTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/HttpExtractorTest.java @@ -200,7 +200,7 @@ void verifyExistenceOfSpanLinks( TagContext context = extractor.extract(headers, stringValuesMap()); - List links = context.getTerminatedContextLinks(); + List links = context.getTerminatedSpanLinks(); assertEquals(expectedSpanLinks.size(), links.size()); for (int i = 0; i < links.size(); i++) { TracePropagationStyle style = expectedSpanLinks.get(i); diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/OrgGuardEndToEndTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/OrgGuardEndToEndTest.java index 447310d897e..3557ad10e68 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/OrgGuardEndToEndTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/OrgGuardEndToEndTest.java @@ -94,7 +94,7 @@ void extractStripsOnMismatch() { Context extracted = propagator.extract(Context.root(), headers, stringValuesMap()); AgentSpan span = AgentSpan.fromContext(extracted); assertNotNull(span, "extracted span missing"); - ExtractedContext ec = (ExtractedContext) span.context(); + ExtractedContext ec = (ExtractedContext) span.spanContext(); assertEquals(DDTraceId.from(123L), ec.getTraceId()); assertEquals(456L, ec.getSpanId()); assertEquals(UNSET, ec.getSamplingPriority()); @@ -116,7 +116,7 @@ void extractTrustedOpm() { headers.put(DatadogHttpCodec.DATADOG_TAGS_KEY, "_dd.p.opm=TRUSTED1,_dd.p.dm=-4"); Context extracted = propagator.extract(Context.root(), headers, stringValuesMap()); - ExtractedContext ec = (ExtractedContext) AgentSpan.fromContext(extracted).context(); + ExtractedContext ec = (ExtractedContext) AgentSpan.fromContext(extracted).spanContext(); assertEquals(2, ec.getSamplingPriority()); assertEquals("TRUSTED1", ec.getPropagationTags().getOrgPropagationMarker().toString()); } @@ -133,7 +133,7 @@ void roundTripPreservesForeignVendors() { headers.put("tracestate", "dd=s:2;o:foo;t.opm:upstream-X;t.dm:-4,vendor1=abc,vendor2=def"); Context extracted = propagator.extract(Context.root(), headers, stringValuesMap()); - ExtractedContext ec = (ExtractedContext) AgentSpan.fromContext(extracted).context(); + ExtractedContext ec = (ExtractedContext) AgentSpan.fromContext(extracted).spanContext(); assertEquals(UNSET, ec.getSamplingPriority(), "should be stripped"); String reEncoded = ec.getPropagationTags().headerValue(W3C); diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/TracingPropagatorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/TracingPropagatorTest.java index 6805c853912..78024ccaac3 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/TracingPropagatorTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/TracingPropagatorTest.java @@ -56,7 +56,7 @@ void testTracingPropagatorContextInjection() { this.propagator.inject(span, carrier, Map::put); - verify(this.injector).inject(same((DDSpanContext) span.context()), same(carrier), any()); + verify(this.injector).inject(same((DDSpanContext) span.spanContext()), same(carrier), any()); span.finish(); tracer.close(); @@ -162,7 +162,7 @@ void testPropagationWhenTracingIsDisabled( int injected = (tracingEnabled || product != UNSET) ? 1 : 0; verify(this.injector, times(injected)) - .inject(same((DDSpanContext) span.context()), same(carrier), any()); + .inject(same((DDSpanContext) span.spanContext()), same(carrier), any()); span.finish(); tracer.close(); diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/W3CHttpInjectorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/W3CHttpInjectorTest.java index fc0256b5eb2..032d2438b6d 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/W3CHttpInjectorTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/W3CHttpInjectorTest.java @@ -132,7 +132,7 @@ void updateLastParentIdOnChildSpan() { long rootSpanId = rootSpan.getSpanId(); AgentScope rootScope = this.tracer.activateSpan(rootSpan); - this.injector.inject((DDSpanContext) rootSpan.context(), carrier, Map::put); + this.injector.inject((DDSpanContext) rootSpan.spanContext(), carrier, Map::put); // trace state has root span id as last parent assertEquals(rootSpanId, extractLastParentId(carrier)); @@ -141,7 +141,7 @@ void updateLastParentIdOnChildSpan() { AgentSpan childSpan = this.tracer.startSpan("test", "child"); long childSpanId = childSpan.getSpanId(); carrier.clear(); - this.injector.inject((DDSpanContext) childSpan.context(), carrier, Map::put); + this.injector.inject((DDSpanContext) childSpan.spanContext(), carrier, Map::put); // trace state has child span id as last parent assertEquals(childSpanId, extractLastParentId(carrier)); @@ -149,7 +149,7 @@ void updateLastParentIdOnChildSpan() { // injecting root span again childSpan.finish(); carrier.clear(); - this.injector.inject((DDSpanContext) rootSpan.context(), carrier, Map::put); + this.injector.inject((DDSpanContext) rootSpan.spanContext(), carrier, Map::put); // trace state has root span is as last parent again assertEquals(rootSpanId, extractLastParentId(carrier)); diff --git a/dd-trace-core/src/test/java/datadog/trace/core/scopemanager/ScopeManagerTest.java b/dd-trace-core/src/test/java/datadog/trace/core/scopemanager/ScopeManagerTest.java index 11ca5fb7c01..122ddd560c7 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/scopemanager/ScopeManagerTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/scopemanager/ScopeManagerTest.java @@ -158,11 +158,11 @@ void setsParentAsCurrentUponClose() { assertSame(childScope, scopeManager.active()); assertEquals( - parentScope.span().context().getSpanId(), - ((DDSpan) childScope.span()).context().getParentId()); + parentScope.span().spanContext().getSpanId(), + ((DDSpan) childScope.span()).spanContext().getParentId()); assertSame( - parentScope.span().context().getTraceCollector(), - childScope.span().context().getTraceCollector()); + parentScope.span().spanContext().getTraceCollector(), + childScope.span().spanContext().getTraceCollector()); childScope.close(); @@ -353,7 +353,7 @@ void continuationAllowsAddingSpansEvenAfterOtherSpansWereCompleted() throws Exce // the child has the correct parent assertNull(scopeManager.active()); assertTrue(spanFinished(childSpan)); - assertEquals(span.context().getSpanId(), ((DDSpan) childSpan).context().getParentId()); + assertEquals(span.spanContext().getSpanId(), ((DDSpan) childSpan).spanContext().getParentId()); assertEquals(1, writer.size()); assertTrue(writer.get(0).containsAll(Arrays.asList(childSpan, span))); } diff --git a/dd-trace-core/src/test/java/datadog/trace/core/taginterceptor/TagInterceptorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/taginterceptor/TagInterceptorTest.java index 296c6d11997..6f1e714334e 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/taginterceptor/TagInterceptorTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/taginterceptor/TagInterceptorTest.java @@ -476,7 +476,7 @@ void samplingPriorityPositiveTagOverridesDecisionMakerFromUpstreamPropagation() assertEquals((int) PrioritySampling.USER_KEEP, span.getSamplingPriority()); assertEquals( "_dd.p.dm=-4", - span.context().getPropagationTags().headerValue(PropagationTags.HeaderType.DATADOG)); + span.spanContext().getPropagationTags().headerValue(PropagationTags.HeaderType.DATADOG)); } @ParameterizedTest @@ -523,7 +523,7 @@ void interceptorsApplyToBuilderToo( span.finish(); writer.waitForTraces(1); - assertEquals(value, getter.apply((DDSpanContext) span.context())); + assertEquals(value, getter.apply((DDSpanContext) span.spanContext())); } @Test diff --git a/dd-trace-core/src/test/java/datadog/trace/core/traceinterceptor/LatencyTraceInterceptorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/traceinterceptor/LatencyTraceInterceptorTest.java index 2397ca2fe6b..dfbc82954fc 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/traceinterceptor/LatencyTraceInterceptorTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/traceinterceptor/LatencyTraceInterceptorTest.java @@ -50,6 +50,6 @@ void testSetSamplingPriorityAccordingToLatency( List trace = writer.firstTrace(); assertEquals(1, trace.size()); DDSpan span = trace.get(0); - assertEquals(expected, span.context().getSamplingPriority()); + assertEquals(expected, span.spanContext().getSamplingPriority()); } } diff --git a/dd-trace-ot/src/main/java/datadog/opentracing/DDTracer.java b/dd-trace-ot/src/main/java/datadog/opentracing/DDTracer.java index 853cb72c077..9494c772aee 100644 --- a/dd-trace-ot/src/main/java/datadog/opentracing/DDTracer.java +++ b/dd-trace-ot/src/main/java/datadog/opentracing/DDTracer.java @@ -485,8 +485,8 @@ public DDSpanBuilder buildSpan(final String operationName) { @Override public void inject(final SpanContext spanContext, final Format format, final C carrier) { if (carrier instanceof TextMap) { - final AgentSpanContext context = converter.toContext(spanContext); - AgentSpan span = fromSpanContext(context); + final AgentSpanContext convertedSpanContext = converter.toContext(spanContext); + AgentSpan span = fromSpanContext(convertedSpanContext); defaultPropagator().inject(span, (TextMap) carrier, TextMapSetter.INSTANCE); } else { log.debug("Unsupported format for propagation - {}", format.getClass().getName()); @@ -534,9 +534,9 @@ public Profiling getProfilingContext() { @Override public TraceSegment getTraceSegment() { - AgentSpanContext ctx = tracer.activeSpan().context(); - if (ctx instanceof DDSpanContext) { - return ((DDSpanContext) ctx).getTraceSegment(); + AgentSpanContext spanContext = tracer.activeSpan().spanContext(); + if (spanContext instanceof DDSpanContext) { + return ((DDSpanContext) spanContext).getTraceSegment(); } return null; } @@ -593,29 +593,29 @@ public DDSpanBuilder asChildOf(final SpanContext parent) { @Override public DDSpanBuilder asChildOf(final Span parent) { if (parent != null) { - delegate.asChildOf(converter.toAgentSpan(parent).context()); + delegate.asChildOf(converter.toAgentSpan(parent).spanContext()); } return this; } @Override public DDSpanBuilder addReference( - final String referenceType, final SpanContext referencedContext) { - if (referencedContext == null) { + final String referenceType, final SpanContext referencedSpanContext) { + if (referencedSpanContext == null) { return this; } - final AgentSpanContext context = converter.toContext(referencedContext); - if (!(context instanceof ExtractedContext) && !(context instanceof DDSpanContext)) { + final AgentSpanContext spanContext = converter.toContext(referencedSpanContext); + if (!(spanContext instanceof ExtractedContext) && !(spanContext instanceof DDSpanContext)) { log.debug( "Expected to have a DDSpanContext or ExtractedContext but got {}", - context.getClass().getName()); + spanContext.getClass().getName()); return this; } if (References.CHILD_OF.equals(referenceType) || References.FOLLOWS_FROM.equals(referenceType)) { - delegate.asChildOf(context); + delegate.asChildOf(spanContext); } else { log.debug("Only support reference type of CHILD_OF and FOLLOWS_FROM"); } @@ -667,7 +667,7 @@ public Span startManual() { @Override public Span start() { final AgentSpan agentSpan = delegate.start(); - agentSpan.context().setIntegrationName("opentracing"); + agentSpan.spanContext().setIntegrationName("opentracing"); return converter.toSpan(agentSpan); } diff --git a/dd-trace-ot/src/main/java/datadog/opentracing/OTSpan.java b/dd-trace-ot/src/main/java/datadog/opentracing/OTSpan.java index e13184374af..419cf3e4e68 100644 --- a/dd-trace-ot/src/main/java/datadog/opentracing/OTSpan.java +++ b/dd-trace-ot/src/main/java/datadog/opentracing/OTSpan.java @@ -30,7 +30,7 @@ class OTSpan implements Span, MutableSpan, WithAgentSpan, SpanWrapper { @Override public SpanContext context() { - return converter.toSpanContext(delegate.context()); + return converter.toSpanContext(delegate.spanContext()); } @Override diff --git a/dd-trace-ot/src/ot31CompatibilityTest/java/datadog/opentracing/OT31ApiTest.java b/dd-trace-ot/src/ot31CompatibilityTest/java/datadog/opentracing/OT31ApiTest.java index 01693ddcdb2..be79fdd953c 100644 --- a/dd-trace-ot/src/ot31CompatibilityTest/java/datadog/opentracing/OT31ApiTest.java +++ b/dd-trace-ot/src/ot31CompatibilityTest/java/datadog/opentracing/OT31ApiTest.java @@ -109,8 +109,8 @@ void testInjectExtract( ddContext.setSamplingPriority(contextPriority, samplingMechanism); tracer.inject(context, Format.Builtin.TEXT_MAP, adapter); - DDTraceId traceId = ((OTSpan) span).getDelegate().context().getTraceId(); - long spanId = ((OTSpan) span).getDelegate().context().getSpanId(); + DDTraceId traceId = ((OTSpan) span).getDelegate().spanContext().getTraceId(); + long spanId = ((OTSpan) span).getDelegate().spanContext().getSpanId(); String expectedTraceparent = "00-" + traceId.toHexStringPadded(32) diff --git a/dd-trace-ot/src/ot33CompatibilityTest/java/datadog/opentracing/OT33ApiTest.java b/dd-trace-ot/src/ot33CompatibilityTest/java/datadog/opentracing/OT33ApiTest.java index cfbfa9a7568..a8f26327ec7 100644 --- a/dd-trace-ot/src/ot33CompatibilityTest/java/datadog/opentracing/OT33ApiTest.java +++ b/dd-trace-ot/src/ot33CompatibilityTest/java/datadog/opentracing/OT33ApiTest.java @@ -95,8 +95,8 @@ void testInjectExtract( ddContext.setSamplingPriority(contextPriority, samplingMechanism); tracer.inject(context, Format.Builtin.TEXT_MAP, adapter); - DDTraceId traceId = ((OTSpan) span).getDelegate().context().getTraceId(); - long spanId = ((OTSpan) span).getDelegate().context().getSpanId(); + DDTraceId traceId = ((OTSpan) span).getDelegate().spanContext().getTraceId(); + long spanId = ((OTSpan) span).getDelegate().spanContext().getSpanId(); String expectedTraceparent = "00-" + traceId.toHexStringPadded(32) diff --git a/dd-trace-ot/src/test/java/datadog/opentracing/DDTracerTest.java b/dd-trace-ot/src/test/java/datadog/opentracing/DDTracerTest.java index 65f249278d1..ff8704e305e 100644 --- a/dd-trace-ot/src/test/java/datadog/opentracing/DDTracerTest.java +++ b/dd-trace-ot/src/test/java/datadog/opentracing/DDTracerTest.java @@ -85,9 +85,10 @@ void shouldProduceBlackholeScopes() throws Exception { assertEquals(1, writer.size()); assertEquals(2, writer.firstTrace().size()); assertEquals( - Long.toString(writer.firstTrace().get(0).context().getSpanId()), span.context().toSpanId()); + Long.toString(writer.firstTrace().get(0).spanContext().getSpanId()), + span.context().toSpanId()); assertEquals( - Long.toString(writer.firstTrace().get(1).context().getSpanId()), + Long.toString(writer.firstTrace().get(1).spanContext().getSpanId()), visibleSpan.context().toSpanId()); tracer.close(); diff --git a/dd-trace-ot/src/test/java/datadog/opentracing/OpenTracingAPITest.java b/dd-trace-ot/src/test/java/datadog/opentracing/OpenTracingAPITest.java index 090b134c490..8d6e8bcb372 100644 --- a/dd-trace-ot/src/test/java/datadog/opentracing/OpenTracingAPITest.java +++ b/dd-trace-ot/src/test/java/datadog/opentracing/OpenTracingAPITest.java @@ -304,7 +304,7 @@ void spanContextIdsEqualTracerIds() throws Exception { assertEquals(testSpan.context().toSpanId(), tracer.getSpanId()); assertEquals( testSpan.context().toTraceId(), - tracer.getInternalTracer().activeSpan().context().getTraceId().toString()); + tracer.getInternalTracer().activeSpan().spanContext().getTraceId().toString()); scope.close(); testSpan.finish(); @@ -442,7 +442,7 @@ void injectAndExtractContext() throws Exception { assertEquals("someService", serverSpanDD.getServiceName()); assertEquals("serverOperation", serverSpanDD.getOperationName().toString()); assertEquals("serverOperation", serverSpanDD.getResourceName().toString()); - assertEquals(clientSpan.context().getSpanId(), serverSpanDD.getParentId()); + assertEquals(clientSpan.spanContext().getSpanId(), serverSpanDD.getParentId()); } @Test diff --git a/internal-api/src/main/java/datadog/trace/api/gateway/InferredProxySpan.java b/internal-api/src/main/java/datadog/trace/api/gateway/InferredProxySpan.java index 1e197733b53..aef0fb81a70 100644 --- a/internal-api/src/main/java/datadog/trace/api/gateway/InferredProxySpan.java +++ b/internal-api/src/main/java/datadog/trace/api/gateway/InferredProxySpan.java @@ -166,7 +166,7 @@ public AgentSpanContext start(AgentSpanContext extracted) { // Store inferred span this.span = span; // Return inferred span as new parent context - return this.span.context(); + return this.span.spanContext(); } private String header(String name) { diff --git a/internal-api/src/main/java/datadog/trace/api/propagation/W3CTraceParent.java b/internal-api/src/main/java/datadog/trace/api/propagation/W3CTraceParent.java index e999185a470..c8a15dc67e4 100644 --- a/internal-api/src/main/java/datadog/trace/api/propagation/W3CTraceParent.java +++ b/internal-api/src/main/java/datadog/trace/api/propagation/W3CTraceParent.java @@ -37,6 +37,6 @@ public static String from(DDTraceId traceId, long spanId, boolean isSampled) { } public static String from(AgentSpan span) { - return from(span.getTraceId(), span.getSpanId(), span.context().getSamplingPriority() > 0); + return from(span.getTraceId(), span.getSpanId(), span.spanContext().getSamplingPriority() > 0); } } diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentPropagation.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentPropagation.java index 094dc7e9fbd..46a01b3f70f 100644 --- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentPropagation.java +++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentPropagation.java @@ -34,7 +34,7 @@ public static AgentSpanContext.Extracted extractContextAndGetSpanContext( final C carrier, final ContextVisitor getter) { Context extracted = Propagators.defaultPropagator().extract(root(), carrier, getter); AgentSpan extractedSpan = fromContext(extracted); - return extractedSpan == null ? null : (AgentSpanContext.Extracted) extractedSpan.context(); + return extractedSpan == null ? null : (AgentSpanContext.Extracted) extractedSpan.spanContext(); } public interface KeyClassifier { diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentSpan.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentSpan.java index 99c90b53b30..0eb67f3ad52 100644 --- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentSpan.java +++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentSpan.java @@ -132,7 +132,7 @@ default boolean isValid() { boolean isSameTrace(AgentSpan otherSpan); - AgentSpanContext context(); + AgentSpanContext spanContext(); String getBaggageItem(String key); diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentSpanContext.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentSpanContext.java index 9b993077444..1dba9438168 100644 --- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentSpanContext.java +++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentSpanContext.java @@ -68,7 +68,7 @@ interface Extracted extends AgentSpanContext { * * @return The span links to other extracted contexts found but terminated. */ - List getTerminatedContextLinks(); + List getTerminatedSpanLinks(); String getForwarded(); diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/BlackHoleSpan.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/BlackHoleSpan.java index 578dd7b04ae..f5e477d2054 100644 --- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/BlackHoleSpan.java +++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/BlackHoleSpan.java @@ -23,7 +23,7 @@ public DDTraceId getTraceId() { } @Override - public AgentSpanContext context() { + public AgentSpanContext spanContext() { return Context.INSTANCE; } diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ExtractedSpan.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ExtractedSpan.java index 8c0013602c4..80d2331ce43 100644 --- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ExtractedSpan.java +++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ExtractedSpan.java @@ -134,7 +134,7 @@ public String getBaggageItem(final String key) { } @Override - public AgentSpanContext context() { + public AgentSpanContext spanContext() { return this.spanContext; } diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/NoopSpan.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/NoopSpan.java index 472744fa4c2..91041164855 100644 --- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/NoopSpan.java +++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/NoopSpan.java @@ -104,7 +104,7 @@ public boolean isSameTrace(final AgentSpan otherSpan) { } @Override - public AgentSpanContext context() { + public AgentSpanContext spanContext() { return NoopSpanContext.INSTANCE; } diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/NoopSpanContext.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/NoopSpanContext.java index 876c0167f51..43458f54928 100644 --- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/NoopSpanContext.java +++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/NoopSpanContext.java @@ -51,7 +51,7 @@ public boolean isRemote() { } @Override - public List getTerminatedContextLinks() { + public List getTerminatedSpanLinks() { return emptyList(); } diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/TagContext.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/TagContext.java index 6cc277e3b22..078ffeb1625 100644 --- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/TagContext.java +++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/TagContext.java @@ -25,7 +25,7 @@ public class TagContext implements AgentSpanContext.Extracted { private final CharSequence origin; private TagMap tags; - private List terminatedContextLinks; + private List terminatedSpanLinks; private Object requestContextDataAppSec; private Object requestContextDataIast; private Object ciVisibilityContextData; @@ -57,7 +57,7 @@ public TagContext( final DDTraceId traceId) { this.origin = origin; this.tags = tags; - this.terminatedContextLinks = null; + this.terminatedSpanLinks = null; this.httpHeaders = httpHeaders == null ? EMPTY_HTTP_HEADERS : httpHeaders; this.baggage = baggage == null ? Collections.emptyMap() : baggage; this.samplingPriority = samplingPriority; @@ -79,15 +79,15 @@ public final CharSequence getOrigin() { } @Override - public List getTerminatedContextLinks() { - return this.terminatedContextLinks == null ? emptyList() : this.terminatedContextLinks; + public List getTerminatedSpanLinks() { + return this.terminatedSpanLinks == null ? emptyList() : this.terminatedSpanLinks; } - public void addTerminatedContextLink(AgentSpanLink link) { - if (this.terminatedContextLinks == null) { - this.terminatedContextLinks = new ArrayList<>(); + public void addTerminatedSpanLink(AgentSpanLink link) { + if (this.terminatedSpanLinks == null) { + this.terminatedSpanLinks = new ArrayList<>(); } - this.terminatedContextLinks.add(link); + this.terminatedSpanLinks.add(link); } @Override diff --git a/internal-api/src/test/groovy/datadog/trace/bootstrap/instrumentation/api/ExtractedSpanTest.groovy b/internal-api/src/test/groovy/datadog/trace/bootstrap/instrumentation/api/ExtractedSpanTest.groovy index 7cdc25a22d9..81bda406fbc 100644 --- a/internal-api/src/test/groovy/datadog/trace/bootstrap/instrumentation/api/ExtractedSpanTest.groovy +++ b/internal-api/src/test/groovy/datadog/trace/bootstrap/instrumentation/api/ExtractedSpanTest.groovy @@ -16,7 +16,7 @@ class ExtractedSpanTest extends Specification { expect: extractedSpan.getTraceId() == traceId extractedSpan.getSpanId() == context.getSpanId() - extractedSpan.context() == context + extractedSpan.spanContext() == context extractedSpan.getTags() == tags extractedSpan.getTag('tag-1') == 'value-1' extractedSpan.getBaggageItem('baggage-2') == 'value-2' @@ -43,7 +43,7 @@ class ExtractedSpanTest extends Specification { expect: extractedSpan.getTraceId() == context.getTraceId() extractedSpan.getSpanId() == context.getSpanId() - extractedSpan.context() == context + extractedSpan.spanContext() == context extractedSpan.getTags().isEmpty() extractedSpan.getTag('tag-1') == null extractedSpan.getBaggageItem('baggage-2') == null From cc3000ee6ad352a8e60ac1190178e51c206ed1e1 Mon Sep 17 00:00:00 2001 From: "dd-octo-sts[bot]" <200755185+dd-octo-sts[bot]@users.noreply.github.com> Date: Tue, 23 Jun 2026 17:43:29 +0000 Subject: [PATCH 030/139] chore: Update Gradle dependencies (#11711) chore: Update Gradle dependencies Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: alexey.kuznetsov --- communication/gradle.lockfile | 2 +- components/annotations/gradle.lockfile | 2 +- components/context/gradle.lockfile | 2 +- components/environment/gradle.lockfile | 2 +- components/http/http-api/gradle.lockfile | 2 +- components/json/gradle.lockfile | 2 +- components/native-loader/gradle.lockfile | 2 +- dd-java-agent/agent-aiguard/gradle.lockfile | 2 +- dd-java-agent/agent-bootstrap/gradle.lockfile | 4 ++-- .../gradle.lockfile | 4 ++-- .../civisibility-test-fixtures/gradle.lockfile | 4 ++-- dd-java-agent/agent-ci-visibility/gradle.lockfile | 4 ++-- dd-java-agent/agent-crashtracking/gradle.lockfile | 15 ++++----------- .../debugger-bootstrap/gradle.lockfile | 2 +- .../agent-debugger/debugger-el/gradle.lockfile | 2 +- .../debugger-test-scala/gradle.lockfile | 2 +- dd-java-agent/agent-debugger/gradle.lockfile | 4 ++-- dd-java-agent/agent-iast/gradle.lockfile | 4 ++-- .../agent-iast/iast-test-fixtures/gradle.lockfile | 4 ++-- dd-java-agent/agent-installer/gradle.lockfile | 4 ++-- dd-java-agent/agent-jmxfetch/gradle.lockfile | 2 +- dd-java-agent/agent-llmobs/gradle.lockfile | 4 ++-- dd-java-agent/agent-logging/gradle.lockfile | 2 +- dd-java-agent/agent-logs-intake/gradle.lockfile | 2 +- .../agent-otel/otel-bootstrap/gradle.lockfile | 2 +- .../agent-otel/otel-shim/gradle.lockfile | 2 +- .../agent-otel/otel-tooling/gradle.lockfile | 2 +- dd-java-agent/agent-profiling/gradle.lockfile | 2 +- .../profiling-controller-ddprof/gradle.lockfile | 2 +- .../profiling-controller-jfr/gradle.lockfile | 2 +- .../implementation/gradle.lockfile | 2 +- .../profiling-controller-openjdk/gradle.lockfile | 2 +- .../profiling-controller-oracle/gradle.lockfile | 2 +- .../profiling-controller/gradle.lockfile | 2 +- .../profiling-ddprof/gradle.lockfile | 2 +- .../profiling-scrubber/gradle.lockfile | 2 +- .../profiling-testing/gradle.lockfile | 2 +- .../profiling-uploader/gradle.lockfile | 2 +- .../profiling-utils/gradle.lockfile | 2 +- dd-java-agent/agent-tooling/gradle.lockfile | 4 ++-- .../appsec/appsec-test-fixtures/gradle.lockfile | 4 ++-- dd-java-agent/appsec/gradle.lockfile | 2 +- .../benchmark-integration/gradle.lockfile | 2 +- .../jetty-perftest/gradle.lockfile | 2 +- .../play-perftest/gradle.lockfile | 2 +- dd-java-agent/benchmark/gradle.lockfile | 2 +- dd-java-agent/cws-tls/gradle.lockfile | 4 ++-- dd-java-agent/ddprof-lib/gradle.lockfile | 2 +- dd-java-agent/gradle.lockfile | 4 ++-- .../gradle.lockfile | 2 +- .../instrumentation-testing/gradle.lockfile | 4 ++-- dd-java-agent/load-generator/gradle.lockfile | 4 ++-- dd-java-agent/testing/gradle.lockfile | 4 ++-- dd-trace-api/gradle.lockfile | 2 +- dd-trace-core/gradle.lockfile | 4 ++-- .../correlation-id-injection/gradle.lockfile | 4 ++-- dd-trace-ot/gradle.lockfile | 4 ++-- internal-api/gradle.lockfile | 2 +- internal-api/internal-api-9/gradle.lockfile | 4 ++-- .../feature-flagging-agent/gradle.lockfile | 4 ++-- .../feature-flagging-api/gradle.lockfile | 2 +- .../feature-flagging-bootstrap/gradle.lockfile | 2 +- .../feature-flagging-lib/gradle.lockfile | 4 ++-- products/metrics/metrics-agent/gradle.lockfile | 2 +- products/metrics/metrics-api/gradle.lockfile | 2 +- products/metrics/metrics-lib/gradle.lockfile | 2 +- remote-config/remote-config-api/gradle.lockfile | 2 +- remote-config/remote-config-core/gradle.lockfile | 2 +- telemetry/gradle.lockfile | 2 +- utils/config-utils/gradle.lockfile | 2 +- utils/container-utils/gradle.lockfile | 2 +- utils/filesystem-utils/gradle.lockfile | 2 +- utils/flare-utils/gradle.lockfile | 2 +- utils/junit-utils/gradle.lockfile | 2 +- utils/logging-utils/gradle.lockfile | 2 +- utils/queue-utils/gradle.lockfile | 2 +- utils/socket-utils/gradle.lockfile | 2 +- utils/test-agent-utils/decoder/gradle.lockfile | 2 +- utils/test-utils/gradle.lockfile | 2 +- utils/time-utils/gradle.lockfile | 2 +- utils/version-utils/gradle.lockfile | 2 +- 81 files changed, 106 insertions(+), 113 deletions(-) diff --git a/communication/gradle.lockfile b/communication/gradle.lockfile index 64b9b6b1a18..459a553c6e7 100644 --- a/communication/gradle.lockfile +++ b/communication/gradle.lockfile @@ -23,7 +23,7 @@ com.github.jnr:jnr-ffi:2.2.19=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=runtimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/components/annotations/gradle.lockfile b/components/annotations/gradle.lockfile index 47e34465f79..0ddb8b99673 100644 --- a/components/annotations/gradle.lockfile +++ b/components/annotations/gradle.lockfile @@ -5,7 +5,7 @@ ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/components/context/gradle.lockfile b/components/context/gradle.lockfile index 67b6dd9f3ec..2aa20040151 100644 --- a/components/context/gradle.lockfile +++ b/components/context/gradle.lockfile @@ -5,7 +5,7 @@ ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/components/environment/gradle.lockfile b/components/environment/gradle.lockfile index f74f8055295..387c7102ceb 100644 --- a/components/environment/gradle.lockfile +++ b/components/environment/gradle.lockfile @@ -5,7 +5,7 @@ ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/components/http/http-api/gradle.lockfile b/components/http/http-api/gradle.lockfile index 0f42cb6bf96..c3d816740e3 100644 --- a/components/http/http-api/gradle.lockfile +++ b/components/http/http-api/gradle.lockfile @@ -5,7 +5,7 @@ ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/components/json/gradle.lockfile b/components/json/gradle.lockfile index e3e7cb9e6fe..d83929ff863 100644 --- a/components/json/gradle.lockfile +++ b/components/json/gradle.lockfile @@ -5,7 +5,7 @@ ch.qos.logback:logback-classic:1.2.13=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,jmhCompileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/components/native-loader/gradle.lockfile b/components/native-loader/gradle.lockfile index 477873ca604..3bfcfe143a8 100644 --- a/components/native-loader/gradle.lockfile +++ b/components/native-loader/gradle.lockfile @@ -5,7 +5,7 @@ ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-aiguard/gradle.lockfile b/dd-java-agent/agent-aiguard/gradle.lockfile index fa826f751fc..4d5eeae95f0 100644 --- a/dd-java-agent/agent-aiguard/gradle.lockfile +++ b/dd-java-agent/agent-aiguard/gradle.lockfile @@ -24,7 +24,7 @@ com.github.jnr:jnr-ffi:2.2.19=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=runtimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-bootstrap/gradle.lockfile b/dd-java-agent/agent-bootstrap/gradle.lockfile index 328fb2adbf0..dbdbcabbca8 100644 --- a/dd-java-agent/agent-bootstrap/gradle.lockfile +++ b/dd-java-agent/agent-bootstrap/gradle.lockfile @@ -22,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=jmhRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=jmhRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=jmhRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=jmhRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,jmhCompileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath @@ -31,7 +31,7 @@ com.google.errorprone:error_prone_annotations:2.0.12=jmhRuntimeClasspath,testCom com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava-testlib:20.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:20.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=jmhRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=jmhRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-ci-visibility/civisibility-instrumentation-test-fixtures/gradle.lockfile b/dd-java-agent/agent-ci-visibility/civisibility-instrumentation-test-fixtures/gradle.lockfile index 7cdf3994600..732423bf8c3 100644 --- a/dd-java-agent/agent-ci-visibility/civisibility-instrumentation-test-fixtures/gradle.lockfile +++ b/dd-java-agent/agent-ci-visibility/civisibility-instrumentation-test-fixtures/gradle.lockfile @@ -26,14 +26,14 @@ com.github.jnr:jnr-ffi:2.2.19=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=runtimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=runtimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=runtimeClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.8.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/gradle.lockfile b/dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/gradle.lockfile index f99e0207d20..2c871d587fc 100644 --- a/dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/gradle.lockfile +++ b/dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/gradle.lockfile @@ -26,14 +26,14 @@ com.github.jnr:jnr-ffi:2.2.19=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=runtimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=runtimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=runtimeClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.8.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-ci-visibility/gradle.lockfile b/dd-java-agent/agent-ci-visibility/gradle.lockfile index 9aba82e434e..f022869ba4b 100644 --- a/dd-java-agent/agent-ci-visibility/gradle.lockfile +++ b/dd-java-agent/agent-ci-visibility/gradle.lockfile @@ -30,7 +30,7 @@ com.github.jnr:jnr-ffi:2.2.19=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=runtimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,compileOnlyDependenciesMetadata,spotbugs,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,compileOnlyDependenciesMetadata,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,compileOnlyDependenciesMetadata,spotbugs,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath @@ -38,7 +38,7 @@ com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:18.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.jimfs:jimfs:1.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.squareup.moshi:moshi:1.11.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath diff --git a/dd-java-agent/agent-crashtracking/gradle.lockfile b/dd-java-agent/agent-crashtracking/gradle.lockfile index 943233e7e46..905b1536fbe 100644 --- a/dd-java-agent/agent-crashtracking/gradle.lockfile +++ b/dd-java-agent/agent-crashtracking/gradle.lockfile @@ -15,9 +15,6 @@ com.fasterxml.jackson.core:jackson-annotations:2.20=testCompileClasspath,testRun com.fasterxml.jackson.core:jackson-core:2.20.0=testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-databind:2.20.0=testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson:jackson-bom:2.20.0=testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-api:3.4.2=testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-transport-zerodep:3.4.2=testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-transport:3.4.2=testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc com.github.jnr:jffi:1.3.15=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-a64asm:1.0.0=runtimeClasspath,testRuntimeClasspath @@ -27,7 +24,7 @@ com.github.jnr:jnr-ffi:2.2.19=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=runtimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath @@ -43,10 +40,9 @@ commons-io:commons-io:2.20.0=spotbugs de.thetaphi:forbiddenapis:3.10=compileClasspath io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath jaxen:jaxen:2.0.0=spotbugs -junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath +junit:junit:4.12=testCompileClasspath,testRuntimeClasspath net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath -net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.javacrumbs.json-unit:json-unit-assertj:2.40.1=testCompileClasspath,testRuntimeClasspath net.javacrumbs.json-unit:json-unit-core:2.40.1=testCompileClasspath,testRuntimeClasspath net.javacrumbs.json-unit:json-unit-json-path:2.40.1=testCompileClasspath,testRuntimeClasspath @@ -56,7 +52,6 @@ net.sf.saxon:Saxon-HE:12.9=spotbugs org.apache.ant:ant-antlr:1.10.14=codenarc org.apache.ant:ant-junit:1.10.14=codenarc org.apache.bcel:bcel:6.11.0=spotbugs -org.apache.commons:commons-compress:1.24.0=testCompileClasspath,testRuntimeClasspath org.apache.commons:commons-lang3:3.19.0=spotbugs org.apache.commons:commons-text:1.14.0=spotbugs org.apache.logging.log4j:log4j-api:2.25.2=spotbugs @@ -83,7 +78,6 @@ org.jacoco:org.jacoco.core:0.8.14=jacocoAnt org.jacoco:org.jacoco.report:0.8.14=jacocoAnt org.jctools:jctools-core-jdk11:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jetbrains:annotations:17.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath @@ -107,12 +101,12 @@ org.ow2.asm:asm-util:9.7.1=runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm-util:9.9=spotbugs org.ow2.asm:asm:9.7.1=runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm:9.9=jacocoAnt,spotbugs -org.rnorth.duct-tape:duct-tape:1.0.8=testCompileClasspath,testRuntimeClasspath org.slf4j:jcl-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath org.slf4j:jul-to-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath org.slf4j:log4j-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-api:1.7.30=compileClasspath,runtimeClasspath -org.slf4j:slf4j-api:1.7.36=testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:1.7.32=testCompileClasspath +org.slf4j:slf4j-api:1.7.36=testRuntimeClasspath org.slf4j:slf4j-api:2.0.17=spotbugs,spotbugsSlf4j org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j org.snakeyaml:snakeyaml-engine:2.9=runtimeClasspath,testRuntimeClasspath @@ -120,6 +114,5 @@ org.spockframework:spock-bom:2.4-groovy-3.0=testCompileClasspath,testRuntimeClas org.spockframework:spock-core:2.4-groovy-3.0=testCompileClasspath,testRuntimeClasspath org.tabletest:tabletest-junit:1.2.1=testCompileClasspath,testRuntimeClasspath org.tabletest:tabletest-parser:1.2.0=testCompileClasspath,testRuntimeClasspath -org.testcontainers:testcontainers:1.21.4=testCompileClasspath,testRuntimeClasspath org.xmlresolver:xmlresolver:5.3.3=spotbugs empty=annotationProcessor,spotbugsPlugins,testAnnotationProcessor diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/gradle.lockfile b/dd-java-agent/agent-debugger/debugger-bootstrap/gradle.lockfile index 2b9eda4e3bd..2fbdf327b21 100644 --- a/dd-java-agent/agent-debugger/debugger-bootstrap/gradle.lockfile +++ b/dd-java-agent/agent-debugger/debugger-bootstrap/gradle.lockfile @@ -7,7 +7,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-instrument-java:0.0.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-debugger/debugger-el/gradle.lockfile b/dd-java-agent/agent-debugger/debugger-el/gradle.lockfile index 740c9a13b5e..1133100013d 100644 --- a/dd-java-agent/agent-debugger/debugger-el/gradle.lockfile +++ b/dd-java-agent/agent-debugger/debugger-el/gradle.lockfile @@ -7,7 +7,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-instrument-java:0.0.4=runtimeClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-debugger/debugger-test-scala/gradle.lockfile b/dd-java-agent/agent-debugger/debugger-test-scala/gradle.lockfile index 5fbcc387009..0503c680709 100644 --- a/dd-java-agent/agent-debugger/debugger-test-scala/gradle.lockfile +++ b/dd-java-agent/agent-debugger/debugger-test-scala/gradle.lockfile @@ -9,7 +9,7 @@ com.eed3si9n:shaded-scalajson_2.13:1.0.0-M4=zinc com.eed3si9n:sjson-new-core_2.13:0.10.1=zinc com.eed3si9n:sjson-new-scalajson_2.13:0.10.1=zinc com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-debugger/gradle.lockfile b/dd-java-agent/agent-debugger/gradle.lockfile index 748ed4881e7..a728dae091c 100644 --- a/dd-java-agent/agent-debugger/gradle.lockfile +++ b/dd-java-agent/agent-debugger/gradle.lockfile @@ -35,13 +35,13 @@ com.github.jnr:jnr-posix:3.1.22=runtimeClasspath,testFixturesRuntimeClasspath,te com.github.jnr:jnr-unixsocket:0.36=compileClasspath,testCompileClasspath com.github.jnr:jnr-unixsocket:0.38.25=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.okhttp3:mockwebserver:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-iast/gradle.lockfile b/dd-java-agent/agent-iast/gradle.lockfile index 22e51988ba7..d7c1f129d4a 100644 --- a/dd-java-agent/agent-iast/gradle.lockfile +++ b/dd-java-agent/agent-iast/gradle.lockfile @@ -30,7 +30,7 @@ com.github.jnr:jnr-posix:3.1.22=jmh,jmhCompileProtoPath,jmhRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=jmh,jmhCompileProtoPath,jmhRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=jmh,jmhCompileProtoPath,jmhRuntimeClasspath com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,jmhAnnotationProcessor,testAnnotationProcessor -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,compileProtoPath,jmhCompileClasspath,jmhRuntimeClasspath,spotbugs,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,compileProtoPath,jmhCompileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.android:annotations:4.1.1.4=jmhRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath @@ -60,7 +60,7 @@ com.google.j2objc:j2objc-annotations:1.3=jmhRuntimeClasspath,testCompileProtoPat com.google.protobuf:protobuf-java:3.18.2=jmhRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.google.protobuf:protobuf-java:3.19.6=annotationProcessor,errorprone,jmhAnnotationProcessor,testAnnotationProcessor com.google.protobuf:protoc:3.17.3=protobufToolsLocator_protoc -com.google.re2j:re2j:1.7=jmh,jmhCompileProtoPath,jmhRuntimeClasspath +com.google.re2j:re2j:1.8=compileClasspath,compileProtoPath,jmh,jmhCompileClasspath,jmhCompileProtoPath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,compileProtoPath,jmh,jmhCompileClasspath,jmhCompileProtoPath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.squareup.okio:okio:1.17.5=compileClasspath,compileProtoPath,jmh,jmhCompileClasspath,jmhCompileProtoPath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.thoughtworks.qdox:qdox:1.12.1=codenarc diff --git a/dd-java-agent/agent-iast/iast-test-fixtures/gradle.lockfile b/dd-java-agent/agent-iast/iast-test-fixtures/gradle.lockfile index 5fb1e702088..892fc053b2b 100644 --- a/dd-java-agent/agent-iast/iast-test-fixtures/gradle.lockfile +++ b/dd-java-agent/agent-iast/iast-test-fixtures/gradle.lockfile @@ -22,14 +22,14 @@ com.github.jnr:jnr-ffi:2.2.19=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=runtimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=runtimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=runtimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-installer/gradle.lockfile b/dd-java-agent/agent-installer/gradle.lockfile index 0651c00ce81..236ed9e9216 100644 --- a/dd-java-agent/agent-installer/gradle.lockfile +++ b/dd-java-agent/agent-installer/gradle.lockfile @@ -30,14 +30,14 @@ com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.27=compileClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=compileClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,main_java25CompileClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-jmxfetch/gradle.lockfile b/dd-java-agent/agent-jmxfetch/gradle.lockfile index b9a9cf7830d..c0214e3cc81 100644 --- a/dd-java-agent/agent-jmxfetch/gradle.lockfile +++ b/dd-java-agent/agent-jmxfetch/gradle.lockfile @@ -17,7 +17,7 @@ com.github.jnr:jnr-ffi:2.1.12=compileClasspath,runtimeClasspath,testCompileClass com.github.jnr:jnr-posix:3.0.53=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.27=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-llmobs/gradle.lockfile b/dd-java-agent/agent-llmobs/gradle.lockfile index 32f5abf928e..fd3dda254bf 100644 --- a/dd-java-agent/agent-llmobs/gradle.lockfile +++ b/dd-java-agent/agent-llmobs/gradle.lockfile @@ -22,14 +22,14 @@ com.github.jnr:jnr-ffi:2.2.19=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=runtimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-logging/gradle.lockfile b/dd-java-agent/agent-logging/gradle.lockfile index 01a72888840..81d56cae563 100644 --- a/dd-java-agent/agent-logging/gradle.lockfile +++ b/dd-java-agent/agent-logging/gradle.lockfile @@ -6,7 +6,7 @@ ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-logs-intake/gradle.lockfile b/dd-java-agent/agent-logs-intake/gradle.lockfile index c4b8355e292..b8ab3914bbe 100644 --- a/dd-java-agent/agent-logs-intake/gradle.lockfile +++ b/dd-java-agent/agent-logs-intake/gradle.lockfile @@ -20,7 +20,7 @@ com.github.jnr:jnr-ffi:2.2.19=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=runtimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-otel/otel-bootstrap/gradle.lockfile b/dd-java-agent/agent-otel/otel-bootstrap/gradle.lockfile index 686151f9366..cedd298ffd2 100644 --- a/dd-java-agent/agent-otel/otel-bootstrap/gradle.lockfile +++ b/dd-java-agent/agent-otel/otel-bootstrap/gradle.lockfile @@ -7,7 +7,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-instrument-java:0.0.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-otel/otel-shim/gradle.lockfile b/dd-java-agent/agent-otel/otel-shim/gradle.lockfile index 12dbfd3e081..2e2169b9910 100644 --- a/dd-java-agent/agent-otel/otel-shim/gradle.lockfile +++ b/dd-java-agent/agent-otel/otel-shim/gradle.lockfile @@ -6,7 +6,7 @@ ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-otel/otel-tooling/gradle.lockfile b/dd-java-agent/agent-otel/otel-tooling/gradle.lockfile index 13735d4e8e6..d1ee2eed110 100644 --- a/dd-java-agent/agent-otel/otel-tooling/gradle.lockfile +++ b/dd-java-agent/agent-otel/otel-tooling/gradle.lockfile @@ -8,7 +8,7 @@ com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath com.datadoghq:dd-instrument-java:0.0.4=compileClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-profiling/gradle.lockfile b/dd-java-agent/agent-profiling/gradle.lockfile index 21e46fb4664..4d068caeb9e 100644 --- a/dd-java-agent/agent-profiling/gradle.lockfile +++ b/dd-java-agent/agent-profiling/gradle.lockfile @@ -22,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=runtimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-profiling/profiling-controller-ddprof/gradle.lockfile b/dd-java-agent/agent-profiling/profiling-controller-ddprof/gradle.lockfile index c0acb610dbd..af038fc157f 100644 --- a/dd-java-agent/agent-profiling/profiling-controller-ddprof/gradle.lockfile +++ b/dd-java-agent/agent-profiling/profiling-controller-ddprof/gradle.lockfile @@ -22,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-profiling/profiling-controller-jfr/gradle.lockfile b/dd-java-agent/agent-profiling/profiling-controller-jfr/gradle.lockfile index c88ea99f8f7..6024f79c17a 100644 --- a/dd-java-agent/agent-profiling/profiling-controller-jfr/gradle.lockfile +++ b/dd-java-agent/agent-profiling/profiling-controller-jfr/gradle.lockfile @@ -6,7 +6,7 @@ ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath diff --git a/dd-java-agent/agent-profiling/profiling-controller-jfr/implementation/gradle.lockfile b/dd-java-agent/agent-profiling/profiling-controller-jfr/implementation/gradle.lockfile index acd60878348..24e5bce1c2d 100644 --- a/dd-java-agent/agent-profiling/profiling-controller-jfr/implementation/gradle.lockfile +++ b/dd-java-agent/agent-profiling/profiling-controller-jfr/implementation/gradle.lockfile @@ -6,7 +6,7 @@ ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/gradle.lockfile b/dd-java-agent/agent-profiling/profiling-controller-openjdk/gradle.lockfile index 55a35cd8877..f21d532c9ee 100644 --- a/dd-java-agent/agent-profiling/profiling-controller-openjdk/gradle.lockfile +++ b/dd-java-agent/agent-profiling/profiling-controller-openjdk/gradle.lockfile @@ -22,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-profiling/profiling-controller-oracle/gradle.lockfile b/dd-java-agent/agent-profiling/profiling-controller-oracle/gradle.lockfile index 848d3ed7daf..eb27a2fd4ea 100644 --- a/dd-java-agent/agent-profiling/profiling-controller-oracle/gradle.lockfile +++ b/dd-java-agent/agent-profiling/profiling-controller-oracle/gradle.lockfile @@ -22,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-profiling/profiling-controller/gradle.lockfile b/dd-java-agent/agent-profiling/profiling-controller/gradle.lockfile index 1c7a07c4ace..a49f7b8e506 100644 --- a/dd-java-agent/agent-profiling/profiling-controller/gradle.lockfile +++ b/dd-java-agent/agent-profiling/profiling-controller/gradle.lockfile @@ -6,7 +6,7 @@ ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-profiling/profiling-ddprof/gradle.lockfile b/dd-java-agent/agent-profiling/profiling-ddprof/gradle.lockfile index f266eaa6de0..c12992ff9c4 100644 --- a/dd-java-agent/agent-profiling/profiling-ddprof/gradle.lockfile +++ b/dd-java-agent/agent-profiling/profiling-ddprof/gradle.lockfile @@ -6,7 +6,7 @@ ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath diff --git a/dd-java-agent/agent-profiling/profiling-scrubber/gradle.lockfile b/dd-java-agent/agent-profiling/profiling-scrubber/gradle.lockfile index fed5f24a026..5552e18ce72 100644 --- a/dd-java-agent/agent-profiling/profiling-scrubber/gradle.lockfile +++ b/dd-java-agent/agent-profiling/profiling-scrubber/gradle.lockfile @@ -5,7 +5,7 @@ ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-profiling/profiling-testing/gradle.lockfile b/dd-java-agent/agent-profiling/profiling-testing/gradle.lockfile index 8ab4ab0755d..8007edd00f4 100644 --- a/dd-java-agent/agent-profiling/profiling-testing/gradle.lockfile +++ b/dd-java-agent/agent-profiling/profiling-testing/gradle.lockfile @@ -6,7 +6,7 @@ ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-profiling/profiling-uploader/gradle.lockfile b/dd-java-agent/agent-profiling/profiling-uploader/gradle.lockfile index 51f00a0a61c..56378b85980 100644 --- a/dd-java-agent/agent-profiling/profiling-uploader/gradle.lockfile +++ b/dd-java-agent/agent-profiling/profiling-uploader/gradle.lockfile @@ -25,7 +25,7 @@ com.github.jnr:jnr-ffi:2.2.19=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=runtimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-profiling/profiling-utils/gradle.lockfile b/dd-java-agent/agent-profiling/profiling-utils/gradle.lockfile index 6d25a529b03..6711d400572 100644 --- a/dd-java-agent/agent-profiling/profiling-utils/gradle.lockfile +++ b/dd-java-agent/agent-profiling/profiling-utils/gradle.lockfile @@ -5,7 +5,7 @@ ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-tooling/gradle.lockfile b/dd-java-agent/agent-tooling/gradle.lockfile index 490b318224e..4298677339b 100644 --- a/dd-java-agent/agent-tooling/gradle.lockfile +++ b/dd-java-agent/agent-tooling/gradle.lockfile @@ -30,7 +30,7 @@ com.github.jnr:jnr-ffi:2.2.19=jmhRuntimeClasspath,testRuntimeClasspath,test_java com.github.jnr:jnr-posix:3.1.22=jmhRuntimeClasspath,testRuntimeClasspath,test_java11RuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=jmhRuntimeClasspath,testRuntimeClasspath,test_java11RuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=jmhRuntimeClasspath,testRuntimeClasspath,test_java11RuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath,test_java11CompileClasspath,test_java11RuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,jmhCompileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath,test_java11CompileClasspath,test_java11RuntimeClasspath @@ -39,7 +39,7 @@ com.google.errorprone:error_prone_annotations:2.0.12=jmhRuntimeClasspath,testCom com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava-testlib:20.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_java11CompileClasspath,test_java11RuntimeClasspath com.google.guava:guava:20.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_java11CompileClasspath,test_java11RuntimeClasspath -com.google.re2j:re2j:1.7=jmhRuntimeClasspath,testRuntimeClasspath,test_java11RuntimeClasspath +com.google.re2j:re2j:1.8=jmhRuntimeClasspath,testRuntimeClasspath,test_java11RuntimeClasspath com.squareup.moshi:moshi:1.11.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_java11CompileClasspath,test_java11RuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_java11CompileClasspath,test_java11RuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_java11CompileClasspath,test_java11RuntimeClasspath diff --git a/dd-java-agent/appsec/appsec-test-fixtures/gradle.lockfile b/dd-java-agent/appsec/appsec-test-fixtures/gradle.lockfile index e2bb6b32f09..cae9cc84acb 100644 --- a/dd-java-agent/appsec/appsec-test-fixtures/gradle.lockfile +++ b/dd-java-agent/appsec/appsec-test-fixtures/gradle.lockfile @@ -22,14 +22,14 @@ com.github.jnr:jnr-ffi:2.2.19=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=runtimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=runtimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=runtimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/appsec/gradle.lockfile b/dd-java-agent/appsec/gradle.lockfile index cd7332a0981..3d554a0250e 100644 --- a/dd-java-agent/appsec/gradle.lockfile +++ b/dd-java-agent/appsec/gradle.lockfile @@ -26,7 +26,7 @@ com.github.jnr:jnr-ffi:2.2.19=jmhRuntimeClasspath,runtimeClasspath,testRuntimeCl com.github.jnr:jnr-posix:3.1.22=jmhRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=jmhRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=jmhRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,jmhCompileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/benchmark-integration/gradle.lockfile b/dd-java-agent/benchmark-integration/gradle.lockfile index ead9d1bd2e8..972ab455e1f 100644 --- a/dd-java-agent/benchmark-integration/gradle.lockfile +++ b/dd-java-agent/benchmark-integration/gradle.lockfile @@ -5,7 +5,7 @@ ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/benchmark-integration/jetty-perftest/gradle.lockfile b/dd-java-agent/benchmark-integration/jetty-perftest/gradle.lockfile index 2d5a659cdfc..e0cd2926a0b 100644 --- a/dd-java-agent/benchmark-integration/jetty-perftest/gradle.lockfile +++ b/dd-java-agent/benchmark-integration/jetty-perftest/gradle.lockfile @@ -5,7 +5,7 @@ ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/benchmark-integration/play-perftest/gradle.lockfile b/dd-java-agent/benchmark-integration/play-perftest/gradle.lockfile index 85d08caf86c..920f2a7e0cd 100644 --- a/dd-java-agent/benchmark-integration/play-perftest/gradle.lockfile +++ b/dd-java-agent/benchmark-integration/play-perftest/gradle.lockfile @@ -20,7 +20,7 @@ com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.8.11=compileClasspath,pla com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.8.11=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.fasterxml:classmate:1.3.1=compileClasspath,play com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:1.3.9=javaScriptCompiler,play,runtimeClasspath diff --git a/dd-java-agent/benchmark/gradle.lockfile b/dd-java-agent/benchmark/gradle.lockfile index 5b10be285d9..b7f5c2fc5eb 100644 --- a/dd-java-agent/benchmark/gradle.lockfile +++ b/dd-java-agent/benchmark/gradle.lockfile @@ -5,7 +5,7 @@ ch.qos.logback:logback-classic:1.2.13=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,jmhCompileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/cws-tls/gradle.lockfile b/dd-java-agent/cws-tls/gradle.lockfile index c474a327ff5..08727e79336 100644 --- a/dd-java-agent/cws-tls/gradle.lockfile +++ b/dd-java-agent/cws-tls/gradle.lockfile @@ -22,14 +22,14 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/ddprof-lib/gradle.lockfile b/dd-java-agent/ddprof-lib/gradle.lockfile index c67c0fd23c4..145897cbafb 100644 --- a/dd-java-agent/ddprof-lib/gradle.lockfile +++ b/dd-java-agent/ddprof-lib/gradle.lockfile @@ -7,7 +7,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:ddprof:1.44.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/gradle.lockfile b/dd-java-agent/gradle.lockfile index 1751c0efb10..ca06c77fbfd 100644 --- a/dd-java-agent/gradle.lockfile +++ b/dd-java-agent/gradle.lockfile @@ -22,14 +22,14 @@ com.github.jnr:jnr-ffi:2.2.19=sharedShadowInclude,testRuntimeClasspath,traceShad com.github.jnr:jnr-posix:3.1.22=sharedShadowInclude,testRuntimeClasspath,traceShadowInclude com.github.jnr:jnr-unixsocket:0.38.25=sharedShadowInclude,testRuntimeClasspath,traceShadowInclude com.github.jnr:jnr-x86asm:1.0.2=sharedShadowInclude,testRuntimeClasspath,traceShadowInclude -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath,traceShadowInclude +com.google.re2j:re2j:1.8=sharedShadowInclude,testRuntimeClasspath,traceShadowInclude com.squareup.moshi:moshi:1.11.0=sharedShadowInclude,testCompileClasspath,testRuntimeClasspath,traceShadowInclude com.squareup.okhttp3:mockwebserver:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation-annotation-processor/gradle.lockfile b/dd-java-agent/instrumentation-annotation-processor/gradle.lockfile index 37f8662a629..eca9a30a550 100644 --- a/dd-java-agent/instrumentation-annotation-processor/gradle.lockfile +++ b/dd-java-agent/instrumentation-annotation-processor/gradle.lockfile @@ -5,7 +5,7 @@ ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation-testing/gradle.lockfile b/dd-java-agent/instrumentation-testing/gradle.lockfile index 331721adb1b..70089b8281a 100644 --- a/dd-java-agent/instrumentation-testing/gradle.lockfile +++ b/dd-java-agent/instrumentation-testing/gradle.lockfile @@ -23,7 +23,7 @@ com.github.jnr:jnr-ffi:2.2.19=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=runtimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=testAnnotationProcessor,testCompileClasspath @@ -38,7 +38,7 @@ com.google.guava:guava:20.0=compileClasspath,runtimeClasspath,testCompileClasspa com.google.guava:guava:32.0.1-jre=testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=testAnnotationProcessor -com.google.re2j:re2j:1.7=runtimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=runtimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/load-generator/gradle.lockfile b/dd-java-agent/load-generator/gradle.lockfile index 433b3d40aa3..53e385c2974 100644 --- a/dd-java-agent/load-generator/gradle.lockfile +++ b/dd-java-agent/load-generator/gradle.lockfile @@ -19,14 +19,14 @@ com.github.jnr:jnr-ffi:2.2.19=compileClasspath,runtimeClasspath,testCompileClass com.github.jnr:jnr-posix:3.1.22=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=runtimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=runtimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=runtimeClasspath,testRuntimeClasspath com.squareup.okio:okio:1.17.5=runtimeClasspath,testRuntimeClasspath com.thoughtworks.qdox:qdox:1.12.1=codenarc diff --git a/dd-java-agent/testing/gradle.lockfile b/dd-java-agent/testing/gradle.lockfile index e18c611afda..437b96b153b 100644 --- a/dd-java-agent/testing/gradle.lockfile +++ b/dd-java-agent/testing/gradle.lockfile @@ -22,14 +22,14 @@ com.github.jnr:jnr-ffi:2.2.19=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=runtimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=runtimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=runtimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-trace-api/gradle.lockfile b/dd-trace-api/gradle.lockfile index 999c11c1784..4ae92e1e87a 100644 --- a/dd-trace-api/gradle.lockfile +++ b/dd-trace-api/gradle.lockfile @@ -6,7 +6,7 @@ ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/dd-trace-core/gradle.lockfile b/dd-trace-core/gradle.lockfile index 0542424dc9d..3f8ca4cfc08 100644 --- a/dd-trace-core/gradle.lockfile +++ b/dd-trace-core/gradle.lockfile @@ -29,7 +29,7 @@ com.github.jnr:jnr-ffi:2.2.19=jmhRuntimeClasspath,runtimeClasspath,testRuntimeCl com.github.jnr:jnr-posix:3.1.22=jmhRuntimeClasspath,runtimeClasspath,testRuntimeClasspath,traceAgentTestRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=jmhRuntimeClasspath,runtimeClasspath,testRuntimeClasspath,traceAgentTestRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=jmhRuntimeClasspath,runtimeClasspath,testRuntimeClasspath,traceAgentTestRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath,traceAgentTestCompileClasspath,traceAgentTestRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,jmhCompileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=testAnnotationProcessor,testCompileClasspath,traceAgentTestAnnotationProcessor,traceAgentTestCompileClasspath @@ -45,7 +45,7 @@ com.google.guava:guava:32.0.1-jre=testAnnotationProcessor,traceAgentTestAnnotati com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testAnnotationProcessor,traceAgentTestAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=testAnnotationProcessor,traceAgentTestAnnotationProcessor com.google.protobuf:protobuf-java:3.14.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,traceAgentTestCompileClasspath,traceAgentTestRuntimeClasspath -com.google.re2j:re2j:1.7=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,traceAgentTestCompileClasspath,traceAgentTestRuntimeClasspath +com.google.re2j:re2j:1.8=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,traceAgentTestCompileClasspath,traceAgentTestRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,traceAgentTestCompileClasspath,traceAgentTestRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,traceAgentTestCompileClasspath,traceAgentTestRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,traceAgentTestCompileClasspath,traceAgentTestRuntimeClasspath diff --git a/dd-trace-ot/correlation-id-injection/gradle.lockfile b/dd-trace-ot/correlation-id-injection/gradle.lockfile index ebdc3ed8b81..8029e76f2df 100644 --- a/dd-trace-ot/correlation-id-injection/gradle.lockfile +++ b/dd-trace-ot/correlation-id-injection/gradle.lockfile @@ -22,14 +22,14 @@ com.github.jnr:jnr-ffi:2.2.19=testCompileClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testCompileClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testCompileClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testCompileClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-trace-ot/gradle.lockfile b/dd-trace-ot/gradle.lockfile index 6be7828557a..983305d1d53 100644 --- a/dd-trace-ot/gradle.lockfile +++ b/dd-trace-ot/gradle.lockfile @@ -22,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=compileClasspath,jmhCompileClasspath,jmhRuntimeCla com.github.jnr:jnr-posix:3.1.22=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,ot31CompatibilityTestCompileClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestCompileClasspath,ot33CompatibilityTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,ot31CompatibilityTestCompileClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestCompileClasspath,ot33CompatibilityTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,ot31CompatibilityTestCompileClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestCompileClasspath,ot33CompatibilityTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,ot31CompatibilityTestCompileClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestCompileClasspath,ot33CompatibilityTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,jmhCompileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,jmhCompileClasspath @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=jmhRuntimeClasspath,ot31CompatibilityTestCompileClas com.google.guava:guava:32.0.1-jre=annotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor -com.google.re2j:re2j:1.7=jmhRuntimeClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=jmhRuntimeClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,ot31CompatibilityTestCompileClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestCompileClasspath,ot33CompatibilityTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=jmhRuntimeClasspath,ot31CompatibilityTestCompileClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestCompileClasspath,ot33CompatibilityTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=jmhRuntimeClasspath,ot31CompatibilityTestCompileClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestCompileClasspath,ot33CompatibilityTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/internal-api/gradle.lockfile b/internal-api/gradle.lockfile index 95f8cf138a4..83c56a20cf1 100644 --- a/internal-api/gradle.lockfile +++ b/internal-api/gradle.lockfile @@ -6,7 +6,7 @@ ch.qos.logback:logback-classic:1.2.13=jmhRuntimeClasspath,testCompileClasspath,t ch.qos.logback:logback-core:1.2.13=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,jmhCompileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/internal-api/internal-api-9/gradle.lockfile b/internal-api/internal-api-9/gradle.lockfile index 0df1005beda..048c951b733 100644 --- a/internal-api/internal-api-9/gradle.lockfile +++ b/internal-api/internal-api-9/gradle.lockfile @@ -22,14 +22,14 @@ com.github.jnr:jnr-ffi:2.2.19=jmhRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=jmhRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=jmhRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=jmhRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,jmhCompileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=jmhRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=jmhRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/products/feature-flagging/feature-flagging-agent/gradle.lockfile b/products/feature-flagging/feature-flagging-agent/gradle.lockfile index 9c36a7152de..233b8c888fb 100644 --- a/products/feature-flagging/feature-flagging-agent/gradle.lockfile +++ b/products/feature-flagging/feature-flagging-agent/gradle.lockfile @@ -20,13 +20,13 @@ com.github.jnr:jnr-ffi:2.2.19=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=runtimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okio:okio:1.17.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.thoughtworks.qdox:qdox:1.12.1=codenarc diff --git a/products/feature-flagging/feature-flagging-api/gradle.lockfile b/products/feature-flagging/feature-flagging-api/gradle.lockfile index bc7d1c414cf..f3661e92730 100644 --- a/products/feature-flagging/feature-flagging-api/gradle.lockfile +++ b/products/feature-flagging/feature-flagging-api/gradle.lockfile @@ -5,7 +5,7 @@ ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/products/feature-flagging/feature-flagging-bootstrap/gradle.lockfile b/products/feature-flagging/feature-flagging-bootstrap/gradle.lockfile index b0aa3f3429a..429ee95712a 100644 --- a/products/feature-flagging/feature-flagging-bootstrap/gradle.lockfile +++ b/products/feature-flagging/feature-flagging-bootstrap/gradle.lockfile @@ -6,7 +6,7 @@ ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/products/feature-flagging/feature-flagging-lib/gradle.lockfile b/products/feature-flagging/feature-flagging-lib/gradle.lockfile index 068665cecf8..038e19e2c68 100644 --- a/products/feature-flagging/feature-flagging-lib/gradle.lockfile +++ b/products/feature-flagging/feature-flagging-lib/gradle.lockfile @@ -22,14 +22,14 @@ com.github.jnr:jnr-ffi:2.2.19=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=runtimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/products/metrics/metrics-agent/gradle.lockfile b/products/metrics/metrics-agent/gradle.lockfile index 28873caa75e..a1725712fbf 100644 --- a/products/metrics/metrics-agent/gradle.lockfile +++ b/products/metrics/metrics-agent/gradle.lockfile @@ -5,7 +5,7 @@ ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/products/metrics/metrics-api/gradle.lockfile b/products/metrics/metrics-api/gradle.lockfile index fa0d53578c2..3ac41d23efb 100644 --- a/products/metrics/metrics-api/gradle.lockfile +++ b/products/metrics/metrics-api/gradle.lockfile @@ -5,7 +5,7 @@ ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/products/metrics/metrics-lib/gradle.lockfile b/products/metrics/metrics-lib/gradle.lockfile index 4047dce96a5..8991417bf73 100644 --- a/products/metrics/metrics-lib/gradle.lockfile +++ b/products/metrics/metrics-lib/gradle.lockfile @@ -16,7 +16,7 @@ com.github.jnr:jnr-ffi:2.1.16=compileClasspath,runtimeClasspath,testCompileClass com.github.jnr:jnr-posix:3.0.61=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.36=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/remote-config/remote-config-api/gradle.lockfile b/remote-config/remote-config-api/gradle.lockfile index f1f2385d732..05af5a871c5 100644 --- a/remote-config/remote-config-api/gradle.lockfile +++ b/remote-config/remote-config-api/gradle.lockfile @@ -5,7 +5,7 @@ ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/remote-config/remote-config-core/gradle.lockfile b/remote-config/remote-config-core/gradle.lockfile index ef1fcf425ba..95ce64435f2 100644 --- a/remote-config/remote-config-core/gradle.lockfile +++ b/remote-config/remote-config-core/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/telemetry/gradle.lockfile b/telemetry/gradle.lockfile index 3ece54b0495..bb04e2cb138 100644 --- a/telemetry/gradle.lockfile +++ b/telemetry/gradle.lockfile @@ -22,7 +22,7 @@ com.github.jnr:jnr-ffi:2.2.19=jmhRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=jmhRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=jmhRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=jmhRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,jmhCompileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/utils/config-utils/gradle.lockfile b/utils/config-utils/gradle.lockfile index 0c2277b2de6..500ced6ec93 100644 --- a/utils/config-utils/gradle.lockfile +++ b/utils/config-utils/gradle.lockfile @@ -6,7 +6,7 @@ ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/utils/container-utils/gradle.lockfile b/utils/container-utils/gradle.lockfile index 6e4d2588813..8ffa36dca84 100644 --- a/utils/container-utils/gradle.lockfile +++ b/utils/container-utils/gradle.lockfile @@ -6,7 +6,7 @@ ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/utils/filesystem-utils/gradle.lockfile b/utils/filesystem-utils/gradle.lockfile index cb80c2c4d90..4e155b1b736 100644 --- a/utils/filesystem-utils/gradle.lockfile +++ b/utils/filesystem-utils/gradle.lockfile @@ -6,7 +6,7 @@ ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/utils/flare-utils/gradle.lockfile b/utils/flare-utils/gradle.lockfile index 4c6457098ab..afb7821b899 100644 --- a/utils/flare-utils/gradle.lockfile +++ b/utils/flare-utils/gradle.lockfile @@ -8,7 +8,7 @@ com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,runtimeClasspath,testCompi com.datadoghq.okio:okio:1.17.6=compileClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/utils/junit-utils/gradle.lockfile b/utils/junit-utils/gradle.lockfile index 3475f628c0c..bd2ad4c9f2f 100644 --- a/utils/junit-utils/gradle.lockfile +++ b/utils/junit-utils/gradle.lockfile @@ -6,7 +6,7 @@ ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/utils/logging-utils/gradle.lockfile b/utils/logging-utils/gradle.lockfile index f417c5b0b88..61115e4b1e7 100644 --- a/utils/logging-utils/gradle.lockfile +++ b/utils/logging-utils/gradle.lockfile @@ -6,7 +6,7 @@ ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/utils/queue-utils/gradle.lockfile b/utils/queue-utils/gradle.lockfile index 7e41dd1fd6d..8c87bf014c1 100644 --- a/utils/queue-utils/gradle.lockfile +++ b/utils/queue-utils/gradle.lockfile @@ -6,7 +6,7 @@ ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/utils/socket-utils/gradle.lockfile b/utils/socket-utils/gradle.lockfile index d2ce0d5b044..f340f460758 100644 --- a/utils/socket-utils/gradle.lockfile +++ b/utils/socket-utils/gradle.lockfile @@ -14,7 +14,7 @@ com.github.jnr:jnr-ffi:2.2.19=compileClasspath,runtimeClasspath,testCompileClass com.github.jnr:jnr-posix:3.1.22=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/utils/test-agent-utils/decoder/gradle.lockfile b/utils/test-agent-utils/decoder/gradle.lockfile index 410c5129240..60180b9aa1f 100644 --- a/utils/test-agent-utils/decoder/gradle.lockfile +++ b/utils/test-agent-utils/decoder/gradle.lockfile @@ -6,7 +6,7 @@ ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/utils/test-utils/gradle.lockfile b/utils/test-utils/gradle.lockfile index 7f3026e0149..8df15a8971c 100644 --- a/utils/test-utils/gradle.lockfile +++ b/utils/test-utils/gradle.lockfile @@ -6,7 +6,7 @@ ch.qos.logback:logback-classic:1.2.13=compileClasspath,testCompileClasspath,test ch.qos.logback:logback-core:1.2.13=compileClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/utils/time-utils/gradle.lockfile b/utils/time-utils/gradle.lockfile index c9ca589593a..787392d983d 100644 --- a/utils/time-utils/gradle.lockfile +++ b/utils/time-utils/gradle.lockfile @@ -6,7 +6,7 @@ ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath diff --git a/utils/version-utils/gradle.lockfile b/utils/version-utils/gradle.lockfile index e37a5924494..d75f29fe2df 100644 --- a/utils/version-utils/gradle.lockfile +++ b/utils/version-utils/gradle.lockfile @@ -5,7 +5,7 @@ ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath From 8ae094c99235953263f10c2ad152b118cabc0f9a Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Tue, 23 Jun 2026 14:58:55 -0400 Subject: [PATCH 031/139] Fix GraalVM native smoke-test OOM and configured MASS Gradle download for arm64. (#11698) Cap quarkus-native native-image builder heap to fix arm64 OOM. Limit CPU usage on CI. Cap Quarkus app. Use L tier for GraalVM to avoid OOM. Cap CPU to 6. Removed 6 CPU cap. Added MASS for arm64. Tweaked comments. Merge branch 'master' into alexeyk/fixed-graalvm-arm64-ci-build Merge branch 'master' into alexeyk/fixed-graalvm-arm64-ci-build # Conflicts: # .gitlab-ci.yml Mirror MASS logic from amd64 to arm64. Merge branch 'master' into alexeyk/fixed-graalvm-arm64-ci-build Co-authored-by: alexey.kuznetsov --- .gitlab-ci.yml | 7 ++++++ .../quarkus-native/application/build.gradle | 22 +++++++++++++------ .../src/main/resources/application.properties | 1 + .../application/build.gradle | 8 +++++++ 4 files changed, 31 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 780fb720177..1937d97cc70 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -788,6 +788,11 @@ muzzle-dep-report: # Apache Maven Wrapper supports MVNW_REPOURL for repository-manager downloads: # https://maven.apache.org/tools/wrapper/#Using_a_Maven_Repository_Manager - export MVNW_REPOURL=${MAVEN_REPOSITORY_PROXY%/} + # Route Gradle distribution download through MASS pull-through cache + - | + mass_read_host="${MASS_READ_URL#https://}" + mass_read_host="${mass_read_host%/}" + sed -i "/^distributionUrl=/ s|services.gradle.org|${mass_read_host}/internal/artifact/services.gradle.org|" gradle/wrapper/gradle-wrapper.properties - *normalize_node_index - *prepare_test_env # Disable CDS in forked JVMs to avoid SIGSEGVs on Linux arm64. @@ -1110,6 +1115,7 @@ test_smoke_graalvm: needs: *needs_build_tests_smoke tags: [ "arch:amd64" ] variables: + <<: *tier_l_variables GRADLE_TARGET: "stageMainDist :dd-smoke-test:spring-boot-3.0-native:test :dd-smoke-test:quarkus-native:test" CACHE_TYPE: "smoke" CI_NO_SPLIT: "true" @@ -1122,6 +1128,7 @@ test_smoke_graalvm_arm64: extends: .test_job_arm64 tags: [ "arch:arm64" ] variables: + <<: *tier_l_variables GRADLE_TARGET: "stageMainDist :dd-smoke-test:spring-boot-3.0-native:test :dd-smoke-test:quarkus-native:test" CACHE_TYPE: "smoke" CI_NO_SPLIT: "true" diff --git a/dd-smoke-tests/quarkus-native/application/build.gradle b/dd-smoke-tests/quarkus-native/application/build.gradle index 8b9c83da46d..65beb08e810 100644 --- a/dd-smoke-tests/quarkus-native/application/build.gradle +++ b/dd-smoke-tests/quarkus-native/application/build.gradle @@ -15,6 +15,10 @@ if (hasProperty('appBuildDir')) { version = "" +// Avoid unlimited CPU usage on CI. +def isCI = providers.environmentVariable("CI").isPresent() +def ciBuildCpuCount = providers.environmentVariable("KUBERNETES_CPU_REQUEST").getOrElse("4") + dependencies { implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") implementation 'io.quarkus:quarkus-resteasy' @@ -36,11 +40,15 @@ if (hasProperty('agentJar')) { // are not properly tracked by this nested gradle build cache, it needs to be tracked // from the outside (see smokeTestApp). final agentJar = property('agentJar') - System.setProperty( - 'quarkus.native.additional-build-args', - "-J-javaagent:${agentJar}," + - "-J-Ddatadog.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd'T'HH:mm:ss.SSS'Z [dd.trace]'," + - "-J-Ddd.profiling.enabled=true," + - "-march=native" - ) + def nativeBuildArgs = [ + "-J-javaagent:${agentJar}", + "-J-Ddatadog.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd'T'HH:mm:ss.SSS'Z [dd.trace]'", + "-J-Ddd.profiling.enabled=true", + "-march=native", + ] + if (isCI) { + nativeBuildArgs.add("-H:NumberOfThreads=$ciBuildCpuCount") + nativeBuildArgs.add("-J-XX:ActiveProcessorCount=$ciBuildCpuCount") + } + System.setProperty('quarkus.native.additional-build-args', nativeBuildArgs.join(',')) } diff --git a/dd-smoke-tests/quarkus-native/application/src/main/resources/application.properties b/dd-smoke-tests/quarkus-native/application/src/main/resources/application.properties index c913c3f19fe..2e3c80d417d 100644 --- a/dd-smoke-tests/quarkus-native/application/src/main/resources/application.properties +++ b/dd-smoke-tests/quarkus-native/application/src/main/resources/application.properties @@ -1,4 +1,5 @@ quarkus.log.level=INFO quarkus.log.category."datadog.smoketest".level=DEBUG quarkus.log.console.format=%d %-5p [%c] '%t' |MT|%X{dd.trace_id}|MS|%X{dd.span_id}|%m%e%n +quarkus.native.native-image-xmx=4g diff --git a/dd-smoke-tests/spring-boot-3.0-native/application/build.gradle b/dd-smoke-tests/spring-boot-3.0-native/application/build.gradle index 01eb6cecb8e..08545cf1e16 100644 --- a/dd-smoke-tests/spring-boot-3.0-native/application/build.gradle +++ b/dd-smoke-tests/spring-boot-3.0-native/application/build.gradle @@ -13,6 +13,10 @@ apply from: "$sharedConfigDirectory/repositories.gradle" ext.withProfiler = hasProperty('profiler') +// Avoid unlimited CPU usage on CI. +def isCI = providers.environmentVariable("CI").isPresent() +def ciBuildCpuCount = providers.environmentVariable("KUBERNETES_CPU_REQUEST").getOrElse("4") + if (hasProperty('appBuildDir')) { buildDir = property('appBuildDir') } @@ -47,6 +51,10 @@ if (hasProperty('agentPath')) { buildArgs.add("-J-Ddd.profiling.scrub.enabled=true") buildArgs.add("-J-Ddd.profiling.start-force-first=true") } + if (isCI) { + buildArgs.add("-H:NumberOfThreads=$ciBuildCpuCount") + buildArgs.add("-J-XX:ActiveProcessorCount=$ciBuildCpuCount") + } jvmArgs.add("-Xmx4096M") } } From e500e6a5c7b53c5a3fe3f0ee730ecab660aeaa66 Mon Sep 17 00:00:00 2001 From: Douglas Q Hawkins Date: Tue, 23 Jun 2026 15:15:18 -0400 Subject: [PATCH 032/139] Wire -Pjmh.includes and -PtestJvm into internal-api JMH config (#11703) Wire -Pjmh.includes and -PtestJvm into internal-api JMH config Without this, -Pjmh.includes is silently ignored by the me.champeau.jmh plugin, requiring a full fat-jar build to run a single benchmark. -PtestJvm was also ignored for JMH execution, defaulting to the Gradle daemon JVM regardless of the requested version. Co-Authored-By: Claude Sonnet 4.6 Merge branch 'master' into dougqh/jmh-gradle-improvements Co-authored-by: devflow.devflow-routing-intake --- internal-api/build.gradle.kts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/internal-api/build.gradle.kts b/internal-api/build.gradle.kts index 305dead4459..c6e03a03883 100644 --- a/internal-api/build.gradle.kts +++ b/internal-api/build.gradle.kts @@ -1,3 +1,4 @@ +import datadog.gradle.plugin.testJvmConstraints.TestJvmSpec import de.thetaphi.forbiddenapis.gradle.CheckForbiddenApis import groovy.lang.Closure @@ -274,4 +275,13 @@ dependencies { jmh { jmhVersion = libs.versions.jmh.get() duplicateClassesStrategy = DuplicatesStrategy.EXCLUDE + + if (project.hasProperty("jmh.includes")) { + includes.add(project.property("jmh.includes") as String) + } + + if (project.hasProperty("testJvm")) { + val testJvmSpec = TestJvmSpec(project) + jvm.set(testJvmSpec.javaTestLauncher.map { it.executablePath.asFile.absolutePath }) + } } From 8206fbc7d678dd02f566785dc571ca37740ed72c Mon Sep 17 00:00:00 2001 From: Douglas Q Hawkins Date: Tue, 23 Jun 2026 16:15:09 -0400 Subject: [PATCH 033/139] Atomics benchmark (#10862) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Atomics benchmark Benchmark to show cost of Atomic vs AtomicFieldUpdater Merge branch 'master' into dougqh/atomics-benchmark spotless Merge branch 'master' into dougqh/atomics-benchmark Update internal-api/src/jmh/java/datadog/trace/util/AtomicsBenchmark.java Co-authored-by: Sarah Chen Fix data race in AtomicsBenchmark scaffolding index sharedLookupIndex was a plain static int incremented by all 8 JMH threads without synchronization — a data race that could cause contention measurements to reflect arbitrary holder access patterns. Move index to @State(Scope.Thread) so each thread has its own cursor. Co-Authored-By: Claude Sonnet 4.6 Wire -Pjmh.includes and -PtestJvm into internal-api JMH config Without this, -Pjmh.includes is silently ignored by the me.champeau.jmh plugin, requiring a full fat-jar build to run a single benchmark. -PtestJvm was also ignored for JMH execution, defaulting to the Gradle daemon JVM regardless of the requested version. Co-Authored-By: Claude Sonnet 4.6 Update AtomicsBenchmark results with corrected Java 17 numbers Re-run after fixing the shared-index data race. The incrementAndGet results increased dramatically (~16M → ~91-121M ops/s) because the prior run was measuring contention on the shared index rather than the atomics themselves. Notable: atomic_incrementAndGet (121M) now outperforms atomicFieldUpdater_incrementAndGet (91M) for the increment op; the AFU advantage is in construction (2215M vs 1872M, saving 16 B/op). Co-Authored-By: Claude Sonnet 4.6 Clarify AtomicsBenchmark recommendation: tradeoff depends on access pattern AFU wins on construction (16 B vs 32 B/op); AtomicInteger wins on incrementAndGet (~33% faster). Updated Javadoc to present both sides rather than a blanket recommendation. Co-Authored-By: Claude Sonnet 4.6 Add VarHandle note to AtomicsBenchmark Javadoc VarHandle (Java 9+) is the modern replacement for AtomicIntegerFieldUpdater and would likely close the incrementAndGet performance gap. Not usable here because internal-api targets Java 8. Co-Authored-By: Claude Sonnet 4.6 Merge branch 'master' into dougqh/atomics-benchmark Drop JMH gradle wiring from atomics PR; fix results header machine name The internal-api/build.gradle.kts -Pjmh.includes / -PtestJvm wiring belongs in its dedicated PR (#11703), not here. Revert it so this PR is just the benchmark. Also correct the results header to "MacBook M1 Pro Max". Co-Authored-By: Claude Opus 4.8 (1M context) Co-authored-by: devflow.devflow-routing-intake --- .../datadog/trace/util/AtomicsBenchmark.java | 172 ++++++++++++++++++ 1 file changed, 172 insertions(+) create mode 100644 internal-api/src/jmh/java/datadog/trace/util/AtomicsBenchmark.java diff --git a/internal-api/src/jmh/java/datadog/trace/util/AtomicsBenchmark.java b/internal-api/src/jmh/java/datadog/trace/util/AtomicsBenchmark.java new file mode 100644 index 00000000000..b1a7f0d26c1 --- /dev/null +++ b/internal-api/src/jmh/java/datadog/trace/util/AtomicsBenchmark.java @@ -0,0 +1,172 @@ +package datadog.trace.util; + +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; +import java.util.function.Supplier; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.Fork; +import org.openjdk.jmh.annotations.Measurement; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.Threads; +import org.openjdk.jmh.annotations.Warmup; + +/** + * The choice between {@link AtomicInteger} and {@link AtomicIntegerFieldUpdater} depends on the + * access pattern: + * + *

+ * + * AtomicFieldUpdater supports {@code int}, {@code long}, and reference types. + * + *

Future: {@code VarHandle} (Java 9+) is the modern replacement for + * AtomicIntegerFieldUpdater. It avoids the reflective field-access overhead, which should close + * the incrementAndGet gap with AtomicInteger while retaining the construction allocation advantage. + * Not available here because internal-api targets Java 8. + * + * Java 17 - MacBook M1 Pro Max - 8 threads + * Benchmark Mode Cnt Score Error Units + * AtomicsBenchmark.atomicFieldUpdater_construction thrpt 6 2215272588.708 ± 88556141.052 ops/s + * AtomicsBenchmark.atomicFieldUpdater_construction:gc.alloc.rate.norm thrpt 6 16.000 ± 0.001 B/op + * + * AtomicsBenchmark.atomicFieldUpdater_get thrpt 6 2174739788.040 ± 56980971.014 ops/s + * AtomicsBenchmark.atomicFieldUpdater_get:gc.alloc.rate.norm thrpt 6 ≈ 10⁻⁶ B/op + * + * AtomicsBenchmark.atomicFieldUpdater_getVolatile thrpt 6 2157331061.707 ± 136900932.336 ops/s + * AtomicsBenchmark.atomicFieldUpdater_getVolatile:gc.alloc.rate.norm thrpt 6 ≈ 10⁻⁶ B/op + * + * AtomicsBenchmark.atomicFieldUpdater_incrementAndGet thrpt 6 90785783.320 ± 7650837.727 ops/s + * AtomicsBenchmark.atomicFieldUpdater_incrementAndGet:gc.alloc.rate.norm thrpt 6 ≈ 10⁻⁴ B/op + * + * AtomicsBenchmark.atomic_construction thrpt 6 1872153219.594 ± 83252749.463 ops/s + * AtomicsBenchmark.atomic_construction:gc.alloc.rate.norm thrpt 6 32.000 ± 0.001 B/op + * + * AtomicsBenchmark.atomic_incrementAndGet thrpt 6 120835704.294 ± 23025991.947 ops/s + * AtomicsBenchmark.atomic_incrementAndGet:gc.alloc.rate.norm thrpt 6 ≈ 10⁻⁴ B/op + * + * AtomicsBenchmark.atomic_read thrpt 6 1968266961.596 ± 57765039.412 ops/s + * AtomicsBenchmark.atomic_read:gc.alloc.rate.norm thrpt 6 ≈ 10⁻⁶ B/op + */ +@Fork(2) +@Warmup(iterations = 2) +@Measurement(iterations = 3) +@Threads(8) +public class AtomicsBenchmark { + static int SIZE = 32; + + static final class AtomicHolder { + final AtomicInteger atomic; + + AtomicHolder(int num) { + this.atomic = new AtomicInteger(num); + } + + int get() { + return this.atomic.get(); + } + + int incrementAndGet() { + return this.atomic.incrementAndGet(); + } + } + + static final class FieldHolder { + static final AtomicIntegerFieldUpdater AFU_FIELD = + AtomicIntegerFieldUpdater.newUpdater(FieldHolder.class, "field"); + + volatile int field; + + FieldHolder(int num) { + this.field = num; + } + + int getVolatile() { + return this.field; + } + + int get() { + return AFU_FIELD.get(this); + } + + int incrementAndGet() { + return AFU_FIELD.incrementAndGet(this); + } + } + + static final AtomicHolder[] atomicHolders = + init( + () -> { + AtomicHolder[] holders = new AtomicHolder[SIZE]; + for (int i = 0; i < holders.length; ++i) { + holders[i] = new AtomicHolder(i * 2); + } + return holders; + }); + + static final FieldHolder[] fieldHolders = + init( + () -> { + FieldHolder[] holders = new FieldHolder[SIZE]; + for (int i = 0; i < holders.length; ++i) { + holders[i] = new FieldHolder(i * 2); + } + return holders; + }); + + static final T init(Supplier supplier) { + return supplier.get(); + } + + @State(Scope.Thread) + public static class BenchmarkState { + int index = 0; + + T next(T[] holders) { + if (++index >= holders.length) index = 0; + return holders[index]; + } + } + + @Benchmark + public Object atomic_construction() { + return new AtomicHolder(0); + } + + @Benchmark + public int atomic_incrementAndGet(BenchmarkState state) { + return state.next(atomicHolders).incrementAndGet(); + } + + @Benchmark + public Object atomic_read(BenchmarkState state) { + return state.next(atomicHolders).get(); + } + + @Benchmark + public Object atomicFieldUpdater_construction() { + return new FieldHolder(0); + } + + @Benchmark + public Object atomicFieldUpdater_getVolatile(BenchmarkState state) { + return state.next(fieldHolders).getVolatile(); + } + + @Benchmark + public Object atomicFieldUpdater_get(BenchmarkState state) { + return state.next(fieldHolders).get(); + } + + @Benchmark + public int atomicFieldUpdater_incrementAndGet(BenchmarkState state) { + return state.next(fieldHolders).incrementAndGet(); + } +} From 00c0301a0741b37688812e670d46273db51e94d1 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Tue, 23 Jun 2026 16:49:02 -0400 Subject: [PATCH 034/139] Use highest version as baseline (#11714) Use highest version as baseline Merge branch 'master' into sarahchen6/tweak-instrumentation-automation Co-authored-by: sarah.chen --- .github/scripts/dependency_age.py | 11 +++++++++- .github/scripts/tests/test_dependency_age.py | 23 ++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/.github/scripts/dependency_age.py b/.github/scripts/dependency_age.py index ff3a46adde4..67d9a76152f 100644 --- a/.github/scripts/dependency_age.py +++ b/.github/scripts/dependency_age.py @@ -439,7 +439,7 @@ def validate_lockfiles(args: argparse.Namespace) -> int: elif published_at > cutoff: hours_remaining = int((published_at - cutoff).total_seconds() / 3600) + 1 group_id, artifact_id, version = gav.split(":", 2) - baseline_version = next((c[len(f"{group_id}:{artifact_id}:"):] for c in baseline_coords if c.startswith(f"{group_id}:{artifact_id}:")), None) + baseline_version = highest_baseline_version(baseline_coords, group_id, artifact_id) eligible = find_eligible_version( group_id=group_id, artifact_id=artifact_id, too_new_version=version, baseline_version=baseline_version, @@ -678,6 +678,15 @@ def fetch_available_versions(group_id: str, artifact_id: str, repo_urls: list[st return [] +# select the highest baseline version of group:artifact present in a lockfile. +def highest_baseline_version(baseline_coords: set[str], group_id: str, artifact_id: str) -> str | None: + prefix = f"{group_id}:{artifact_id}:" + versions = [coord[len(prefix):] for coord in baseline_coords if coord.startswith(prefix)] + if not versions: + return None + return max(versions, key=_version_sort_key) + + # for a too-new coordinate, walk backward through available versions to find the newest one # that meets the age cutoff and is newer than the baseline version def find_eligible_version( diff --git a/.github/scripts/tests/test_dependency_age.py b/.github/scripts/tests/test_dependency_age.py index 6813497e11a..0ceef182d71 100644 --- a/.github/scripts/tests/test_dependency_age.py +++ b/.github/scripts/tests/test_dependency_age.py @@ -1,3 +1,6 @@ +import argparse +import contextlib +import io import json import os import re @@ -6,7 +9,9 @@ import sys import tempfile import unittest +from datetime import datetime, timezone from pathlib import Path +from unittest import mock REPO_ROOT = Path(__file__).resolve().parents[3] SCRIPT = REPO_ROOT / ".github/scripts/dependency_age.py" @@ -469,6 +474,24 @@ def test_summary_groups_outcomes_into_sections(self) -> None: self.assertIn("com.example:update-lib:4.0.0", updated_block) self.assertIn("updated to `3.9.0`", updated_block) + def test_highest_baseline_version_picks_newest_of_coexisting_pins(self) -> None: + # A single lockfile can pin the same artifact at several versions (one per Gradle + # configuration). The baseline should be the newest so that only versions higher than + # the highest existing version are considered upgrades. + baseline_coords = { + "ch.qos.logback:logback-core:1.1.11", + "ch.qos.logback:logback-core:1.2.13", + "ch.qos.logback:logback-core:1.5.34", + "com.example:unrelated:9.9.9", + } + self.assertEqual( + dependency_age.highest_baseline_version(baseline_coords, "ch.qos.logback", "logback-core"), + "1.5.34", + ) + self.assertIsNone( + dependency_age.highest_baseline_version(baseline_coords, "ch.qos.logback", "logback-classic") + ) + def test_summary_omits_empty_sections(self) -> None: # only too-new violations -> only the "reverted" section should appear summary = dependency_age.build_validation_summary( From d875e4fabf40fff6fe1bbeed19235917234082c5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jun 2026 21:34:15 +0000 Subject: [PATCH 035/139] chore(ci): bump the gh-actions-packages group with 2 updates (#11713) chore(ci): bump the gh-actions-packages group with 2 updates Bumps the gh-actions-packages group with 2 updates: [actions/checkout](https://github.com/actions/checkout) and [actions/setup-java](https://github.com/actions/setup-java). Updates `actions/checkout` from 6.0.3 to 7.0.0 - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/df4cb1c069e1874edd31b4311f1884172cec0e10...9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0) Updates `actions/setup-java` from 5.2.0 to 5.3.0 - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/be666c2fcd27ec809703dec50e508c2fdc7f6654...ad2b38190b15e4d6bdf0c97fb4fca8412226d287) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: 7.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: gh-actions-packages - dependency-name: actions/setup-java dependency-version: 5.3.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: gh-actions-packages ... Signed-off-by: dependabot[bot] Merge branch 'master' into dependabot/github_actions/gh-actions-packages-4dc16ecce8 Co-authored-by: AlexeyKuznetsov-DD --- .github/workflows/add-release-to-cloudfoundry.yaml | 2 +- .github/workflows/analyze-changes.yaml | 4 ++-- .github/workflows/create-release-branch.yaml | 4 ++-- .github/workflows/run-system-tests.yaml | 2 +- .github/workflows/update-gradle-dependencies.yaml | 4 ++-- .github/workflows/update-jmxfetch-submodule.yaml | 2 +- .github/workflows/update-smoke-test-latest-versions.yaml | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/add-release-to-cloudfoundry.yaml b/.github/workflows/add-release-to-cloudfoundry.yaml index 064844c7ec4..92b8c75c768 100644 --- a/.github/workflows/add-release-to-cloudfoundry.yaml +++ b/.github/workflows/add-release-to-cloudfoundry.yaml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout "cloudfoundry" branch - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # 6.0.3 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # 7.0.0 with: ref: cloudfoundry - name: Get release version diff --git a/.github/workflows/analyze-changes.yaml b/.github/workflows/analyze-changes.yaml index dfa2863cf43..47478dcbabb 100644 --- a/.github/workflows/analyze-changes.yaml +++ b/.github/workflows/analyze-changes.yaml @@ -16,7 +16,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # 6.0.3 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # 7.0.0 with: submodules: 'recursive' - name: Cache Gradle dependencies @@ -55,7 +55,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # 6.0.3 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # 7.0.0 with: submodules: 'recursive' diff --git a/.github/workflows/create-release-branch.yaml b/.github/workflows/create-release-branch.yaml index 7dd1c38804c..e43e4690b75 100644 --- a/.github/workflows/create-release-branch.yaml +++ b/.github/workflows/create-release-branch.yaml @@ -43,7 +43,7 @@ jobs: echo "branch=release/${TAG%.0}.x" >> "$GITHUB_OUTPUT" - name: Check out repo at tag - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # 6.0.3 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # 7.0.0 with: ref: ${{ steps.determine-tag.outputs.tag }} @@ -82,7 +82,7 @@ jobs: policy: self.pin-system-tests.create-pr - name: Check out repo at release branch - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # 6.0.3 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # 7.0.0 with: ref: ${{ needs.create-release-branch.outputs.release-branch-name }} diff --git a/.github/workflows/run-system-tests.yaml b/.github/workflows/run-system-tests.yaml index e7bd8552acd..bf07b85234f 100644 --- a/.github/workflows/run-system-tests.yaml +++ b/.github/workflows/run-system-tests.yaml @@ -24,7 +24,7 @@ jobs: group: APM Larger Runners steps: - name: Checkout repository - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # 6.0.3 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # 7.0.0 with: submodules: 'recursive' fetch-depth: 0 diff --git a/.github/workflows/update-gradle-dependencies.yaml b/.github/workflows/update-gradle-dependencies.yaml index 7b8edebd7b5..93b920f3460 100644 --- a/.github/workflows/update-gradle-dependencies.yaml +++ b/.github/workflows/update-gradle-dependencies.yaml @@ -21,11 +21,11 @@ jobs: policy: self.update-gradle-dependencies.create-pr - name: Checkout repository - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # 6.0.3 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # 7.0.0 with: submodules: "recursive" - - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0 + - uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5.3.0 with: distribution: 'temurin' java-version: '21' diff --git a/.github/workflows/update-jmxfetch-submodule.yaml b/.github/workflows/update-jmxfetch-submodule.yaml index 40a473be4c5..0abf155976d 100644 --- a/.github/workflows/update-jmxfetch-submodule.yaml +++ b/.github/workflows/update-jmxfetch-submodule.yaml @@ -19,7 +19,7 @@ jobs: policy: self.update-jmxfetch-submodule.create-pr - name: Checkout repository - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # 6.0.3 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # 7.0.0 - name: Update Submodule run: | diff --git a/.github/workflows/update-smoke-test-latest-versions.yaml b/.github/workflows/update-smoke-test-latest-versions.yaml index 8bca8d9cb09..74d3ec83fc5 100644 --- a/.github/workflows/update-smoke-test-latest-versions.yaml +++ b/.github/workflows/update-smoke-test-latest-versions.yaml @@ -21,7 +21,7 @@ jobs: policy: self.update-smoke-test-latest-versions.create-pr - name: Checkout repository - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # 6.0.3 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # 7.0.0 - name: Define branch name id: define-branch From 11646d3c2b751803d25d06439d2c4dc97de5c10d Mon Sep 17 00:00:00 2001 From: "dd-octo-sts[bot]" <200755185+dd-octo-sts[bot]@users.noreply.github.com> Date: Tue, 23 Jun 2026 23:12:48 +0000 Subject: [PATCH 036/139] Update instrumentation Gradle dependencies (#11720) chore: Update instrumentation Gradle dependencies Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Rolled back armeria from `1.40.0` to `1.39.1` to pass the build on GitLab. Co-authored-by: AlexeyKuznetsov-DD --- .../instrumentation/aerospike-4.0/gradle.lockfile | 2 +- .../akka/akka-actor-2.5/gradle.lockfile | 2 +- .../akka/akka-http/akka-http-10.0/gradle.lockfile | 2 +- .../akka-http/akka-http-10.2-iast/gradle.lockfile | 2 +- .../akka/akka-http/akka-http-10.6/gradle.lockfile | 2 +- .../apache-httpasyncclient-4.0/gradle.lockfile | 2 +- .../apache-httpclient-4.0/gradle.lockfile | 2 +- .../apache-httpclient-5.0/gradle.lockfile | 2 +- .../apache-httpcore-4.0/gradle.lockfile | 2 +- .../apache-httpcore-5.0/gradle.lockfile | 2 +- .../armeria/armeria-grpc-0.84/gradle.lockfile | 2 +- .../armeria/armeria-jetty-1.24/gradle.lockfile | 2 +- .../instrumentation/avro-1.11.3/gradle.lockfile | 2 +- .../aws-java/aws-java-common/gradle.lockfile | 2 +- .../aws-java-lambda-handler-1.2/gradle.lockfile | 2 +- .../aws-java/aws-java-sdk-1.11/gradle.lockfile | 2 +- .../aws-java/aws-java-sns-1.0/gradle.lockfile | 2 +- .../aws-java/aws-java-sqs-1.0/gradle.lockfile | 2 +- .../aws-java/aws-java-sqs-2.0/gradle.lockfile | 2 +- .../instrumentation/axis2-1.3/gradle.lockfile | 2 +- .../instrumentation/axway-api-7.5/gradle.lockfile | 2 +- .../azure-functions-1.2.2/gradle.lockfile | 2 +- .../instrumentation/caffeine-1.0/gradle.lockfile | 2 +- .../instrumentation/cdi-1.2/gradle.lockfile | 2 +- .../instrumentation/cics-9.1/gradle.lockfile | 2 +- .../commons-codec-1.1/gradle.lockfile | 2 +- .../commons-fileupload-1.5/gradle.lockfile | 2 +- .../commons-httpclient-2.0/gradle.lockfile | 2 +- .../commons-lang/commons-lang-2.1/gradle.lockfile | 2 +- .../commons-lang/commons-lang-3.5/gradle.lockfile | 2 +- .../commons-text-1.0/gradle.lockfile | 2 +- .../confluent-schema-registry-4.1/gradle.lockfile | 2 +- .../couchbase/couchbase-2.0/gradle.lockfile | 2 +- .../couchbase/couchbase-2.6/gradle.lockfile | 2 +- .../couchbase/couchbase-3.1/gradle.lockfile | 2 +- .../couchbase/couchbase-3.2/gradle.lockfile | 2 +- .../instrumentation/cucumber-5.4/gradle.lockfile | 2 +- .../instrumentation/cxf-2.1/gradle.lockfile | 2 +- .../datadog/asm/iast-instrumenter/gradle.lockfile | 2 +- .../span-origin/gradle.lockfile | 2 +- .../enable-wallclock-profiling/gradle.lockfile | 2 +- .../profiling/exception-profiling/gradle.lockfile | 2 +- .../tracing/trace-annotation/gradle.lockfile | 2 +- .../datanucleus-4.0.5/gradle.lockfile | 2 +- .../datastax-cassandra-3.0/gradle.lockfile | 2 +- .../datastax-cassandra-3.8/gradle.lockfile | 2 +- .../datastax-cassandra-4.0/gradle.lockfile | 2 +- .../drools/drools-6.0/gradle.lockfile | 2 +- .../dropwizard/dropwizard-0.8/gradle.lockfile | 2 +- .../dropwizard-views-0.7/gradle.lockfile | 2 +- .../elasticsearch-common/gradle.lockfile | 2 +- .../elasticsearch-rest-5.0/gradle.lockfile | 2 +- .../elasticsearch-rest-6.4/gradle.lockfile | 2 +- .../elasticsearch-rest-7.0/gradle.lockfile | 2 +- .../elasticsearch-transport-2.0/gradle.lockfile | 2 +- .../elasticsearch-transport-5.0/gradle.lockfile | 2 +- .../elasticsearch-transport-5.3/gradle.lockfile | 2 +- .../elasticsearch-transport-6.0/gradle.lockfile | 2 +- .../elasticsearch-transport-7.3/gradle.lockfile | 2 +- .../elasticsearch-transport-common/gradle.lockfile | 2 +- .../instrumentation/finatra-2.9/gradle.lockfile | 2 +- .../freemarker/freemarker-2.3.24/gradle.lockfile | 2 +- .../freemarker/freemarker-2.3.9/gradle.lockfile | 2 +- .../instrumentation/gax-1.4/gradle.lockfile | 2 +- .../instrumentation/glassfish-3.0/gradle.lockfile | 2 +- .../google-http-client-1.19/gradle.lockfile | 2 +- .../google-pubsub-1.116/gradle.lockfile | 3 +-- .../graal/graal-native-image-20.0/gradle.lockfile | 2 +- .../instrumentation/graal/gradle.lockfile | 2 +- .../gradle-testing-5.1/gradle.lockfile | 2 +- dd-java-agent/instrumentation/gradle.lockfile | 2 +- .../gradle/gradle-3.0/gradle.lockfile | 2 +- .../gradle/gradle-8.3/gradle.lockfile | 2 +- .../graphql-java/graphql-java-14.0/gradle.lockfile | 2 +- .../graphql-java/graphql-java-20.0/gradle.lockfile | 2 +- .../graphql-java-common/gradle.lockfile | 2 +- .../grizzly/grizzly-2.0/gradle.lockfile | 2 +- .../grizzly/grizzly-client-1.9/gradle.lockfile | 2 +- .../grizzly/grizzly-http-2.3.20/gradle.lockfile | 2 +- .../instrumentation/gson-1.6/gradle.lockfile | 2 +- .../instrumentation/guava-10.0/gradle.lockfile | 2 +- .../hazelcast/hazelcast-3.6/gradle.lockfile | 2 +- .../hazelcast/hazelcast-3.9/gradle.lockfile | 2 +- .../hazelcast/hazelcast-4.0/gradle.lockfile | 2 +- .../hibernate/hibernate-common/gradle.lockfile | 2 +- .../hibernate/hibernate-core-3.3/gradle.lockfile | 2 +- .../hibernate/hibernate-core-4.0/gradle.lockfile | 2 +- .../hibernate/hibernate-core-4.3/gradle.lockfile | 2 +- .../instrumentation/hystrix-1.4/gradle.lockfile | 2 +- .../instrumentation/ignite-2.0/gradle.lockfile | 2 +- .../jackson-core-1.9.13/gradle.lockfile | 2 +- .../jackson-core/jackson-core-2.0/gradle.lockfile | 2 +- .../jackson-core/jackson-core-2.12/gradle.lockfile | 2 +- .../jackson-core/jackson-core-2.16/gradle.lockfile | 2 +- .../jackson-core/jackson-core-2.6/gradle.lockfile | 2 +- .../jackson-core/jackson-core-2.8/gradle.lockfile | 2 +- .../jackson-core-common/gradle.lockfile | 2 +- .../instrumentation/jacoco-0.8.9/gradle.lockfile | 2 +- .../java-concurrent-1.8/gradle.lockfile | 2 +- .../java-concurrent-21.0/gradle.lockfile | 2 +- .../java-concurrent-25.0/gradle.lockfile | 2 +- .../java/java-io-1.8/gradle.lockfile | 2 +- .../java/java-lang/java-lang-1.8/gradle.lockfile | 2 +- .../java/java-lang/java-lang-11.0/gradle.lockfile | 2 +- .../java/java-lang/java-lang-15.0/gradle.lockfile | 2 +- .../java/java-lang/java-lang-17.0/gradle.lockfile | 2 +- .../java/java-lang/java-lang-21.0/gradle.lockfile | 2 +- .../java/java-lang/java-lang-22.0/gradle.lockfile | 2 +- .../java/java-lang/java-lang-9.0/gradle.lockfile | 2 +- .../java-lang-classloading-1.8/gradle.lockfile | 2 +- .../java/java-net/java-net-1.8/gradle.lockfile | 2 +- .../java/java-net/java-net-11.0/gradle.lockfile | 2 +- .../java/java-nio-1.8/gradle.lockfile | 2 +- .../java/java-rmi-1.1/gradle.lockfile | 2 +- .../java/java-security-1.8/gradle.lockfile | 2 +- .../java/java-util-1.8/gradle.lockfile | 2 +- .../javax-naming-1.0/gradle.lockfile | 2 +- .../instrumentation/javax-xml-1.4/gradle.lockfile | 2 +- .../jboss/jboss-logmanager-1.1/gradle.lockfile | 2 +- .../jboss/jboss-modules-1.3/gradle.lockfile | 2 +- dd-java-agent/instrumentation/jdbc/gradle.lockfile | 2 +- .../jdbc/scalikejdbc-3.5/gradle.lockfile | 2 +- .../jedis/jedis-1.4/gradle.lockfile | 2 +- .../jedis/jedis-3.0/gradle.lockfile | 2 +- .../jedis/jedis-4.0/gradle.lockfile | 2 +- .../jersey/jersey-2.0/gradle.lockfile | 2 +- .../jersey/jersey-client-2.0/gradle.lockfile | 2 +- .../jersey/jersey-filter-2.0/gradle.lockfile | 2 +- .../jetty-appsec/jetty-appsec-11.0/gradle.lockfile | 2 +- .../jetty-appsec/jetty-appsec-7.0/gradle.lockfile | 2 +- .../jetty-appsec-8.1.3/gradle.lockfile | 2 +- .../jetty-appsec/jetty-appsec-9.2/gradle.lockfile | 2 +- .../jetty-appsec/jetty-appsec-9.3/gradle.lockfile | 2 +- .../jetty-appsec/jetty-appsec-9.4/gradle.lockfile | 2 +- .../jetty-client/jetty-client-10.0/gradle.lockfile | 2 +- .../jetty-client/jetty-client-12.0/gradle.lockfile | 2 +- .../jetty-client/jetty-client-9.1/gradle.lockfile | 2 +- .../jetty-client-common/gradle.lockfile | 2 +- .../jetty/jetty-common/gradle.lockfile | 2 +- .../jetty-server/jetty-server-10.0/gradle.lockfile | 2 +- .../jetty-server/jetty-server-11.0/gradle.lockfile | 2 +- .../jetty-server/jetty-server-12.0/gradle.lockfile | 2 +- .../jetty-server/jetty-server-7.0/gradle.lockfile | 2 +- .../jetty-server/jetty-server-7.6/gradle.lockfile | 2 +- .../jetty-server-9.0.4/gradle.lockfile | 2 +- .../jetty-server/jetty-server-9.0/gradle.lockfile | 2 +- .../jetty-server/jetty-server-9.3/gradle.lockfile | 2 +- .../jetty-server-9.4.21/gradle.lockfile | 2 +- .../jetty/jetty-util-9.4.31/gradle.lockfile | 2 +- .../jms/jakarta-jms-3.0/gradle.lockfile | 2 +- .../jms/javax-jms-1.1/gradle.lockfile | 2 +- .../instrumentation/jose-jwt-4.0/gradle.lockfile | 2 +- .../instrumentation/jsp-2.3/gradle.lockfile | 10 +++++----- .../junit-4/junit-4-cucumber-5.4/gradle.lockfile | 2 +- .../junit-4/junit-4-munit-0.7.28/gradle.lockfile | 2 +- .../junit/junit-4/junit-4.10/gradle.lockfile | 2 +- .../junit/junit-4/junit-4.13/gradle.lockfile | 2 +- .../junit-5/junit-5-cucumber-5.4/gradle.lockfile | 2 +- .../junit-5/junit-5-spock-2.0/gradle.lockfile | 2 +- .../junit/junit-5/junit-5.3/gradle.lockfile | 2 +- .../junit/junit-5/junit-5.8/gradle.lockfile | 2 +- .../kafka/kafka-clients-0.11/gradle.lockfile | 2 +- .../kafka/kafka-clients-3.8/gradle.lockfile | 2 +- .../kafka/kafka-common/gradle.lockfile | 2 +- .../kafka/kafka-connect-0.11/gradle.lockfile | 2 +- .../kafka/kafka-streams-0.11/gradle.lockfile | 2 +- .../kafka/kafka-streams-1.0/gradle.lockfile | 2 +- .../instrumentation/karate-1.0/gradle.lockfile | 2 +- .../kotlin-coroutines-1.3/gradle.lockfile | 2 +- .../lettuce/lettuce-4.0/gradle.lockfile | 2 +- .../lettuce/lettuce-5.0/gradle.lockfile | 2 +- .../liberty/liberty-20.0/gradle.lockfile | 2 +- .../liberty/liberty-23.0/gradle.lockfile | 2 +- .../log4j/log4j-1.2.4/gradle.lockfile | 2 +- .../log4j/log4j-2.0/gradle.lockfile | 2 +- .../log4j/log4j-2.7/gradle.lockfile | 2 +- .../instrumentation/logback-1.0/gradle.lockfile | 2 +- .../mail/jakarta-mail-2.0.1/gradle.lockfile | 2 +- .../mail/javax-mail-1.4.4/gradle.lockfile | 2 +- .../maven/maven-3.2.1/gradle.lockfile | 2 +- .../maven/maven-surefire-3.0/gradle.lockfile | 2 +- .../gradle.lockfile | 2 +- .../gradle.lockfile | 2 +- .../gradle.lockfile | 2 +- .../gradle.lockfile | 2 +- .../mongo/mongo-common/gradle.lockfile | 2 +- .../mongo-driver-3.1/gradle.lockfile | 2 +- .../mongo-driver-3.4/gradle.lockfile | 2 +- .../mongo-driver-3.6/gradle.lockfile | 2 +- .../mongo-driver-3.8/gradle.lockfile | 2 +- .../mongo-driver/mongo-driver-4.0/gradle.lockfile | 2 +- .../mongo-test-async-3.3/gradle.lockfile | 2 +- .../mongo-test/mongo-test-core-3.1/gradle.lockfile | 2 +- .../mongo-test/mongo-test-core-3.7/gradle.lockfile | 2 +- .../mongo-test-sync-3.10/gradle.lockfile | 2 +- .../instrumentation/mule-4.5/gradle.lockfile | 2 +- .../netty/netty-3.8/gradle.lockfile | 2 +- .../netty/netty-4.0/gradle.lockfile | 2 +- .../netty/netty-4.1/gradle.lockfile | 2 +- .../netty/netty-buffer-4.0/gradle.lockfile | 2 +- .../netty/netty-common/gradle.lockfile | 2 +- .../netty/netty-concurrent-4.0/gradle.lockfile | 2 +- .../netty/netty-promise-4.0/gradle.lockfile | 2 +- .../ognl-appsec-3.3.2/gradle.lockfile | 2 +- .../okhttp/okhttp-2.2/gradle.lockfile | 2 +- .../okhttp/okhttp-3.0/gradle.lockfile | 2 +- .../openai-java/openai-java-3.0/gradle.lockfile | 2 +- .../opensearch/opensearch-common/gradle.lockfile | 2 +- .../opensearch/opensearch-rest-1.0/gradle.lockfile | 2 +- .../opensearch-transport-1.0/gradle.lockfile | 2 +- .../instrumentation/opentelemetry/gradle.lockfile | 2 +- .../opentelemetry-0.3/gradle.lockfile | 2 +- .../opentelemetry-1.27/gradle.lockfile | 2 +- .../opentelemetry-1.4/gradle.lockfile | 2 +- .../opentelemetry-1.47/gradle.lockfile | 2 +- .../opentelemetry-annotations-1.20/gradle.lockfile | 2 +- .../opentelemetry-annotations-1.26/gradle.lockfile | 2 +- .../opentracing/opentracing-0.31/gradle.lockfile | 2 +- .../opentracing/opentracing-0.32/gradle.lockfile | 2 +- .../opentracing/opentracing-common/gradle.lockfile | 2 +- .../org-json-20230227/gradle.lockfile | 2 +- .../instrumentation/osgi-4.3/gradle.lockfile | 2 +- .../owasp-esapi-2.1/gradle.lockfile | 2 +- .../pekko/pekko-concurrent-1.0/gradle.lockfile | 2 +- .../pekko/pekko-http-1.0/gradle.lockfile | 2 +- .../play-ws/play-ws-1.0/gradle.lockfile | 2 +- .../play-ws/play-ws-2.0/gradle.lockfile | 2 +- .../play-ws/play-ws-2.1/gradle.lockfile | 2 +- .../play-ws/play-ws-common/gradle.lockfile | 2 +- .../instrumentation/play/play-2.3/gradle.lockfile | 2 +- .../instrumentation/play/play-2.4/gradle.lockfile | 2 +- .../instrumentation/play/play-2.6/gradle.lockfile | 2 +- .../play/play-appsec-2.5/gradle.lockfile | 2 +- .../play/play-appsec-2.6/gradle.lockfile | 2 +- .../play/play-appsec-2.7/gradle.lockfile | 2 +- .../play/play-appsec-common/gradle.lockfile | 2 +- .../instrumentation/protobuf-3.0/gradle.lockfile | 2 +- .../instrumentation/quartz-2.0/gradle.lockfile | 2 +- .../rabbitmq-amqp-2.7/gradle.lockfile | 2 +- .../instrumentation/ratpack-1.5/gradle.lockfile | 2 +- .../reactive-streams-1.0/gradle.lockfile | 2 +- .../reactor-core-3.1/gradle.lockfile | 2 +- .../reactor-netty-1.0/gradle.lockfile | 2 +- .../instrumentation/rediscala-1.8/gradle.lockfile | 2 +- .../redisson/redisson-2.0.0/gradle.lockfile | 2 +- .../redisson/redisson-2.3.0/gradle.lockfile | 2 +- .../redisson/redisson-3.10.3/gradle.lockfile | 2 +- .../renaissance-0.7/gradle.lockfile | 2 +- .../resilience4j/resilience4j-2.0/gradle.lockfile | 2 +- .../resilience4j-reactor-2.0/gradle.lockfile | 2 +- .../filter-resteasy-3.0/gradle.lockfile | 2 +- .../filter-resteasy-3.1/gradle.lockfile | 2 +- .../resteasy/resteasy-3.0/gradle.lockfile | 2 +- .../instrumentation/restlet-2.2/gradle.lockfile | 2 +- .../rs/jakarta-rs-annotations-3.0/gradle.lockfile | 2 +- .../jax-rs-annotations-1.1.1/gradle.lockfile | 2 +- .../jax-rs-annotations-2.0/gradle.lockfile | 2 +- .../jax-rs-client-1.1/gradle.lockfile | 2 +- .../jax-rs-client-2.0/gradle.lockfile | 2 +- .../rxjava/rxjava-1.0/gradle.lockfile | 2 +- .../rxjava/rxjava-2.0/gradle.lockfile | 2 +- .../scala/scala-2.10.7/gradle.lockfile | 2 +- .../scala/scala-concurrent-2.8/gradle.lockfile | 2 +- .../scala-promise-2.10/gradle.lockfile | 2 +- .../scala-promise-2.13/gradle.lockfile | 2 +- .../scala-promise-common/gradle.lockfile | 2 +- .../scalatest-3.0.8/gradle.lockfile | 2 +- .../instrumentation/selenium-3.13/gradle.lockfile | 2 +- .../servicetalk/servicetalk-0.42.0/gradle.lockfile | 2 +- .../servicetalk-0.42.56/gradle.lockfile | 2 +- .../servlet/jakarta-servlet-5.0/gradle.lockfile | 2 +- .../javax-servlet-2.2/gradle.lockfile | 2 +- .../javax-servlet-3.0/gradle.lockfile | 2 +- .../javax-servlet-common/gradle.lockfile | 2 +- .../javax-servlet-iast/gradle.lockfile | 2 +- .../instrumentation/slick-3.2/gradle.lockfile | 2 +- .../instrumentation/snakeyaml-1.33/gradle.lockfile | 2 +- .../sofarpc/sofarpc-5.0/gradle.lockfile | 2 +- .../spark/spark-executor-common/gradle.lockfile | 2 +- .../spark/sparkjava-2.3/gradle.lockfile | 2 +- .../instrumentation/spray-1.3/gradle.lockfile | 2 +- .../spring/spring-beans-3.1/gradle.lockfile | 2 +- .../spring/spring-boot-1.3/gradle.lockfile | 2 +- .../spring/spring-cloud-zuul-2.0/gradle.lockfile | 2 +- .../spring/spring-core-3.2.2/gradle.lockfile | 2 +- .../spring/spring-data-1.8/gradle.lockfile | 2 +- .../spring/spring-jms-3.1/gradle.lockfile | 2 +- .../spring/spring-messaging-4.0/gradle.lockfile | 2 +- .../spring/spring-rabbit-1.5/gradle.lockfile | 2 +- .../spring/spring-scheduling-3.1/gradle.lockfile | 2 +- .../spring-security-5.0/gradle.lockfile | 2 +- .../spring-security-6.0/gradle.lockfile | 2 +- .../spring-webflux-5.0/gradle.lockfile | 2 +- .../spring-webflux-6.0/gradle.lockfile | 2 +- .../spring-webmvc-3.1/gradle.lockfile | 2 +- .../spring-webmvc-5.3/gradle.lockfile | 2 +- .../spring-webmvc-6.0/gradle.lockfile | 2 +- .../spring/spring-ws-2.0/gradle.lockfile | 2 +- .../spymemcached-2.10/gradle.lockfile | 2 +- .../instrumentation/synapse-3.0/gradle.lockfile | 2 +- .../testng/testng-6.4/gradle.lockfile | 2 +- .../testng/testng-7.0/gradle.lockfile | 2 +- .../testng/testng-common/gradle.lockfile | 2 +- .../instrumentation/thymeleaf-3.0/gradle.lockfile | 2 +- .../tibco-businessworks-5.14/gradle.lockfile | 2 +- .../tibco-businessworks-6.5/gradle.lockfile | 2 +- .../tibco-businessworks-stubs/gradle.lockfile | 2 +- .../instrumentation/tinylog-2.0/gradle.lockfile | 2 +- .../tomcat/tomcat-5.5/gradle.lockfile | 14 +++++++------- .../tomcat/tomcat-9.0/gradle.lockfile | 2 +- .../tomcat-appsec-5.5/gradle.lockfile | 2 +- .../tomcat-appsec-6.0/gradle.lockfile | 2 +- .../tomcat-appsec-7.0/gradle.lockfile | 2 +- .../tomcat/tomcat-common/gradle.lockfile | 2 +- .../instrumentation/twilio-0.0.1/gradle.lockfile | 2 +- .../instrumentation/unbescape-1.1/gradle.lockfile | 2 +- .../undertow/undertow-2.0/gradle.lockfile | 2 +- .../undertow/undertow-2.2/gradle.lockfile | 2 +- .../undertow/undertow-common/gradle.lockfile | 2 +- .../valkey-java-5.3/gradle.lockfile | 2 +- .../instrumentation/velocity-1.5/gradle.lockfile | 2 +- .../vertx-mysql-client-3.9/gradle.lockfile | 2 +- .../vertx-mysql-client-4.0/gradle.lockfile | 2 +- .../vertx-mysql-client-4.4.2/gradle.lockfile | 2 +- .../vertx-pg-client-4.0/gradle.lockfile | 2 +- .../vertx-pg-client-4.4.2/gradle.lockfile | 2 +- .../vertx-redis-client-3.9/gradle.lockfile | 2 +- .../vertx-redis-client-stubs/gradle.lockfile | 2 +- .../vertx/vertx-rx-3.5/gradle.lockfile | 2 +- .../vertx/vertx-sql-client-3.9/gradle.lockfile | 2 +- .../vertx/vertx-web/vertx-web-3.4/gradle.lockfile | 2 +- .../vertx/vertx-web/vertx-web-3.5/gradle.lockfile | 2 +- .../vertx/vertx-web/vertx-web-3.9/gradle.lockfile | 2 +- .../vertx/vertx-web/vertx-web-4.0/gradle.lockfile | 2 +- .../instrumentation/weaver-0.9/gradle.lockfile | 2 +- .../jakarta-websocket-2.0/gradle.lockfile | 2 +- .../websocket/javax-websocket-1.0/gradle.lockfile | 2 +- .../jetty-websocket-10.0/gradle.lockfile | 2 +- .../jetty-websocket-11.0/gradle.lockfile | 2 +- .../jetty-websocket-12.0/gradle.lockfile | 2 +- .../websphere-jmx-8.5/gradle.lockfile | 2 +- .../instrumentation/wildfly-9.0/gradle.lockfile | 2 +- .../ws/jakarta-ws-annotations-3.0/gradle.lockfile | 2 +- .../jax-ws/jax-ws-annotations-1.1/gradle.lockfile | 2 +- .../jax-ws/jax-ws-annotations-2.0/gradle.lockfile | 2 +- .../instrumentation/zio/zio-2.0/gradle.lockfile | 2 +- .../apm-tracing-disabled/gradle.lockfile | 2 +- dd-smoke-tests/appsec/gradle.lockfile | 2 +- .../appsec/spring-tomcat7/gradle.lockfile | 2 +- .../appsec/springboot-graphql/gradle.lockfile | 2 +- .../appsec/springboot-grpc/gradle.lockfile | 2 +- .../appsec/springboot-security/gradle.lockfile | 2 +- dd-smoke-tests/appsec/springboot/gradle.lockfile | 2 +- dd-smoke-tests/armeria-grpc/gradle.lockfile | 2 +- dd-smoke-tests/backend-mock/gradle.lockfile | 2 +- dd-smoke-tests/cli/gradle.lockfile | 2 +- dd-smoke-tests/concurrent/java-21/gradle.lockfile | 2 +- dd-smoke-tests/concurrent/java-25/gradle.lockfile | 2 +- dd-smoke-tests/concurrent/java-8/gradle.lockfile | 2 +- dd-smoke-tests/crashtracking/gradle.lockfile | 2 +- dd-smoke-tests/custom-systemloader/gradle.lockfile | 2 +- .../debugger-integration-tests/gradle.lockfile | 2 +- dd-smoke-tests/dynamic-config/gradle.lockfile | 2 +- dd-smoke-tests/field-injection/gradle.lockfile | 2 +- dd-smoke-tests/gradle.lockfile | 2 +- dd-smoke-tests/gradle/gradle.lockfile | 2 +- dd-smoke-tests/grpc-1.5/gradle.lockfile | 3 ++- dd-smoke-tests/iast-propagation/gradle.lockfile | 2 +- dd-smoke-tests/iast-util/gradle.lockfile | 2 +- .../iast-util/iast-util-11/gradle.lockfile | 2 +- .../iast-util/iast-util-17/gradle.lockfile | 2 +- dd-smoke-tests/java9-modules/gradle.lockfile | 2 +- dd-smoke-tests/jboss-modules/gradle.lockfile | 2 +- dd-smoke-tests/jdk-tool-abort/gradle.lockfile | 2 +- dd-smoke-tests/jersey-2/gradle.lockfile | 2 +- dd-smoke-tests/jersey-3/gradle.lockfile | 2 +- dd-smoke-tests/junit-console/gradle.lockfile | 2 +- dd-smoke-tests/kafka-2/gradle.lockfile | 2 +- dd-smoke-tests/kafka-3/gradle.lockfile | 2 +- dd-smoke-tests/lib-injection/gradle.lockfile | 2 +- dd-smoke-tests/log-injection/gradle.lockfile | 2 +- dd-smoke-tests/maven/gradle.lockfile | 2 +- dd-smoke-tests/openfeature/gradle.lockfile | 2 +- dd-smoke-tests/opentelemetry/gradle.lockfile | 2 +- dd-smoke-tests/opentracing/gradle.lockfile | 2 +- dd-smoke-tests/osgi/gradle.lockfile | 2 +- dd-smoke-tests/play-2.4/gradle.lockfile | 2 +- dd-smoke-tests/play-2.5/gradle.lockfile | 2 +- dd-smoke-tests/play-2.6/gradle.lockfile | 2 +- dd-smoke-tests/play-2.7/gradle.lockfile | 2 +- dd-smoke-tests/play-2.8-otel/gradle.lockfile | 2 +- .../play-2.8-split-routes/gradle.lockfile | 2 +- dd-smoke-tests/play-2.8/gradle.lockfile | 2 +- .../profiling-integration-tests/gradle.lockfile | 2 +- dd-smoke-tests/quarkus-native/gradle.lockfile | 2 +- dd-smoke-tests/quarkus/gradle.lockfile | 2 +- dd-smoke-tests/ratpack-1.5/gradle.lockfile | 2 +- dd-smoke-tests/resteasy/gradle.lockfile | 2 +- dd-smoke-tests/rum/gradle.lockfile | 2 +- dd-smoke-tests/rum/tomcat-10/gradle.lockfile | 2 +- dd-smoke-tests/rum/tomcat-11/gradle.lockfile | 2 +- dd-smoke-tests/rum/tomcat-9/gradle.lockfile | 2 +- dd-smoke-tests/rum/wildfly-15/gradle.lockfile | 2 +- dd-smoke-tests/sample-trace/gradle.lockfile | 2 +- .../spring-boot-2.3-webmvc-jetty/gradle.lockfile | 2 +- .../spring-boot-2.4-webflux/gradle.lockfile | 2 +- .../spring-boot-2.5-webflux/gradle.lockfile | 2 +- .../spring-boot-2.6-webflux/gradle.lockfile | 2 +- .../spring-boot-2.6-webmvc/gradle.lockfile | 2 +- .../spring-boot-2.7-webflux/gradle.lockfile | 2 +- .../spring-boot-3.0-native/gradle.lockfile | 2 +- .../spring-boot-3.0-webflux/gradle.lockfile | 2 +- .../spring-boot-3.0-webmvc/gradle.lockfile | 2 +- .../spring-boot-3.3-webmvc/gradle.lockfile | 2 +- dd-smoke-tests/spring-boot-rabbit/gradle.lockfile | 2 +- dd-smoke-tests/spring-security/gradle.lockfile | 2 +- .../springboot-freemarker/gradle.lockfile | 2 +- dd-smoke-tests/springboot-java-11/gradle.lockfile | 2 +- dd-smoke-tests/springboot-java-17/gradle.lockfile | 2 +- .../springboot-jetty-jsp/gradle.lockfile | 2 +- dd-smoke-tests/springboot-jpa/gradle.lockfile | 2 +- dd-smoke-tests/springboot-mongo/gradle.lockfile | 2 +- .../springboot-openliberty-20/gradle.lockfile | 2 +- .../springboot-openliberty-23/gradle.lockfile | 2 +- .../springboot-thymeleaf/gradle.lockfile | 2 +- .../springboot-tomcat-jsp/gradle.lockfile | 2 +- dd-smoke-tests/springboot-tomcat/gradle.lockfile | 2 +- dd-smoke-tests/springboot-velocity/gradle.lockfile | 2 +- dd-smoke-tests/springboot/gradle.lockfile | 2 +- dd-smoke-tests/tracer-flare/gradle.lockfile | 2 +- dd-smoke-tests/vertx-3.4/gradle.lockfile | 2 +- dd-smoke-tests/vertx-3.9-resteasy/gradle.lockfile | 2 +- dd-smoke-tests/vertx-3.9/gradle.lockfile | 2 +- dd-smoke-tests/vertx-4.2/gradle.lockfile | 2 +- dd-smoke-tests/websphere-jmx/gradle.lockfile | 2 +- dd-smoke-tests/wildfly/gradle.lockfile | 2 +- 436 files changed, 447 insertions(+), 447 deletions(-) diff --git a/dd-java-agent/instrumentation/aerospike-4.0/gradle.lockfile b/dd-java-agent/instrumentation/aerospike-4.0/gradle.lockfile index 74855324d82..b74a4070713 100644 --- a/dd-java-agent/instrumentation/aerospike-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/aerospike-4.0/gradle.lockfile @@ -44,7 +44,7 @@ com.google.guava:guava:20.0=latest7DepForkedTestCompileClasspath,latest7DepForke com.google.guava:guava:32.0.1-jre=annotationProcessor,latest7DepForkedTestAnnotationProcessor,latest7DepTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latest7DepForkedTestAnnotationProcessor,latest7DepTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latest7DepForkedTestAnnotationProcessor,latest7DepTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latest7DepForkedTestRuntimeClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latest7DepForkedTestRuntimeClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/akka/akka-actor-2.5/gradle.lockfile b/dd-java-agent/instrumentation/akka/akka-actor-2.5/gradle.lockfile index ca4900b4cab..cbb2a24e716 100644 --- a/dd-java-agent/instrumentation/akka/akka-actor-2.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/akka/akka-actor-2.5/gradle.lockfile @@ -41,7 +41,7 @@ com.google.guava:guava:20.0=akka23TestCompileClasspath,akka23TestRuntimeClasspat com.google.guava:guava:32.0.1-jre=akka23TestAnnotationProcessor,annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=akka23TestAnnotationProcessor,annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=akka23TestAnnotationProcessor,annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=akka23TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=akka23TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.squareup.moshi:moshi:1.11.0=akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/gradle.lockfile b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/gradle.lockfile index f058df4fe33..06de8309e79 100644 --- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/gradle.lockfile @@ -68,7 +68,7 @@ com.google.inject.extensions:guice-assistedinject:4.1.0=lagomTestCompileClasspat com.google.inject:guice:4.1.0=lagomTestCompileClasspath,lagomTestRuntimeClasspath com.google.j2objc:j2objc-annotations:1.1=lagomTestCompileClasspath,lagomTestRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,baseForkedTestAnnotationProcessor,baseTestAnnotationProcessor,iastTestAnnotationProcessor,lagomTestAnnotationProcessor,latestDepIastTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,version101ForkedTestAnnotationProcessor,version101IastTestAnnotationProcessor,version101TestAnnotationProcessor,version102IastTestAnnotationProcessor,version102Scala213TestAnnotationProcessor -com.google.re2j:re2j:1.7=baseForkedTestRuntimeClasspath,baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath +com.google.re2j:re2j:1.8=baseForkedTestRuntimeClasspath,baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath com.lightbend.lagom:lagom-api_2.11:1.4.0=lagomTestCompileClasspath,lagomTestRuntimeClasspath com.lightbend.lagom:lagom-client_2.11:1.4.0=lagomTestCompileClasspath,lagomTestRuntimeClasspath com.lightbend.lagom:lagom-cluster-core_2.11:1.4.0=lagomTestCompileClasspath,lagomTestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.2-iast/gradle.lockfile b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.2-iast/gradle.lockfile index 79becd64aad..23220b7e966 100644 --- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.2-iast/gradle.lockfile +++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.2-iast/gradle.lockfile @@ -41,7 +41,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/gradle.lockfile b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/gradle.lockfile index eebd276ea6c..cc3ed1370f7 100644 --- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/gradle.lockfile +++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/gradle.lockfile @@ -49,7 +49,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.hierynomus:asn-one:0.6.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/gradle.lockfile b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/gradle.lockfile index 9d864666ac8..5c9ec2ab256 100644 --- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/gradle.lockfile b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/gradle.lockfile index e9f98903eac..aed18eec7cb 100644 --- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=iastIntegrationTestCompileClasspath,iastIntegrationT com.google.guava:guava:32.0.1-jre=annotationProcessor,iastIntegrationTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,v41IastIntegrationTestAnnotationProcessor,v42IastIntegrationTestAnnotationProcessor,v43IastIntegrationTestAnnotationProcessor,v44IastIntegrationTestAnnotationProcessor,v45IastIntegrationTestAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,iastIntegrationTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,v41IastIntegrationTestAnnotationProcessor,v42IastIntegrationTestAnnotationProcessor,v43IastIntegrationTestAnnotationProcessor,v44IastIntegrationTestAnnotationProcessor,v45IastIntegrationTestAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,iastIntegrationTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,v41IastIntegrationTestAnnotationProcessor,v42IastIntegrationTestAnnotationProcessor,v43IastIntegrationTestAnnotationProcessor,v44IastIntegrationTestAnnotationProcessor,v45IastIntegrationTestAnnotationProcessor -com.google.re2j:re2j:1.7=iastIntegrationTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestRuntimeClasspath +com.google.re2j:re2j:1.8=iastIntegrationTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestRuntimeClasspath com.squareup.moshi:moshi:1.11.0=iastIntegrationTestCompileClasspath,iastIntegrationTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,v41IastIntegrationTestCompileClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestCompileClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestCompileClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestCompileClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestCompileClasspath,v45IastIntegrationTestRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=iastIntegrationTestCompileClasspath,iastIntegrationTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,v41IastIntegrationTestCompileClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestCompileClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestCompileClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestCompileClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestCompileClasspath,v45IastIntegrationTestRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=iastIntegrationTestCompileClasspath,iastIntegrationTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,v41IastIntegrationTestCompileClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestCompileClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestCompileClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestCompileClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestCompileClasspath,v45IastIntegrationTestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/gradle.lockfile b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/gradle.lockfile index 4275fbcc028..e2b5fa4d167 100644 --- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-4.0/gradle.lockfile b/dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-4.0/gradle.lockfile index bf5a45a7ceb..bee997cdb46 100644 --- a/dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-4.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-5.0/gradle.lockfile b/dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-5.0/gradle.lockfile index 6f490f0cfb9..d66953f14e5 100644 --- a/dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-5.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-5.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/gradle.lockfile b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/gradle.lockfile index 9c75ab5e886..90a6b040157 100644 --- a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/gradle.lockfile +++ b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/gradle.lockfile @@ -75,7 +75,7 @@ com.google.protobuf:protobuf-java:3.25.8=latestDepForkedTestCompileClasspath,lat com.google.protobuf:protobuf-java:3.7.1=compileClasspath,compileProtoPath com.google.protobuf:protoc:3.17.3=protobufToolsLocator_protoc com.google.re2j:re2j:1.2=compileClasspath,compileProtoPath -com.google.re2j:re2j:1.7=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath com.linecorp.armeria:armeria-grpc-protocol:0.84.0=compileClasspath,compileProtoPath com.linecorp.armeria:armeria-grpc-protocol:1.0.0=testCompileProtoPath,testRuntimeClasspath com.linecorp.armeria:armeria-grpc-protocol:1.39.1=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/gradle.lockfile b/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/gradle.lockfile index a0ff0e083b0..95853157371 100644 --- a/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/gradle.lockfile +++ b/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/gradle.lockfile @@ -53,7 +53,7 @@ com.google.guava:guava:20.0=jetty11LatestDepTestCompileClasspath,jetty11LatestDe com.google.guava:guava:32.0.1-jre=annotationProcessor,jetty11LatestDepTestAnnotationProcessor,jetty11TestAnnotationProcessor,jetty9LatestDepTestAnnotationProcessor,jetty9TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,jetty11LatestDepTestAnnotationProcessor,jetty11TestAnnotationProcessor,jetty9LatestDepTestAnnotationProcessor,jetty9TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,jetty11LatestDepTestAnnotationProcessor,jetty11TestAnnotationProcessor,jetty9LatestDepTestAnnotationProcessor,jetty9TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=jetty11LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=jetty11LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.linecorp.armeria:armeria-jetty11:1.24.0=jetty11TestCompileClasspath,jetty11TestRuntimeClasspath com.linecorp.armeria:armeria-jetty11:1.40.0=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath com.linecorp.armeria:armeria-jetty9:1.24.0=compileClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/avro-1.11.3/gradle.lockfile b/dd-java-agent/instrumentation/avro-1.11.3/gradle.lockfile index 0d9e1861590..0e783363d4d 100644 --- a/dd-java-agent/instrumentation/avro-1.11.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/avro-1.11.3/gradle.lockfile @@ -64,7 +64,7 @@ com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTest8Annot com.google.j2objc:j2objc-annotations:3.0.0=latestDepTest8CompileClasspath,latestDepTest8RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.protobuf:protobuf-java:2.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.1=compileClasspath,latestDepTest8CompileClasspath,latestDepTestCompileClasspath,testCompileClasspath -com.google.re2j:re2j:1.7=latestDepTest8RuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTest8RuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.jcraft:jsch:0.1.55=compileClasspath,latestDepTest8CompileClasspath,latestDepTest8RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.nimbusds:nimbus-jose-jwt:10.4=latestDepTest8CompileClasspath,latestDepTest8RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.nimbusds:nimbus-jose-jwt:9.8.1=compileClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-common/gradle.lockfile b/dd-java-agent/instrumentation/aws-java/aws-java-common/gradle.lockfile index df3897de20b..c0c32d6d385 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/aws-java/aws-java-common/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/gradle.lockfile b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/gradle.lockfile index 29cadc6c9c1..892496f0352 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/gradle.lockfile @@ -38,7 +38,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/gradle.lockfile b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/gradle.lockfile index 246b57aa520..37f455e2aee 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/gradle.lockfile +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/gradle.lockfile @@ -89,7 +89,7 @@ com.google.guava:guava:20.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,dsmForkedTestAnnotationProcessor,dsmTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestDsmForkedTestAnnotationProcessor,latestDsmTestAnnotationProcessor,testAnnotationProcessor,test_before_1_11_106AnnotationProcessor,test_before_1_11_106ForkedTestAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,dsmForkedTestAnnotationProcessor,dsmTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestDsmForkedTestAnnotationProcessor,latestDsmTestAnnotationProcessor,testAnnotationProcessor,test_before_1_11_106AnnotationProcessor,test_before_1_11_106ForkedTestAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,dsmForkedTestAnnotationProcessor,dsmTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestDsmForkedTestAnnotationProcessor,latestDsmTestAnnotationProcessor,testAnnotationProcessor,test_before_1_11_106AnnotationProcessor,test_before_1_11_106ForkedTestAnnotationProcessor -com.google.re2j:re2j:1.7=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath +com.google.re2j:re2j:1.8=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath com.squareup.moshi:moshi:1.11.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/gradle.lockfile b/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/gradle.lockfile index 186e8b4c51e..a838324c7e9 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/gradle.lockfile @@ -58,7 +58,7 @@ com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedT com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/gradle.lockfile b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/gradle.lockfile index a3fa192046f..23107bb36ce 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/gradle.lockfile @@ -61,7 +61,7 @@ com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedT com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/gradle.lockfile b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/gradle.lockfile index c2e81fd7211..ebc67d7bd58 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/gradle.lockfile @@ -39,7 +39,7 @@ com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedT com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/axis2-1.3/gradle.lockfile b/dd-java-agent/instrumentation/axis2-1.3/gradle.lockfile index 5cb538e06e6..2e7a971ff5b 100644 --- a/dd-java-agent/instrumentation/axis2-1.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/axis2-1.3/gradle.lockfile @@ -41,7 +41,7 @@ com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedT com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/axway-api-7.5/gradle.lockfile b/dd-java-agent/instrumentation/axway-api-7.5/gradle.lockfile index e7a7ec6f7cc..5f3be685d07 100644 --- a/dd-java-agent/instrumentation/axway-api-7.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/axway-api-7.5/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/azure-functions-1.2.2/gradle.lockfile b/dd-java-agent/instrumentation/azure-functions-1.2.2/gradle.lockfile index daa828b702e..95e8622a65b 100644 --- a/dd-java-agent/instrumentation/azure-functions-1.2.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/azure-functions-1.2.2/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.microsoft.azure.functions:azure-functions-java-core-library:1.3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.microsoft.azure.functions:azure-functions-java-library:1.2.2=compileClasspath,testCompileClasspath,testRuntimeClasspath com.microsoft.azure.functions:azure-functions-java-library:3.3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/caffeine-1.0/gradle.lockfile b/dd-java-agent/instrumentation/caffeine-1.0/gradle.lockfile index b8814033727..c148600f795 100644 --- a/dd-java-agent/instrumentation/caffeine-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/caffeine-1.0/gradle.lockfile @@ -39,7 +39,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/cdi-1.2/gradle.lockfile b/dd-java-agent/instrumentation/cdi-1.2/gradle.lockfile index e3f285f6848..5d6bd921693 100644 --- a/dd-java-agent/instrumentation/cdi-1.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/cdi-1.2/gradle.lockfile @@ -38,7 +38,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/cics-9.1/gradle.lockfile b/dd-java-agent/instrumentation/cics-9.1/gradle.lockfile index e1513d661cc..8806629b117 100644 --- a/dd-java-agent/instrumentation/cics-9.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/cics-9.1/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/commons-codec-1.1/gradle.lockfile b/dd-java-agent/instrumentation/commons-codec-1.1/gradle.lockfile index 835dfe16b2b..03ef3b586fd 100644 --- a/dd-java-agent/instrumentation/commons-codec-1.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/commons-codec-1.1/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/commons-fileupload-1.5/gradle.lockfile b/dd-java-agent/instrumentation/commons-fileupload-1.5/gradle.lockfile index b55046fbdb0..6baabbfb840 100644 --- a/dd-java-agent/instrumentation/commons-fileupload-1.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/commons-fileupload-1.5/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/commons-httpclient-2.0/gradle.lockfile b/dd-java-agent/instrumentation/commons-httpclient-2.0/gradle.lockfile index f5528118944..2e49d415c32 100644 --- a/dd-java-agent/instrumentation/commons-httpclient-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/commons-httpclient-2.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/commons-lang/commons-lang-2.1/gradle.lockfile b/dd-java-agent/instrumentation/commons-lang/commons-lang-2.1/gradle.lockfile index c6aaf370e94..3e5b4b59fa9 100644 --- a/dd-java-agent/instrumentation/commons-lang/commons-lang-2.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/commons-lang/commons-lang-2.1/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/commons-lang/commons-lang-3.5/gradle.lockfile b/dd-java-agent/instrumentation/commons-lang/commons-lang-3.5/gradle.lockfile index 15d8c711773..ec54d3d1d58 100644 --- a/dd-java-agent/instrumentation/commons-lang/commons-lang-3.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/commons-lang/commons-lang-3.5/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/commons-text-1.0/gradle.lockfile b/dd-java-agent/instrumentation/commons-text-1.0/gradle.lockfile index 1a60bf5e084..a1bf3d46369 100644 --- a/dd-java-agent/instrumentation/commons-text-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/commons-text-1.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/confluent-schema-registry/confluent-schema-registry-4.1/gradle.lockfile b/dd-java-agent/instrumentation/confluent-schema-registry/confluent-schema-registry-4.1/gradle.lockfile index 42dbd083070..cd483be8800 100644 --- a/dd-java-agent/instrumentation/confluent-schema-registry/confluent-schema-registry-4.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/confluent-schema-registry/confluent-schema-registry-4.1/gradle.lockfile @@ -58,7 +58,7 @@ com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=anno com.google.j2objc:j2objc-annotations:1.3=testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor com.google.re2j:re2j:1.6=latestDepTestCompileClasspath,testCompileClasspath -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-2.0/gradle.lockfile b/dd-java-agent/instrumentation/couchbase/couchbase-2.0/gradle.lockfile index 6e79f9f0c25..7b41eec810d 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/couchbase/couchbase-2.0/gradle.lockfile @@ -52,7 +52,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-2.6/gradle.lockfile b/dd-java-agent/instrumentation/couchbase/couchbase-2.6/gradle.lockfile index 2d28514292c..6676f88cf96 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-2.6/gradle.lockfile +++ b/dd-java-agent/instrumentation/couchbase/couchbase-2.6/gradle.lockfile @@ -52,7 +52,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/gradle.lockfile b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/gradle.lockfile index 0c93ff80195..10475f88081 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/gradle.lockfile @@ -45,7 +45,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/gradle.lockfile b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/gradle.lockfile index 53c00a52f90..912a7279183 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/gradle.lockfile @@ -45,7 +45,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/cucumber-5.4/gradle.lockfile b/dd-java-agent/instrumentation/cucumber-5.4/gradle.lockfile index eaeeb1b3d4a..4e09906f45c 100644 --- a/dd-java-agent/instrumentation/cucumber-5.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/cucumber-5.4/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/cxf-2.1/gradle.lockfile b/dd-java-agent/instrumentation/cxf-2.1/gradle.lockfile index da95c724354..b8211784b3c 100644 --- a/dd-java-agent/instrumentation/cxf-2.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/cxf-2.1/gradle.lockfile @@ -40,7 +40,7 @@ com.google.guava:guava:20.0=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestR com.google.guava:guava:32.0.1-jre=annotationProcessor,cxf3LatestDepTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,cxf3LatestDepTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,cxf3LatestDepTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=cxf3LatestDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=cxf3LatestDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/gradle.lockfile b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/gradle.lockfile index 4a923f0802b..a732f15fb26 100644 --- a/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/gradle.lockfile +++ b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/datadog/dynamic-instrumentation/span-origin/gradle.lockfile b/dd-java-agent/instrumentation/datadog/dynamic-instrumentation/span-origin/gradle.lockfile index e2b24789cc3..a1b1dd0b541 100644 --- a/dd-java-agent/instrumentation/datadog/dynamic-instrumentation/span-origin/gradle.lockfile +++ b/dd-java-agent/instrumentation/datadog/dynamic-instrumentation/span-origin/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/datadog/profiling/enable-wallclock-profiling/gradle.lockfile b/dd-java-agent/instrumentation/datadog/profiling/enable-wallclock-profiling/gradle.lockfile index bd07e49353a..897a880b4a7 100644 --- a/dd-java-agent/instrumentation/datadog/profiling/enable-wallclock-profiling/gradle.lockfile +++ b/dd-java-agent/instrumentation/datadog/profiling/enable-wallclock-profiling/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDep4TestCompileClasspath,latestDep4TestRuntime com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDep4TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDep4TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDep4TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/gradle.lockfile b/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/gradle.lockfile index 230a7e3c023..6e9385a762b 100644 --- a/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/gradle.lockfile +++ b/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/gradle.lockfile b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/gradle.lockfile index 4ccefb3427a..969092f78fa 100644 --- a/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/gradle.lockfile +++ b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.newrelic.agent.java:newrelic-api:6.5.4=testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/datanucleus-4.0.5/gradle.lockfile b/dd-java-agent/instrumentation/datanucleus-4.0.5/gradle.lockfile index 58345d72f71..a4f74158b1a 100644 --- a/dd-java-agent/instrumentation/datanucleus-4.0.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/datanucleus-4.0.5/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.h2database:h2:1.3.169=testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/gradle.lockfile b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/gradle.lockfile index 993c1bfe2b1..9b174a780e2 100644 --- a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/gradle.lockfile @@ -54,7 +54,7 @@ com.google.guava:guava:19.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.8/gradle.lockfile b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.8/gradle.lockfile index e01647c5a71..8048b03e1f5 100644 --- a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.8/gradle.lockfile @@ -50,7 +50,7 @@ com.google.guava:guava:19.0=compileClasspath,latestDepTestCompileClasspath,lates com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/gradle.lockfile b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/gradle.lockfile index edad5aa7e3f..6f2bd366da3 100644 --- a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/gradle.lockfile @@ -65,7 +65,7 @@ com.google.guava:guava:19.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/drools/drools-6.0/gradle.lockfile b/dd-java-agent/instrumentation/drools/drools-6.0/gradle.lockfile index e6ef6242aed..faa1ae65d3c 100644 --- a/dd-java-agent/instrumentation/drools/drools-6.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/drools/drools-6.0/gradle.lockfile @@ -38,7 +38,7 @@ com.google.guava:guava:32.0.1-jre=annotationProcessor,latest7TestAnnotationProce com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latest7TestAnnotationProcessor,latest8TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latest7TestAnnotationProcessor,latest8TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.protobuf:protobuf-java:2.5.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=latest7TestRuntimeClasspath,latest8TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latest7TestRuntimeClasspath,latest8TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latest7TestCompileClasspath,latest7TestRuntimeClasspath,latest8TestCompileClasspath,latest8TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latest7TestCompileClasspath,latest7TestRuntimeClasspath,latest8TestCompileClasspath,latest8TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latest7TestCompileClasspath,latest7TestRuntimeClasspath,latest8TestCompileClasspath,latest8TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/dropwizard/dropwizard-0.8/gradle.lockfile b/dd-java-agent/instrumentation/dropwizard/dropwizard-0.8/gradle.lockfile index cb9265244ea..711322244e5 100644 --- a/dd-java-agent/instrumentation/dropwizard/dropwizard-0.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/dropwizard/dropwizard-0.8/gradle.lockfile @@ -49,7 +49,7 @@ com.google.guava:guava:18.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/dropwizard/dropwizard-views-0.7/gradle.lockfile b/dd-java-agent/instrumentation/dropwizard/dropwizard-views-0.7/gradle.lockfile index 86a4c640ef8..e54f1ae021f 100644 --- a/dd-java-agent/instrumentation/dropwizard/dropwizard-views-0.7/gradle.lockfile +++ b/dd-java-agent/instrumentation/dropwizard/dropwizard-views-0.7/gradle.lockfile @@ -60,7 +60,7 @@ com.google.guava:guava:16.0.1=compileClasspath,testCompileClasspath,testRuntimeC com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-common/gradle.lockfile b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-common/gradle.lockfile index e936c9c5507..ea3cb8b1756 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-common/gradle.lockfile @@ -43,7 +43,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.ning:compress-lzf:1.0.2=compileClasspath com.spatial4j:spatial4j:0.4.1=compileClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-5.0/gradle.lockfile b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-5.0/gradle.lockfile index 50364120e7e..668737ae814 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-5.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-5.0/gradle.lockfile @@ -46,7 +46,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-6.4/gradle.lockfile b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-6.4/gradle.lockfile index 28df52c42bc..e5a03eb798d 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-6.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-6.4/gradle.lockfile @@ -47,7 +47,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-7.0/gradle.lockfile b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-7.0/gradle.lockfile index 999e2bcb1a5..ab40e83d3b9 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-7.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-7.0/gradle.lockfile @@ -48,7 +48,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-2.0/gradle.lockfile b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-2.0/gradle.lockfile index 22d68fceaa1..e62635d9604 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-2.0/gradle.lockfile @@ -53,7 +53,7 @@ com.google.guava:guava:18.0=compileClasspath,latestDepTestCompileClasspath,lates com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.ning:compress-lzf:1.0.2=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.spatial4j:spatial4j:0.4.1=compileClasspath com.spatial4j:spatial4j:0.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.0/gradle.lockfile b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.0/gradle.lockfile index 25548b59053..5aa7484b118 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.0/gradle.lockfile @@ -43,7 +43,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.3/gradle.lockfile b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.3/gradle.lockfile index f77c7bcfbcd..9e2c3d02390 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.3/gradle.lockfile @@ -48,7 +48,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-6.0/gradle.lockfile b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-6.0/gradle.lockfile index 1ae5d7d9ab3..1d5831e451d 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-6.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-6.0/gradle.lockfile @@ -47,7 +47,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-7.3/gradle.lockfile b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-7.3/gradle.lockfile index 483cfbe82a2..d75ee461a10 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-7.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-7.3/gradle.lockfile @@ -48,7 +48,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-common/gradle.lockfile b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-common/gradle.lockfile index f29a5634f57..e5b4ddd9a3a 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-common/gradle.lockfile @@ -43,7 +43,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/finatra-2.9/gradle.lockfile b/dd-java-agent/instrumentation/finatra-2.9/gradle.lockfile index f4c89585fdf..48aae83a4e5 100644 --- a/dd-java-agent/instrumentation/finatra-2.9/gradle.lockfile +++ b/dd-java-agent/instrumentation/finatra-2.9/gradle.lockfile @@ -77,7 +77,7 @@ com.google.inject:guice:4.1.0=compileClasspath,latestPre207TestCompileClasspath, com.google.inject:guice:4.2.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.j2objc:j2objc-annotations:1.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,latestPre207TestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,latestPre207TestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,latestPre207TestRuntimeClasspath,testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.netflix.concurrency-limits:concurrency-limits-core:0.3.0=latestPre207TestCompileClasspath,latestPre207TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPre207TestCompileClasspath,latestPre207TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/gradle.lockfile b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/gradle.lockfile index cd9bff8ec38..fd3f0ebff6a 100644 --- a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/gradle.lockfile +++ b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.9/gradle.lockfile b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.9/gradle.lockfile index 7cead51b31d..4da1680020a 100644 --- a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.9/gradle.lockfile +++ b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.9/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath,version2_3 com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor,version2_3_23TestAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,version2_3_23TestAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor,version2_3_23TestAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath,version2_3_23TestRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath,version2_3_23TestRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath,version2_3_23TestCompileClasspath,version2_3_23TestRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath,version2_3_23TestCompileClasspath,version2_3_23TestRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath,version2_3_23TestCompileClasspath,version2_3_23TestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/gax-1.4/gradle.lockfile b/dd-java-agent/instrumentation/gax-1.4/gradle.lockfile index 416a306cb64..dfa246c2059 100644 --- a/dd-java-agent/instrumentation/gax-1.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/gax-1.4/gradle.lockfile @@ -59,7 +59,7 @@ com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnota com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.protobuf:protobuf-java-util:4.33.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.protobuf:protobuf-java:4.33.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/glassfish-3.0/gradle.lockfile b/dd-java-agent/instrumentation/glassfish-3.0/gradle.lockfile index 629e401c02e..7f1dd8abccc 100644 --- a/dd-java-agent/instrumentation/glassfish-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/glassfish-3.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/google-http-client-1.19/gradle.lockfile b/dd-java-agent/instrumentation/google-http-client-1.19/gradle.lockfile index fd5f09fe253..8385b04246f 100644 --- a/dd-java-agent/instrumentation/google-http-client-1.19/gradle.lockfile +++ b/dd-java-agent/instrumentation/google-http-client-1.19/gradle.lockfile @@ -43,7 +43,7 @@ com.google.http-client:google-http-client:1.19.0=compileClasspath,testCompileCla com.google.http-client:google-http-client:2.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:3.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/google-pubsub-1.116/gradle.lockfile b/dd-java-agent/instrumentation/google-pubsub-1.116/gradle.lockfile index ba197d81c00..93338736b48 100644 --- a/dd-java-agent/instrumentation/google-pubsub-1.116/gradle.lockfile +++ b/dd-java-agent/instrumentation/google-pubsub-1.116/gradle.lockfile @@ -78,8 +78,7 @@ com.google.protobuf:protobuf-java-util:3.19.4=testRuntimeClasspath com.google.protobuf:protobuf-java-util:4.33.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.protobuf:protobuf-java:3.19.4=compileClasspath,testCompileClasspath,testRuntimeClasspath com.google.protobuf:protobuf-java:4.33.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath -com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/graal/graal-native-image-20.0/gradle.lockfile b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/gradle.lockfile index 51e74efac14..2b30c6d1d0f 100644 --- a/dd-java-agent/instrumentation/graal/graal-native-image-20.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/graal/gradle.lockfile b/dd-java-agent/instrumentation/graal/gradle.lockfile index 279033df922..4f474c1717c 100644 --- a/dd-java-agent/instrumentation/graal/gradle.lockfile +++ b/dd-java-agent/instrumentation/graal/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/gradle-testing-5.1/gradle.lockfile b/dd-java-agent/instrumentation/gradle-testing-5.1/gradle.lockfile index f34a741b09b..2d376bbdc96 100644 --- a/dd-java-agent/instrumentation/gradle-testing-5.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/gradle-testing-5.1/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/gradle.lockfile b/dd-java-agent/instrumentation/gradle.lockfile index 04fdef43cef..e13053f37f2 100644 --- a/dd-java-agent/instrumentation/gradle.lockfile +++ b/dd-java-agent/instrumentation/gradle.lockfile @@ -28,7 +28,7 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.re2j:re2j:1.7=runtimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=runtimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=runtimeClasspath,testRuntimeClasspath com.squareup.okio:okio:1.17.5=runtimeClasspath,testRuntimeClasspath com.thoughtworks.qdox:qdox:1.12.1=codenarc diff --git a/dd-java-agent/instrumentation/gradle/gradle-3.0/gradle.lockfile b/dd-java-agent/instrumentation/gradle/gradle-3.0/gradle.lockfile index 376a3b8fbce..cbada565a76 100644 --- a/dd-java-agent/instrumentation/gradle/gradle-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/gradle/gradle-3.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/gradle/gradle-8.3/gradle.lockfile b/dd-java-agent/instrumentation/gradle/gradle-8.3/gradle.lockfile index ff6a125ed10..8413b0587ad 100644 --- a/dd-java-agent/instrumentation/gradle/gradle-8.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/gradle/gradle-8.3/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/gradle.lockfile b/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/gradle.lockfile index c9871da1ed9..f39948bbe98 100644 --- a/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedT com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.graphql-java:graphql-java:14.0=compileClasspath,testCompileClasspath,testRuntimeClasspath com.graphql-java:graphql-java:19.11=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.graphql-java:java-dataloader:2.2.3=compileClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/gradle.lockfile b/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/gradle.lockfile index b2b82e75b8b..cc7d500fd86 100644 --- a/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=graphql20LatestDepForkedTestCompileClasspath,graphql com.google.guava:guava:32.0.1-jre=annotationProcessor,graphql20LatestDepForkedTestAnnotationProcessor,graphql20LatestDepTestAnnotationProcessor,graphql21LatestDepForkedTestAnnotationProcessor,graphql21LatestDepTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,graphql20LatestDepForkedTestAnnotationProcessor,graphql20LatestDepTestAnnotationProcessor,graphql21LatestDepForkedTestAnnotationProcessor,graphql21LatestDepTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,graphql20LatestDepForkedTestAnnotationProcessor,graphql20LatestDepTestAnnotationProcessor,graphql21LatestDepForkedTestAnnotationProcessor,graphql21LatestDepTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.graphql-java:graphql-java:20.0=compileClasspath,testCompileClasspath,testRuntimeClasspath com.graphql-java:graphql-java:20.9=graphql20LatestDepForkedTestCompileClasspath,graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestCompileClasspath,graphql20LatestDepTestRuntimeClasspath com.graphql-java:graphql-java:21.5=graphql21LatestDepForkedTestCompileClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestCompileClasspath,graphql21LatestDepTestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-common/gradle.lockfile b/dd-java-agent/instrumentation/graphql-java/graphql-java-common/gradle.lockfile index 586b7d5468f..e63effbab8d 100644 --- a/dd-java-agent/instrumentation/graphql-java/graphql-java-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/graphql-java/graphql-java-common/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.graphql-java:graphql-java:14.0=compileClasspath com.graphql-java:java-dataloader:2.2.3=compileClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-2.0/gradle.lockfile b/dd-java-agent/instrumentation/grizzly/grizzly-2.0/gradle.lockfile index d2d6c4233ce..87b342bd4d2 100644 --- a/dd-java-agent/instrumentation/grizzly/grizzly-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/grizzly/grizzly-2.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/gradle.lockfile b/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/gradle.lockfile index f0e68ef1a1c..32718e7a59c 100644 --- a/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/gradle.lockfile +++ b/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/gradle.lockfile @@ -39,7 +39,7 @@ com.google.guava:guava:20.0=latest5DepTestCompileClasspath,latest5DepTestRuntime com.google.guava:guava:32.0.1-jre=annotationProcessor,latest5DepTestAnnotationProcessor,latestDepTestAnnotationProcessor,muleLatestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latest5DepTestAnnotationProcessor,latestDepTestAnnotationProcessor,muleLatestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latest5DepTestAnnotationProcessor,latestDepTestAnnotationProcessor,muleLatestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latest5DepTestRuntimeClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latest5DepTestRuntimeClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latest5DepTestCompileClasspath,latest5DepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latest5DepTestCompileClasspath,latest5DepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latest5DepTestCompileClasspath,latest5DepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/gradle.lockfile b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/gradle.lockfile index 9cc7c809f1f..54eec4e14e2 100644 --- a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/gradle.lockfile +++ b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/gson-1.6/gradle.lockfile b/dd-java-agent/instrumentation/gson-1.6/gradle.lockfile index e25f723a7aa..c1ebd82982e 100644 --- a/dd-java-agent/instrumentation/gson-1.6/gradle.lockfile +++ b/dd-java-agent/instrumentation/gson-1.6/gradle.lockfile @@ -40,7 +40,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/guava-10.0/gradle.lockfile b/dd-java-agent/instrumentation/guava-10.0/gradle.lockfile index 245364ab566..e1ef08635f3 100644 --- a/dd-java-agent/instrumentation/guava-10.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/guava-10.0/gradle.lockfile @@ -42,7 +42,7 @@ com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRun com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/gradle.lockfile b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/gradle.lockfile index f59489465d6..40beec1cbde 100644 --- a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/gradle.lockfile +++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.hazelcast:hazelcast-all:3.6=compileClasspath com.hazelcast:hazelcast-all:3.8=testCompileClasspath,testRuntimeClasspath com.hazelcast:hazelcast-all:3.8.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/gradle.lockfile b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/gradle.lockfile index 2c1676a5e39..2a467e84022 100644 --- a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/gradle.lockfile +++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.hazelcast:hazelcast-all:3.12.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.hazelcast:hazelcast-all:3.9=compileClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/gradle.lockfile b/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/gradle.lockfile index e45b5264934..4ac901d3934 100644 --- a/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.hazelcast:hazelcast-all:4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath com.hazelcast:hazelcast-all:5.0-BETA-1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-common/gradle.lockfile b/dd-java-agent/instrumentation/hibernate/hibernate-common/gradle.lockfile index 3393267c109..0ece97fd31a 100644 --- a/dd-java-agent/instrumentation/hibernate/hibernate-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/hibernate/hibernate-common/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/gradle.lockfile b/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/gradle.lockfile index c670b30fbe6..0ca6a809a3c 100644 --- a/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/gradle.lockfile @@ -38,7 +38,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.h2database:h2:1.4.197=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/gradle.lockfile b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/gradle.lockfile index 0188fefe2dc..a92092f8997 100644 --- a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/gradle.lockfile @@ -39,7 +39,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.h2database:h2:1.4.197=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.3/gradle.lockfile b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.3/gradle.lockfile index b40fe254ed3..c6ad4dd7d75 100644 --- a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.3/gradle.lockfile @@ -39,7 +39,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/hystrix-1.4/gradle.lockfile b/dd-java-agent/instrumentation/hystrix-1.4/gradle.lockfile index 07cb77e00b8..254f43e36be 100644 --- a/dd-java-agent/instrumentation/hystrix-1.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/hystrix-1.4/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.netflix.archaius:archaius-core:0.4.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.netflix.hystrix:hystrix-core:1.4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath com.netflix.hystrix:hystrix-core:1.5.18=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/ignite-2.0/gradle.lockfile b/dd-java-agent/instrumentation/ignite-2.0/gradle.lockfile index 2cb202835df..769f1981574 100644 --- a/dd-java-agent/instrumentation/ignite-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/ignite-2.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=ignite216ForkedTestCompileClasspath,ignite216ForkedT com.google.guava:guava:32.0.1-jre=annotationProcessor,ignite216ForkedTestAnnotationProcessor,ignite216TestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,ignite216ForkedTestAnnotationProcessor,ignite216TestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,ignite216ForkedTestAnnotationProcessor,ignite216TestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=ignite216ForkedTestRuntimeClasspath,ignite216TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=ignite216ForkedTestRuntimeClasspath,ignite216TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.h2database:h2:1.4.195=testCompileClasspath,testRuntimeClasspath com.h2database:h2:1.4.197=ignite216ForkedTestCompileClasspath,ignite216ForkedTestRuntimeClasspath,ignite216TestCompileClasspath,ignite216TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.squareup.moshi:moshi:1.11.0=ignite216ForkedTestCompileClasspath,ignite216ForkedTestRuntimeClasspath,ignite216TestCompileClasspath,ignite216TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-1.9.13/gradle.lockfile b/dd-java-agent/instrumentation/jackson-core/jackson-core-1.9.13/gradle.lockfile index 0ba4b1ffe0f..ebb4b4ad5c8 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-1.9.13/gradle.lockfile +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-1.9.13/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.0/gradle.lockfile b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.0/gradle.lockfile index ac3291bce8a..43b5f17b728 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.0/gradle.lockfile @@ -43,7 +43,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.12/gradle.lockfile b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.12/gradle.lockfile index 60fde8bb904..fd356718269 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.12/gradle.lockfile +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.12/gradle.lockfile @@ -45,7 +45,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/gradle.lockfile b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/gradle.lockfile index 75518bcd493..1d3126bb885 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/gradle.lockfile +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/gradle.lockfile @@ -45,7 +45,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.6/gradle.lockfile b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.6/gradle.lockfile index 80ca708e537..bfeb814e827 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.6/gradle.lockfile +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.6/gradle.lockfile @@ -43,7 +43,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.8/gradle.lockfile b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.8/gradle.lockfile index c988591dd4f..6e86a79afeb 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.8/gradle.lockfile @@ -43,7 +43,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-common/gradle.lockfile b/dd-java-agent/instrumentation/jackson-core/jackson-core-common/gradle.lockfile index cf9ffbf4727..2da4be27d8b 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-common/gradle.lockfile @@ -45,7 +45,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jacoco-0.8.9/gradle.lockfile b/dd-java-agent/instrumentation/jacoco-0.8.9/gradle.lockfile index 2c7d8286358..21c5abf9c84 100644 --- a/dd-java-agent/instrumentation/jacoco-0.8.9/gradle.lockfile +++ b/dd-java-agent/instrumentation/jacoco-0.8.9/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/gradle.lockfile b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/gradle.lockfile index 1f13b3eca4e..20467fb3bed 100644 --- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/gradle.lockfile b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/gradle.lockfile index 21f4bb280bf..140bd98e179 100644 --- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=previewTestCompileClasspath,previewTestRuntimeClassp com.google.guava:guava:32.0.1-jre=annotationProcessor,previewTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,previewTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,previewTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=previewTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=previewTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=previewTestCompileClasspath,previewTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=previewTestCompileClasspath,previewTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=previewTestCompileClasspath,previewTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-25.0/gradle.lockfile b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-25.0/gradle.lockfile index 070509e7df3..a977886acc8 100644 --- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-25.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-25.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java/java-io-1.8/gradle.lockfile b/dd-java-agent/instrumentation/java/java-io-1.8/gradle.lockfile index 7a204bbb387..8eaab4c3168 100644 --- a/dd-java-agent/instrumentation/java/java-io-1.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-io-1.8/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=java11TestCompileClasspath,java11TestRuntimeClasspat com.google.guava:guava:32.0.1-jre=annotationProcessor,java11TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,java11TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,java11TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=java11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=java11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=java11TestCompileClasspath,java11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=java11TestCompileClasspath,java11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=java11TestCompileClasspath,java11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/gradle.lockfile b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/gradle.lockfile index d1a5c8826d2..5ebf4b2fae2 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-11.0/gradle.lockfile b/dd-java-agent/instrumentation/java/java-lang/java-lang-11.0/gradle.lockfile index 082e7831fdf..0c8fef16343 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-11.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-11.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/gradle.lockfile b/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/gradle.lockfile index 245eff58e71..fe55062c96b 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/gradle.lockfile @@ -38,7 +38,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-17.0/gradle.lockfile b/dd-java-agent/instrumentation/java/java-lang/java-lang-17.0/gradle.lockfile index ac739abd599..30ed01132d9 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-17.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-17.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/gradle.lockfile b/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/gradle.lockfile index 6ae7dcd9150..3ae825a99c2 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/gradle.lockfile b/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/gradle.lockfile index 164acb3e9fd..d1c8672d0dd 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/gradle.lockfile b/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/gradle.lockfile index 353b1eec14e..946613cf2d4 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-classloading-1.8/gradle.lockfile b/dd-java-agent/instrumentation/java/java-lang/java-lang-classloading-1.8/gradle.lockfile index 373f92bfc11..48a50209f60 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-classloading-1.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-classloading-1.8/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=classloadingJbossTestCompileClasspath,classloadingJb com.google.guava:guava:32.0.1-jre=annotationProcessor,classloadingJbossTestAnnotationProcessor,classloadingJsr14TestAnnotationProcessor,classloadingOsgiTestAnnotationProcessor,classloadingTomcatLatestDepTestAnnotationProcessor,classloadingTomcatTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,classloadingJbossTestAnnotationProcessor,classloadingJsr14TestAnnotationProcessor,classloadingOsgiTestAnnotationProcessor,classloadingTomcatLatestDepTestAnnotationProcessor,classloadingTomcatTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,classloadingJbossTestAnnotationProcessor,classloadingJsr14TestAnnotationProcessor,classloadingOsgiTestAnnotationProcessor,classloadingTomcatLatestDepTestAnnotationProcessor,classloadingTomcatTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=classloadingJbossTestRuntimeClasspath,classloadingJsr14TestRuntimeClasspath,classloadingOsgiTestRuntimeClasspath,classloadingTomcatLatestDepTestRuntimeClasspath,classloadingTomcatTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=classloadingJbossTestRuntimeClasspath,classloadingJsr14TestRuntimeClasspath,classloadingOsgiTestRuntimeClasspath,classloadingTomcatLatestDepTestRuntimeClasspath,classloadingTomcatTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=classloadingJbossTestCompileClasspath,classloadingJbossTestRuntimeClasspath,classloadingJsr14TestCompileClasspath,classloadingJsr14TestRuntimeClasspath,classloadingOsgiTestCompileClasspath,classloadingOsgiTestRuntimeClasspath,classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath,classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=classloadingJbossTestCompileClasspath,classloadingJbossTestRuntimeClasspath,classloadingJsr14TestCompileClasspath,classloadingJsr14TestRuntimeClasspath,classloadingOsgiTestCompileClasspath,classloadingOsgiTestRuntimeClasspath,classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath,classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=classloadingJbossTestCompileClasspath,classloadingJbossTestRuntimeClasspath,classloadingJsr14TestCompileClasspath,classloadingJsr14TestRuntimeClasspath,classloadingOsgiTestCompileClasspath,classloadingOsgiTestRuntimeClasspath,classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath,classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/gradle.lockfile b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/gradle.lockfile index ab11aeee288..4ec91999cd8 100644 --- a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/gradle.lockfile b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/gradle.lockfile index 3308bda2848..3d28302a5d7 100644 --- a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java/java-nio-1.8/gradle.lockfile b/dd-java-agent/instrumentation/java/java-nio-1.8/gradle.lockfile index 69ac1a6c611..6466511b288 100644 --- a/dd-java-agent/instrumentation/java/java-nio-1.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-nio-1.8/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java/java-rmi-1.1/gradle.lockfile b/dd-java-agent/instrumentation/java/java-rmi-1.1/gradle.lockfile index 75a277ec14f..4b704450b8c 100644 --- a/dd-java-agent/instrumentation/java/java-rmi-1.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-rmi-1.1/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java/java-security-1.8/gradle.lockfile b/dd-java-agent/instrumentation/java/java-security-1.8/gradle.lockfile index 9f66d73dd93..cd266fdf82f 100644 --- a/dd-java-agent/instrumentation/java/java-security-1.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-security-1.8/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java/java-util-1.8/gradle.lockfile b/dd-java-agent/instrumentation/java/java-util-1.8/gradle.lockfile index 46c69d1b227..a8d381878dc 100644 --- a/dd-java-agent/instrumentation/java/java-util-1.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-util-1.8/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/javax-naming-1.0/gradle.lockfile b/dd-java-agent/instrumentation/javax-naming-1.0/gradle.lockfile index 8ba02ef0bca..853adbebda3 100644 --- a/dd-java-agent/instrumentation/javax-naming-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/javax-naming-1.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/javax-xml-1.4/gradle.lockfile b/dd-java-agent/instrumentation/javax-xml-1.4/gradle.lockfile index ce6b3fb6aa3..821ebc4bfe6 100644 --- a/dd-java-agent/instrumentation/javax-xml-1.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/javax-xml-1.4/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jboss/jboss-logmanager-1.1/gradle.lockfile b/dd-java-agent/instrumentation/jboss/jboss-logmanager-1.1/gradle.lockfile index 21bb1498a65..e73b87e9272 100644 --- a/dd-java-agent/instrumentation/jboss/jboss-logmanager-1.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/jboss/jboss-logmanager-1.1/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jboss/jboss-modules-1.3/gradle.lockfile b/dd-java-agent/instrumentation/jboss/jboss-modules-1.3/gradle.lockfile index 9199c8f9839..2f7a31ac93a 100644 --- a/dd-java-agent/instrumentation/jboss/jboss-modules-1.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/jboss/jboss-modules-1.3/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jdbc/gradle.lockfile b/dd-java-agent/instrumentation/jdbc/gradle.lockfile index eb8729194e8..9bac4858d6f 100644 --- a/dd-java-agent/instrumentation/jdbc/gradle.lockfile +++ b/dd-java-agent/instrumentation/jdbc/gradle.lockfile @@ -42,7 +42,7 @@ com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepJava11TestAnnotat com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepJava11TestAnnotationProcessor,latestDepTestAnnotationProcessor,oldH2TestAnnotationProcessor,oldPostgresTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepJava11TestAnnotationProcessor,latestDepTestAnnotationProcessor,oldH2TestAnnotationProcessor,oldPostgresTestAnnotationProcessor,testAnnotationProcessor com.google.protobuf:protobuf-java:3.11.4=jmhRuntimeClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,oldH2TestCompileClasspath,oldH2TestRuntimeClasspath,oldPostgresTestCompileClasspath,oldPostgresTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=jmhRuntimeClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestRuntimeClasspath,oldH2TestRuntimeClasspath,oldPostgresTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=jmhRuntimeClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestRuntimeClasspath,oldH2TestRuntimeClasspath,oldPostgresTestRuntimeClasspath,testRuntimeClasspath com.h2database:h2:1.3.168=oldH2TestCompileClasspath,oldH2TestRuntimeClasspath com.h2database:h2:1.3.169=jmhRuntimeClasspath,oldPostgresTestCompileClasspath,oldPostgresTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.h2database:h2:2.2.224=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jdbc/scalikejdbc-3.5/gradle.lockfile b/dd-java-agent/instrumentation/jdbc/scalikejdbc-3.5/gradle.lockfile index 53e44d07e45..6f03dfc6db6 100644 --- a/dd-java-agent/instrumentation/jdbc/scalikejdbc-3.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/jdbc/scalikejdbc-3.5/gradle.lockfile @@ -41,7 +41,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.h2database:h2:1.3.169=testCompileClasspath,testRuntimeClasspath com.h2database:h2:2.2.224=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.lmax:disruptor:3.4.2=zinc diff --git a/dd-java-agent/instrumentation/jedis/jedis-1.4/gradle.lockfile b/dd-java-agent/instrumentation/jedis/jedis-1.4/gradle.lockfile index 28b860b5585..7b3acede36a 100644 --- a/dd-java-agent/instrumentation/jedis/jedis-1.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/jedis/jedis-1.4/gradle.lockfile @@ -38,7 +38,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jedis/jedis-3.0/gradle.lockfile b/dd-java-agent/instrumentation/jedis/jedis-3.0/gradle.lockfile index 0a054964de5..28050aadb67 100644 --- a/dd-java-agent/instrumentation/jedis/jedis-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jedis/jedis-3.0/gradle.lockfile @@ -38,7 +38,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jedis/jedis-4.0/gradle.lockfile b/dd-java-agent/instrumentation/jedis/jedis-4.0/gradle.lockfile index 4dce12960b6..9c12836ddca 100644 --- a/dd-java-agent/instrumentation/jedis/jedis-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jedis/jedis-4.0/gradle.lockfile @@ -40,7 +40,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jersey/jersey-2.0/gradle.lockfile b/dd-java-agent/instrumentation/jersey/jersey-2.0/gradle.lockfile index e614ce83069..dce4d551c4b 100644 --- a/dd-java-agent/instrumentation/jersey/jersey-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jersey/jersey-2.0/gradle.lockfile @@ -49,7 +49,7 @@ com.google.guava:guava:20.0=jersey2JettyTestCompileClasspath,jersey2JettyTestRun com.google.guava:guava:32.0.1-jre=annotationProcessor,jersey2JettyTestAnnotationProcessor,jersey3JettyTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,jersey2JettyTestAnnotationProcessor,jersey3JettyTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,jersey2JettyTestAnnotationProcessor,jersey3JettyTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=jersey2JettyTestRuntimeClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=jersey2JettyTestRuntimeClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=jersey2JettyTestCompileClasspath,jersey2JettyTestRuntimeClasspath,jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=jersey2JettyTestCompileClasspath,jersey2JettyTestRuntimeClasspath,jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=jersey2JettyTestCompileClasspath,jersey2JettyTestRuntimeClasspath,jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jersey/jersey-client-2.0/gradle.lockfile b/dd-java-agent/instrumentation/jersey/jersey-client-2.0/gradle.lockfile index a516a5ece47..a9991ad69b0 100644 --- a/dd-java-agent/instrumentation/jersey/jersey-client-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jersey/jersey-client-2.0/gradle.lockfile @@ -38,7 +38,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jersey/jersey-filter-2.0/gradle.lockfile b/dd-java-agent/instrumentation/jersey/jersey-filter-2.0/gradle.lockfile index 60991358166..b32bc575fcb 100644 --- a/dd-java-agent/instrumentation/jersey/jersey-filter-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jersey/jersey-filter-2.0/gradle.lockfile @@ -38,7 +38,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/gradle.lockfile index d26995636f4..50ea0adb43e 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-7.0/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-7.0/gradle.lockfile index ca5abc46828..1e06a3f9d3a 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-7.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-7.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/gradle.lockfile index 5bcb2122729..7e5d0ec449c 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/gradle.lockfile index 05767c4b0c1..837fcc5ffb6 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/gradle.lockfile index ebe307b7e90..c594648a48c 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/gradle.lockfile index 0e366e707ea..ea7cf10c040 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/gradle.lockfile index 434e96ea13a..28828827b86 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=jetty10LatestDepTestCompileClasspath,jetty10LatestDe com.google.guava:guava:32.0.1-jre=annotationProcessor,jetty10LatestDepTestAnnotationProcessor,jetty11TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,jetty10LatestDepTestAnnotationProcessor,jetty11TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,jetty10LatestDepTestAnnotationProcessor,jetty11TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=jetty10LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=jetty10LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=jetty10LatestDepTestCompileClasspath,jetty10LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=jetty10LatestDepTestCompileClasspath,jetty10LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=jetty10LatestDepTestCompileClasspath,jetty10LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/gradle.lockfile index b7877298604..3f39b21e058 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/gradle.lockfile index cedfa3009d0..90ded2b5176 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-common/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-common/gradle.lockfile index 90ef02a162d..8b1e75ffbf3 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-common/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-common/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-common/gradle.lockfile index a9a0b0698d2..d7f5436286e 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-common/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/gradle.lockfile index 02901b039d0..28ccf6f18a2 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=earlyDep10ForkedTestCompileClasspath,earlyDep10Forke com.google.guava:guava:32.0.1-jre=annotationProcessor,earlyDep10ForkedTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,earlyDep10ForkedTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,earlyDep10ForkedTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/gradle.lockfile index ed0d1ae0a7f..3c99a99bea2 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedT com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/gradle.lockfile index 051df5449ef..d8dfd4eff03 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=ee10ForkedTestCompileClasspath,ee10ForkedTestRuntime com.google.guava:guava:32.0.1-jre=annotationProcessor,ee10ForkedTestAnnotationProcessor,ee10LatestDepForkedTestAnnotationProcessor,ee10LatestDepTestAnnotationProcessor,ee10TestAnnotationProcessor,ee8LatestDepTestAnnotationProcessor,ee8TestAnnotationProcessor,ee9LatestDepTestAnnotationProcessor,ee9TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,ee10ForkedTestAnnotationProcessor,ee10LatestDepForkedTestAnnotationProcessor,ee10LatestDepTestAnnotationProcessor,ee10TestAnnotationProcessor,ee8LatestDepTestAnnotationProcessor,ee8TestAnnotationProcessor,ee9LatestDepTestAnnotationProcessor,ee9TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,ee10ForkedTestAnnotationProcessor,ee10LatestDepForkedTestAnnotationProcessor,ee10LatestDepTestAnnotationProcessor,ee10TestAnnotationProcessor,ee8LatestDepTestAnnotationProcessor,ee8TestAnnotationProcessor,ee9LatestDepTestAnnotationProcessor,ee9TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/gradle.lockfile index 271518bdb5c..30652b805b6 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedT com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepForkedTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/gradle.lockfile index 9dd5821a131..e85ece6e981 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedT com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepForkedTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/gradle.lockfile index 437fb3d6e5b..aaa3b75adf5 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedT com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/gradle.lockfile index 8a693bc1d75..2b40361facc 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testFixturesCompileClasspath,te com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.3/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.3/gradle.lockfile index 94fcde72a96..1bd7f466cfd 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.3/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedT com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.4.21/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.4.21/gradle.lockfile index 06f179bf311..48c4bca12df 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.4.21/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.4.21/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedT com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-util-9.4.31/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-util-9.4.31/gradle.lockfile index 8b71df799b3..a668a46f217 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-util-9.4.31/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-util-9.4.31/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jms/jakarta-jms-3.0/gradle.lockfile b/dd-java-agent/instrumentation/jms/jakarta-jms-3.0/gradle.lockfile index e5e43939597..8eb03711c01 100644 --- a/dd-java-agent/instrumentation/jms/jakarta-jms-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jms/jakarta-jms-3.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jms/javax-jms-1.1/gradle.lockfile b/dd-java-agent/instrumentation/jms/javax-jms-1.1/gradle.lockfile index 106068ef045..15e9fc398f5 100644 --- a/dd-java-agent/instrumentation/jms/javax-jms-1.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/jms/javax-jms-1.1/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedT com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jose-jwt-4.0/gradle.lockfile b/dd-java-agent/instrumentation/jose-jwt-4.0/gradle.lockfile index 3fcd5cef051..6888a73a78f 100644 --- a/dd-java-agent/instrumentation/jose-jwt-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jose-jwt-4.0/gradle.lockfile @@ -42,7 +42,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.nimbusds:nimbus-jose-jwt:9.24.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jsp-2.3/gradle.lockfile b/dd-java-agent/instrumentation/jsp-2.3/gradle.lockfile index d008c3394da..841480bebe2 100644 --- a/dd-java-agent/instrumentation/jsp-2.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/jsp-2.3/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -68,13 +68,13 @@ org.apache.commons:commons-text:1.14.0=spotbugs org.apache.logging.log4j:log4j-api:2.25.2=spotbugs org.apache.logging.log4j:log4j-core:2.25.2=spotbugs org.apache.tomcat.embed:tomcat-embed-core:7.0.37=testCompileClasspath,testRuntimeClasspath -org.apache.tomcat.embed:tomcat-embed-core:9.0.118=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.apache.tomcat.embed:tomcat-embed-el:9.0.118=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.tomcat.embed:tomcat-embed-core:9.0.119=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.tomcat.embed:tomcat-embed-el:9.0.119=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.tomcat.embed:tomcat-embed-jasper:7.0.37=testCompileClasspath,testRuntimeClasspath -org.apache.tomcat.embed:tomcat-embed-jasper:9.0.118=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.tomcat.embed:tomcat-embed-jasper:9.0.119=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.tomcat.embed:tomcat-embed-logging-juli:7.0.37=testCompileClasspath,testRuntimeClasspath org.apache.tomcat.embed:tomcat-embed-logging-juli:9.0.0.M6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.apache.tomcat:tomcat-annotations-api:9.0.118=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.tomcat:tomcat-annotations-api:9.0.119=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.tomcat:tomcat-api:7.0.20=compileClasspath org.apache.tomcat:tomcat-el-api:7.0.20=compileClasspath org.apache.tomcat:tomcat-jasper-el:7.0.20=compileClasspath diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/gradle.lockfile b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/gradle.lockfile index ce6649cf0ae..d9e046e2c2f 100644 --- a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/gradle.lockfile @@ -41,7 +41,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.8.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4-munit-0.7.28/gradle.lockfile b/dd-java-agent/instrumentation/junit/junit-4/junit-4-munit-0.7.28/gradle.lockfile index e4bc9377094..ad7d33e7ac9 100644 --- a/dd-java-agent/instrumentation/junit/junit-4/junit-4-munit-0.7.28/gradle.lockfile +++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4-munit-0.7.28/gradle.lockfile @@ -45,7 +45,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.8.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/gradle.lockfile b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/gradle.lockfile index 0279523496d..3c21f2654b8 100644 --- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/gradle.lockfile +++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/gradle.lockfile @@ -41,7 +41,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestImplement com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.8.0=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/gradle.lockfile b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/gradle.lockfile index e9aec40f12e..6bfd887690a 100644 --- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/gradle.lockfile +++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/gradle.lockfile @@ -41,7 +41,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.8.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/gradle.lockfile b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/gradle.lockfile index 0bc1847715e..a526a93c7db 100644 --- a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/gradle.lockfile @@ -41,7 +41,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.8.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/gradle.lockfile b/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/gradle.lockfile index 76edf140bea..3fceab0bec3 100644 --- a/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/gradle.lockfile @@ -42,7 +42,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.8.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/gradle.lockfile b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/gradle.lockfile index 3c99ea15f76..d0204406be9 100644 --- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/gradle.lockfile @@ -41,7 +41,7 @@ com.google.guava:guava:20.0=latest5TestCompileClasspath,latest5TestRuntimeClassp com.google.guava:guava:32.0.1-jre=annotationProcessor,latest5TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,v513TestAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latest5TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,v513TestAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latest5TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,v513TestAnnotationProcessor -com.google.re2j:re2j:1.7=latest5TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,v513TestRuntimeClasspath +com.google.re2j:re2j:1.8=latest5TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,v513TestRuntimeClasspath com.jayway.jsonpath:json-path:2.8.0=latest5TestCompileClasspath,latest5TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,v513TestCompileClasspath,v513TestRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latest5TestCompileClasspath,latest5TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,v513TestCompileClasspath,v513TestRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latest5TestCompileClasspath,latest5TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,v513TestCompileClasspath,v513TestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/gradle.lockfile b/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/gradle.lockfile index a1cfbf80815..42fa5434fa0 100644 --- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/gradle.lockfile @@ -41,7 +41,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.8.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/gradle.lockfile b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/gradle.lockfile index b993eb598ce..98caaf516a5 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/gradle.lockfile +++ b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/gradle.lockfile @@ -55,7 +55,7 @@ com.google.guava:guava:20.0=iastLatestDepTest3CompileClasspath,iastLatestDepTest com.google.guava:guava:32.0.1-jre=annotationProcessor,iastLatestDepTest3AnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,iastLatestDepTest3AnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,iastLatestDepTest3AnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=iastLatestDepTest3RuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=iastLatestDepTest3RuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/gradle.lockfile b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/gradle.lockfile index 5ae070c053d..26abfb293ee 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/gradle.lockfile @@ -50,7 +50,7 @@ com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedT com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/kafka/kafka-common/gradle.lockfile b/dd-java-agent/instrumentation/kafka/kafka-common/gradle.lockfile index 5ee8afd8beb..a32773adcdf 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/kafka/kafka-common/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/gradle.lockfile b/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/gradle.lockfile index d15fa2afbae..45a2f45f203 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/gradle.lockfile +++ b/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/gradle.lockfile @@ -54,7 +54,7 @@ com.google.guava:guava:20.0=compileClasspath,testCompileClasspath,testRuntimeCla com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/gradle.lockfile b/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/gradle.lockfile index 70e8ed5db0a..a3b6982275e 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/gradle.lockfile +++ b/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/gradle.lockfile @@ -49,7 +49,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/kafka/kafka-streams-1.0/gradle.lockfile b/dd-java-agent/instrumentation/kafka/kafka-streams-1.0/gradle.lockfile index e61db9681f7..2c848111cfc 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-streams-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/kafka/kafka-streams-1.0/gradle.lockfile @@ -40,7 +40,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/karate-1.0/gradle.lockfile b/dd-java-agent/instrumentation/karate-1.0/gradle.lockfile index 7c9bf167f87..b10186f25ff 100644 --- a/dd-java-agent/instrumentation/karate-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/karate-1.0/gradle.lockfile @@ -50,7 +50,7 @@ com.google.guava:guava:20.0=karate131TestCompileClasspath,karate131TestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,karate131TestAnnotationProcessor,karate141TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,karate131TestAnnotationProcessor,karate141TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,karate131TestAnnotationProcessor,karate141TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=karate131TestRuntimeClasspath,karate141TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=karate131TestRuntimeClasspath,karate141TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.ibm.icu:icu4j:67.1=testRuntimeClasspath com.ibm.icu:icu4j:71.1=karate141TestRuntimeClasspath com.intuit.karate:karate-core:1.0.0=compileClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/kotlin-coroutines-1.3/gradle.lockfile b/dd-java-agent/instrumentation/kotlin-coroutines-1.3/gradle.lockfile index 9dd0aecba8c..9d1e099aa09 100644 --- a/dd-java-agent/instrumentation/kotlin-coroutines-1.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/kotlin-coroutines-1.3/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestImplement com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-4.0/gradle.lockfile b/dd-java-agent/instrumentation/lettuce/lettuce-4.0/gradle.lockfile index effea683102..37d9d20a7c8 100644 --- a/dd-java-agent/instrumentation/lettuce/lettuce-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/lettuce/lettuce-4.0/gradle.lockfile @@ -41,7 +41,7 @@ com.google.guava:guava:19.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/gradle.lockfile b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/gradle.lockfile index 9837f2d1f81..08e402179c7 100644 --- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/gradle.lockfile @@ -45,7 +45,7 @@ com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedT com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.redis.testcontainers:testcontainers-redis:1.6.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.redis:redis-enterprise-admin:0.3.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/liberty/liberty-20.0/gradle.lockfile b/dd-java-agent/instrumentation/liberty/liberty-20.0/gradle.lockfile index d06148933b0..8e640af308f 100644 --- a/dd-java-agent/instrumentation/liberty/liberty-20.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/liberty/liberty-20.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath,webappComp com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath,webappCompileClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath,webappCompileClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath,webappCompileClasspath diff --git a/dd-java-agent/instrumentation/liberty/liberty-23.0/gradle.lockfile b/dd-java-agent/instrumentation/liberty/liberty-23.0/gradle.lockfile index c14ca24fc75..de8174f8f50 100644 --- a/dd-java-agent/instrumentation/liberty/liberty-23.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/liberty/liberty-23.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath,webappComp com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath,webappCompileClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath,webappCompileClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath,webappCompileClasspath diff --git a/dd-java-agent/instrumentation/log4j/log4j-1.2.4/gradle.lockfile b/dd-java-agent/instrumentation/log4j/log4j-1.2.4/gradle.lockfile index 40da9698294..92a599af5e5 100644 --- a/dd-java-agent/instrumentation/log4j/log4j-1.2.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/log4j/log4j-1.2.4/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/log4j/log4j-2.0/gradle.lockfile b/dd-java-agent/instrumentation/log4j/log4j-2.0/gradle.lockfile index 5aba2834741..6935b70492e 100644 --- a/dd-java-agent/instrumentation/log4j/log4j-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/log4j/log4j-2.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/log4j/log4j-2.7/gradle.lockfile b/dd-java-agent/instrumentation/log4j/log4j-2.7/gradle.lockfile index 57d334d0452..4323557a62f 100644 --- a/dd-java-agent/instrumentation/log4j/log4j-2.7/gradle.lockfile +++ b/dd-java-agent/instrumentation/log4j/log4j-2.7/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/logback-1.0/gradle.lockfile b/dd-java-agent/instrumentation/logback-1.0/gradle.lockfile index c560799f4e3..3f9e68de637 100644 --- a/dd-java-agent/instrumentation/logback-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/logback-1.0/gradle.lockfile @@ -39,7 +39,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/mail/jakarta-mail-2.0.1/gradle.lockfile b/dd-java-agent/instrumentation/mail/jakarta-mail-2.0.1/gradle.lockfile index 731c012761d..0fc7d7f8e6b 100644 --- a/dd-java-agent/instrumentation/mail/jakarta-mail-2.0.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/mail/jakarta-mail-2.0.1/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/mail/javax-mail-1.4.4/gradle.lockfile b/dd-java-agent/instrumentation/mail/javax-mail-1.4.4/gradle.lockfile index b6d21eab302..c9411a98500 100644 --- a/dd-java-agent/instrumentation/mail/javax-mail-1.4.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/mail/javax-mail-1.4.4/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/maven/maven-3.2.1/gradle.lockfile b/dd-java-agent/instrumentation/maven/maven-3.2.1/gradle.lockfile index 34a8ca23f44..19d445441ec 100644 --- a/dd-java-agent/instrumentation/maven/maven-3.2.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/maven/maven-3.2.1/gradle.lockfile @@ -48,7 +48,7 @@ com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=anno com.google.inject:guice:6.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.8.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/maven/maven-surefire-3.0/gradle.lockfile b/dd-java-agent/instrumentation/maven/maven-surefire-3.0/gradle.lockfile index 334ac1e6a45..4cee93f01be 100644 --- a/dd-java-agent/instrumentation/maven/maven-surefire-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/maven/maven-surefire-3.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-2.0/gradle.lockfile b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-2.0/gradle.lockfile index 816e71bc26a..2bae1e5872a 100644 --- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-2.0/gradle.lockfile @@ -49,7 +49,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-3.0/gradle.lockfile b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-3.0/gradle.lockfile index 7113c242921..aa3cea3243d 100644 --- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-3.0/gradle.lockfile @@ -50,7 +50,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/gradle.lockfile b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/gradle.lockfile index 45d409ac03a..6e349f1ef89 100644 --- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/gradle.lockfile @@ -51,7 +51,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-common/gradle.lockfile b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-common/gradle.lockfile index 8b7ea5973f9..058affba2c5 100644 --- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-common/gradle.lockfile @@ -40,7 +40,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/mongo/mongo-common/gradle.lockfile b/dd-java-agent/instrumentation/mongo/mongo-common/gradle.lockfile index faf6fb978c6..3d0a43ec243 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/mongo/mongo-common/gradle.lockfile @@ -41,7 +41,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testFixturesCompileClasspath,te com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/gradle.lockfile b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/gradle.lockfile index 01c80e85b5d..76e638fdc8b 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/gradle.lockfile @@ -41,7 +41,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/gradle.lockfile b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/gradle.lockfile index a699d858da2..b09a8d46b58 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/gradle.lockfile @@ -41,7 +41,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.6/gradle.lockfile b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.6/gradle.lockfile index a09b01fabce..6b0924712d1 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.6/gradle.lockfile +++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.6/gradle.lockfile @@ -41,7 +41,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.8/gradle.lockfile b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.8/gradle.lockfile index f2e2bfd204b..b542ab58064 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.8/gradle.lockfile @@ -41,7 +41,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/gradle.lockfile b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/gradle.lockfile index 4649f7db2d8..072bbe9dd8f 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/gradle.lockfile @@ -41,7 +41,7 @@ com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedT com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,mongo410ForkedTestAnnotationProcessor,mongo410TestAnnotationProcessor,mongo43ForkedTestAnnotationProcessor,mongo43TestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,mongo410ForkedTestAnnotationProcessor,mongo410TestAnnotationProcessor,mongo43ForkedTestAnnotationProcessor,mongo43TestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,mongo410ForkedTestAnnotationProcessor,mongo410TestAnnotationProcessor,mongo43ForkedTestAnnotationProcessor,mongo43TestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestCompileClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestCompileClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestCompileClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestCompileClasspath,mongo43TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestCompileClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestCompileClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestCompileClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestCompileClasspath,mongo43TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestCompileClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestCompileClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestCompileClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestCompileClasspath,mongo43TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-async-3.3/gradle.lockfile b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-async-3.3/gradle.lockfile index 96f399d882a..c65b7e5a566 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-async-3.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-async-3.3/gradle.lockfile @@ -41,7 +41,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.1/gradle.lockfile b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.1/gradle.lockfile index ac802765372..fe90cd4b73f 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.1/gradle.lockfile @@ -41,7 +41,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.7/gradle.lockfile b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.7/gradle.lockfile index 56719dde63b..4114e3766df 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.7/gradle.lockfile +++ b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.7/gradle.lockfile @@ -41,7 +41,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-sync-3.10/gradle.lockfile b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-sync-3.10/gradle.lockfile index 126793becca..0e38465c9ef 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-sync-3.10/gradle.lockfile +++ b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-sync-3.10/gradle.lockfile @@ -41,7 +41,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/mule-4.5/gradle.lockfile b/dd-java-agent/instrumentation/mule-4.5/gradle.lockfile index a9d955ae53b..e6a7786c768 100644 --- a/dd-java-agent/instrumentation/mule-4.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/mule-4.5/gradle.lockfile @@ -94,7 +94,7 @@ com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=anno com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,mule46ForkedTestAnnotationProcessor,mule46ForkedTestCompileClasspath,testAnnotationProcessor,testCompileClasspath com.google.j2objc:j2objc-annotations:3.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestMuleServices com.google.re2j:re2j:1.6=latestDepForkedTestCompileClasspath,latestMuleServices,mule46Services,muleServices -com.google.re2j:re2j:1.7=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath com.googlecode.juniversalchardet:juniversalchardet:1.0.3=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.googlecode.libphonenumber:libphonenumber:8.0.0=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.ibm.icu:icu4j:67.1=mule46Services,muleServices diff --git a/dd-java-agent/instrumentation/netty/netty-3.8/gradle.lockfile b/dd-java-agent/instrumentation/netty/netty-3.8/gradle.lockfile index c64576330d0..54512aa02b4 100644 --- a/dd-java-agent/instrumentation/netty/netty-3.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/netty/netty-3.8/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.ning:async-http-client:1.8.0=testCompileClasspath,testRuntimeClasspath com.ning:async-http-client:1.9.40=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/netty/netty-4.0/gradle.lockfile b/dd-java-agent/instrumentation/netty/netty-4.0/gradle.lockfile index 5c02472d3e9..4be53fda3aa 100644 --- a/dd-java-agent/instrumentation/netty/netty-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/netty/netty-4.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/gradle.lockfile b/dd-java-agent/instrumentation/netty/netty-4.1/gradle.lockfile index cb9f5726f77..5957ecf3153 100644 --- a/dd-java-agent/instrumentation/netty/netty-4.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/netty/netty-4.1/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/netty/netty-buffer-4.0/gradle.lockfile b/dd-java-agent/instrumentation/netty/netty-buffer-4.0/gradle.lockfile index 3e7a8807b21..20febaaccb5 100644 --- a/dd-java-agent/instrumentation/netty/netty-buffer-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/netty/netty-buffer-4.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDep4TestCompileClasspath,latestDep4TestRuntime com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDep4TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDep4TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDep4TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/netty/netty-common/gradle.lockfile b/dd-java-agent/instrumentation/netty/netty-common/gradle.lockfile index b69b14da908..ff3a823af24 100644 --- a/dd-java-agent/instrumentation/netty/netty-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/netty/netty-common/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/gradle.lockfile b/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/gradle.lockfile index 5f16a18a1a0..ccf7f907182 100644 --- a/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDep4TestCompileClasspath,latestDep4TestRuntime com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDep4TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDep4TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDep4TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/netty/netty-promise-4.0/gradle.lockfile b/dd-java-agent/instrumentation/netty/netty-promise-4.0/gradle.lockfile index c5ae8d014c7..c9ad30bd096 100644 --- a/dd-java-agent/instrumentation/netty/netty-promise-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/netty/netty-promise-4.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDep4TestCompileClasspath,latestDep4TestRuntime com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDep4TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDep4TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDep4TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/ognl-appsec-3.3.2/gradle.lockfile b/dd-java-agent/instrumentation/ognl-appsec-3.3.2/gradle.lockfile index 1fc5ce9c43e..0fd5bf768fa 100644 --- a/dd-java-agent/instrumentation/ognl-appsec-3.3.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/ognl-appsec-3.3.2/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/okhttp/okhttp-2.2/gradle.lockfile b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/gradle.lockfile index 470c0312e1a..f33b4516841 100644 --- a/dd-java-agent/instrumentation/okhttp/okhttp-2.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/okhttp/okhttp-3.0/gradle.lockfile b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/gradle.lockfile index a8423d01118..25a3878b1da 100644 --- a/dd-java-agent/instrumentation/okhttp/okhttp-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.0.0=compileClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/gradle.lockfile b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/gradle.lockfile index 15f33a0f66b..efa69aa4b34 100644 --- a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/gradle.lockfile @@ -49,7 +49,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.openai:openai-java-client-okhttp:3.0.1=compileClasspath,testCompileClasspath,testRuntimeClasspath com.openai:openai-java-client-okhttp:4.41.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.openai:openai-java-core:3.0.1=compileClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/opensearch/opensearch-common/gradle.lockfile b/dd-java-agent/instrumentation/opensearch/opensearch-common/gradle.lockfile index 666809c4dc4..f895397b7e5 100644 --- a/dd-java-agent/instrumentation/opensearch/opensearch-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/opensearch/opensearch-common/gradle.lockfile @@ -42,7 +42,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/opensearch/opensearch-rest-1.0/gradle.lockfile b/dd-java-agent/instrumentation/opensearch/opensearch-rest-1.0/gradle.lockfile index d2637036a1c..63f403a85d2 100644 --- a/dd-java-agent/instrumentation/opensearch/opensearch-rest-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/opensearch/opensearch-rest-1.0/gradle.lockfile @@ -43,7 +43,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/gradle.lockfile b/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/gradle.lockfile index 928fc3bc21a..c65ebda0c9c 100644 --- a/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/gradle.lockfile @@ -43,7 +43,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/opentelemetry/gradle.lockfile b/dd-java-agent/instrumentation/opentelemetry/gradle.lockfile index 94400dc1505..5349155c572 100644 --- a/dd-java-agent/instrumentation/opentelemetry/gradle.lockfile +++ b/dd-java-agent/instrumentation/opentelemetry/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/gradle.lockfile b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/gradle.lockfile index 6eff6f12238..16e8fd2ddc6 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/gradle.lockfile @@ -38,7 +38,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.27/gradle.lockfile b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.27/gradle.lockfile index 2b9ceb87a02..7885fbba54a 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.27/gradle.lockfile +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.27/gradle.lockfile @@ -38,7 +38,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/gradle.lockfile b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/gradle.lockfile index fccdad30367..52b08a174b7 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/gradle.lockfile @@ -38,7 +38,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/gradle.lockfile b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/gradle.lockfile index 8c378304c36..d0013451922 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/gradle.lockfile +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/gradle.lockfile @@ -46,7 +46,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/gradle.lockfile b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/gradle.lockfile index f7dbd49824b..1bb88f5f135 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/gradle.lockfile +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/gradle.lockfile @@ -38,7 +38,7 @@ com.google.guava:guava:20.0=latest1xDepTestCompileClasspath,latest1xDepTestRunti com.google.guava:guava:32.0.1-jre=annotationProcessor,latest1xDepTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latest1xDepTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latest1xDepTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latest1xDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latest1xDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latest1xDepTestCompileClasspath,latest1xDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latest1xDepTestCompileClasspath,latest1xDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latest1xDepTestCompileClasspath,latest1xDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.26/gradle.lockfile b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.26/gradle.lockfile index d788512b8ca..3529086cfa4 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.26/gradle.lockfile +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.26/gradle.lockfile @@ -38,7 +38,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-0.31/gradle.lockfile b/dd-java-agent/instrumentation/opentracing/opentracing-0.31/gradle.lockfile index b26e96e1d04..7a05c0211bb 100644 --- a/dd-java-agent/instrumentation/opentracing/opentracing-0.31/gradle.lockfile +++ b/dd-java-agent/instrumentation/opentracing/opentracing-0.31/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-0.32/gradle.lockfile b/dd-java-agent/instrumentation/opentracing/opentracing-0.32/gradle.lockfile index e3a14d1dc56..8ac117a2538 100644 --- a/dd-java-agent/instrumentation/opentracing/opentracing-0.32/gradle.lockfile +++ b/dd-java-agent/instrumentation/opentracing/opentracing-0.32/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-common/gradle.lockfile b/dd-java-agent/instrumentation/opentracing/opentracing-common/gradle.lockfile index 8f7eb8a3f27..e9d363e50e2 100644 --- a/dd-java-agent/instrumentation/opentracing/opentracing-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/opentracing/opentracing-common/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/org-json-20230227/gradle.lockfile b/dd-java-agent/instrumentation/org-json-20230227/gradle.lockfile index 5b1b0d1811a..392d23d5c9e 100644 --- a/dd-java-agent/instrumentation/org-json-20230227/gradle.lockfile +++ b/dd-java-agent/instrumentation/org-json-20230227/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/osgi-4.3/gradle.lockfile b/dd-java-agent/instrumentation/osgi-4.3/gradle.lockfile index 44a2cf26185..b1e6868aa66 100644 --- a/dd-java-agent/instrumentation/osgi-4.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/osgi-4.3/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/owasp-esapi-2.1/gradle.lockfile b/dd-java-agent/instrumentation/owasp-esapi-2.1/gradle.lockfile index 7e8f0610c9e..b499a982d36 100644 --- a/dd-java-agent/instrumentation/owasp-esapi-2.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/owasp-esapi-2.1/gradle.lockfile @@ -38,7 +38,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/gradle.lockfile b/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/gradle.lockfile index 476746099bf..b7489945f9e 100644 --- a/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/gradle.lockfile @@ -41,7 +41,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/gradle.lockfile b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/gradle.lockfile index 5be56f986d0..96ad6445a93 100644 --- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/gradle.lockfile @@ -53,7 +53,7 @@ com.google.guava:guava:20.0=baseTestCompileClasspath,baseTestRuntimeClasspath,ia com.google.guava:guava:32.0.1-jre=annotationProcessor,baseTestAnnotationProcessor,iastTestAnnotationProcessor,latestDepIastTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestPekko10TestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,baseTestAnnotationProcessor,iastTestAnnotationProcessor,latestDepIastTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestPekko10TestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,baseTestAnnotationProcessor,iastTestAnnotationProcessor,latestDepIastTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestPekko10TestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=baseTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestPekko10TestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=baseTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestPekko10TestRuntimeClasspath,testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.squareup.moshi:moshi:1.11.0=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPekko10TestCompileClasspath,latestPekko10TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPekko10TestCompileClasspath,latestPekko10TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/play-ws/play-ws-1.0/gradle.lockfile b/dd-java-agent/instrumentation/play-ws/play-ws-1.0/gradle.lockfile index 52807845814..bd7ef75ad0c 100644 --- a/dd-java-agent/instrumentation/play-ws/play-ws-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/play-ws/play-ws-1.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/play-ws/play-ws-2.0/gradle.lockfile b/dd-java-agent/instrumentation/play-ws/play-ws-2.0/gradle.lockfile index 36ffd889391..b6678e307df 100644 --- a/dd-java-agent/instrumentation/play-ws/play-ws-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/play-ws/play-ws-2.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/play-ws/play-ws-2.1/gradle.lockfile b/dd-java-agent/instrumentation/play-ws/play-ws-2.1/gradle.lockfile index 2890312d82e..e5de2e5a4df 100644 --- a/dd-java-agent/instrumentation/play-ws/play-ws-2.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/play-ws/play-ws-2.1/gradle.lockfile @@ -38,7 +38,7 @@ com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationPro com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.protobuf:protobuf-java:3.10.0=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/play-ws/play-ws-common/gradle.lockfile b/dd-java-agent/instrumentation/play-ws/play-ws-common/gradle.lockfile index 324d1ecf8ee..7264f536bd9 100644 --- a/dd-java-agent/instrumentation/play-ws/play-ws-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/play-ws/play-ws-common/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/play/play-2.3/gradle.lockfile b/dd-java-agent/instrumentation/play/play-2.3/gradle.lockfile index a52043c1f45..66de6ec7812 100644 --- a/dd-java-agent/instrumentation/play/play-2.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/play/play-2.3/gradle.lockfile @@ -48,7 +48,7 @@ com.google.guava:guava:16.0.1=latestDepTestCompileClasspath,latestDepTestRuntime com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.ning:async-http-client:1.8.15=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.novocode:junit-interface:0.11-RC1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/play/play-2.4/gradle.lockfile b/dd-java-agent/instrumentation/play/play-2.4/gradle.lockfile index b82fcb7a0fc..6299c5fb5c8 100644 --- a/dd-java-agent/instrumentation/play/play-2.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/play/play-2.4/gradle.lockfile @@ -48,7 +48,7 @@ com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=anno com.google.inject.extensions:guice-assistedinject:4.0=compileClasspath com.google.inject:guice:4.0=compileClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/play/play-2.6/gradle.lockfile b/dd-java-agent/instrumentation/play/play-2.6/gradle.lockfile index a5ad83ce428..8f00f4ac07d 100644 --- a/dd-java-agent/instrumentation/play/play-2.6/gradle.lockfile +++ b/dd-java-agent/instrumentation/play/play-2.6/gradle.lockfile @@ -54,7 +54,7 @@ com.google.inject.extensions:guice-assistedinject:4.1.0=testCompileClasspath,tes com.google.inject:guice:4.1.0=testCompileClasspath,testFixturesCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:1.1=compileClasspath,testCompileClasspath,testFixturesCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=testFixturesRuntimeClasspath,testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.novocode:junit-interface:0.11=testCompileClasspath,testFixturesCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.5/gradle.lockfile b/dd-java-agent/instrumentation/play/play-appsec-2.5/gradle.lockfile index e1c7ac01b98..1ff1b487bb1 100644 --- a/dd-java-agent/instrumentation/play/play-appsec-2.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/gradle.lockfile @@ -58,7 +58,7 @@ com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=anno com.google.inject.extensions:guice-assistedinject:4.0=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.inject:guice:4.0=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.novocode:junit-interface:0.11=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.6/gradle.lockfile b/dd-java-agent/instrumentation/play/play-appsec-2.6/gradle.lockfile index d40d51e22f2..972ee94eaab 100644 --- a/dd-java-agent/instrumentation/play/play-appsec-2.6/gradle.lockfile +++ b/dd-java-agent/instrumentation/play/play-appsec-2.6/gradle.lockfile @@ -53,7 +53,7 @@ com.google.inject.extensions:guice-assistedinject:4.1.0=testCompileClasspath,tes com.google.inject:guice:4.1.0=testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:1.1=compileClasspath,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.novocode:junit-interface:0.11=testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.7/gradle.lockfile b/dd-java-agent/instrumentation/play/play-appsec-2.7/gradle.lockfile index bd7b5f28800..c6cbd87ea4f 100644 --- a/dd-java-agent/instrumentation/play/play-appsec-2.7/gradle.lockfile +++ b/dd-java-agent/instrumentation/play/play-appsec-2.7/gradle.lockfile @@ -71,7 +71,7 @@ com.google.inject:guice:4.2.2=testCompileClasspath,testRuntimeClasspath com.google.inject:guice:6.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.j2objc:j2objc-annotations:1.1=compileClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.novocode:junit-interface:0.11=testCompileClasspath,testRuntimeClasspath com.shapesecurity:salvation2:3.0.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/play/play-appsec-common/gradle.lockfile b/dd-java-agent/instrumentation/play/play-appsec-common/gradle.lockfile index ad01f4efe4e..acaa8bbff9c 100644 --- a/dd-java-agent/instrumentation/play/play-appsec-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/play/play-appsec-common/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/protobuf-3.0/gradle.lockfile b/dd-java-agent/instrumentation/protobuf-3.0/gradle.lockfile index e7950743858..689081299d1 100644 --- a/dd-java-agent/instrumentation/protobuf-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/protobuf-3.0/gradle.lockfile @@ -39,7 +39,7 @@ com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=anno com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor com.google.protobuf:protobuf-java:3.0.0=compileClasspath,compileProtoPath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.google.protobuf:protoc:3.0.0=protobufToolsLocator_protoc -com.google.re2j:re2j:1.7=testCompileProtoPath,testRuntimeClasspath +com.google.re2j:re2j:1.8=testCompileProtoPath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/quartz-2.0/gradle.lockfile b/dd-java-agent/instrumentation/quartz-2.0/gradle.lockfile index 6c447bc9bc5..157765e4f17 100644 --- a/dd-java-agent/instrumentation/quartz-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/quartz-2.0/gradle.lockfile @@ -38,7 +38,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,version40TestAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,version40TestAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,version40TestAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath,version40TestRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath,version40TestRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version40TestCompileClasspath,version40TestRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version40TestCompileClasspath,version40TestRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version40TestCompileClasspath,version40TestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/gradle.lockfile b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/gradle.lockfile index 4df736a9ae5..5d329104ac2 100644 --- a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/gradle.lockfile +++ b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/gradle.lockfile @@ -42,7 +42,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,latestReactorTestAnnotationProcessor,reactorTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestReactorTestAnnotationProcessor,reactorTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,latestReactorTestAnnotationProcessor,reactorTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,latestReactorTestRuntimeClasspath,reactorTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,latestReactorTestRuntimeClasspath,reactorTestRuntimeClasspath,testRuntimeClasspath com.rabbitmq:amqp-client:2.7.0=compileClasspath com.rabbitmq:amqp-client:2.8.1=testCompileClasspath,testRuntimeClasspath com.rabbitmq:amqp-client:5.14.2=latestReactorTestCompileClasspath,latestReactorTestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/ratpack-1.5/gradle.lockfile b/dd-java-agent/instrumentation/ratpack-1.5/gradle.lockfile index ebde5d2448a..4991be373f9 100644 --- a/dd-java-agent/instrumentation/ratpack-1.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/ratpack-1.5/gradle.lockfile @@ -62,7 +62,7 @@ com.google.inject:guice:4.1.0=testCompileClasspath,testRuntimeClasspath com.google.inject:guice:4.2.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.j2objc:j2objc-annotations:1.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/reactive-streams-1.0/gradle.lockfile b/dd-java-agent/instrumentation/reactive-streams-1.0/gradle.lockfile index 3cffca571c2..b0f58caf7b3 100644 --- a/dd-java-agent/instrumentation/reactive-streams-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/reactive-streams-1.0/gradle.lockfile @@ -38,7 +38,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/reactor-core-3.1/gradle.lockfile b/dd-java-agent/instrumentation/reactor-core-3.1/gradle.lockfile index 91a8e44f8c9..cdc82152c06 100644 --- a/dd-java-agent/instrumentation/reactor-core-3.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/reactor-core-3.1/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/reactor-netty-1.0/gradle.lockfile b/dd-java-agent/instrumentation/reactor-netty-1.0/gradle.lockfile index b5a7b28049f..0ed4ede925e 100644 --- a/dd-java-agent/instrumentation/reactor-netty-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/reactor-netty-1.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/rediscala-1.8/gradle.lockfile b/dd-java-agent/instrumentation/rediscala-1.8/gradle.lockfile index 1d63e0ea259..e757f7432a3 100644 --- a/dd-java-agent/instrumentation/rediscala-1.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/rediscala-1.8/gradle.lockfile @@ -40,7 +40,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/redisson/redisson-2.0.0/gradle.lockfile b/dd-java-agent/instrumentation/redisson/redisson-2.0.0/gradle.lockfile index eab1f045060..45cecfb8c50 100644 --- a/dd-java-agent/instrumentation/redisson/redisson-2.0.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/redisson/redisson-2.0.0/gradle.lockfile @@ -52,7 +52,7 @@ com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedT com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.redis.testcontainers:testcontainers-redis:1.6.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.redis:redis-enterprise-admin:0.3.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/redisson/redisson-2.3.0/gradle.lockfile b/dd-java-agent/instrumentation/redisson/redisson-2.3.0/gradle.lockfile index 4892d674429..38668f42f11 100644 --- a/dd-java-agent/instrumentation/redisson/redisson-2.3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/redisson/redisson-2.3.0/gradle.lockfile @@ -53,7 +53,7 @@ com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedT com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.redis.testcontainers:testcontainers-redis:1.6.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.redis:redis-enterprise-admin:0.3.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/redisson/redisson-3.10.3/gradle.lockfile b/dd-java-agent/instrumentation/redisson/redisson-3.10.3/gradle.lockfile index b93e78b3bbe..519250eeab3 100644 --- a/dd-java-agent/instrumentation/redisson/redisson-3.10.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/redisson/redisson-3.10.3/gradle.lockfile @@ -59,7 +59,7 @@ com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedT com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.redis.testcontainers:testcontainers-redis:1.6.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.redis:redis-enterprise-admin:0.3.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/renaissance-0.7/gradle.lockfile b/dd-java-agent/instrumentation/renaissance-0.7/gradle.lockfile index 7f5e36ae930..32aaffd36f8 100644 --- a/dd-java-agent/instrumentation/renaissance-0.7/gradle.lockfile +++ b/dd-java-agent/instrumentation/renaissance-0.7/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/gradle.lockfile b/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/gradle.lockfile index c8a4090a5a4..9d3aa92ef76 100644 --- a/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/gradle.lockfile b/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/gradle.lockfile index 45dd2b52541..e66c8fe0e58 100644 --- a/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.0/gradle.lockfile b/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.0/gradle.lockfile index 4bb555685f0..630571c8bd9 100644 --- a/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.1/gradle.lockfile b/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.1/gradle.lockfile index 21c653cd4ee..38d3913ad92 100644 --- a/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.1/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/resteasy/resteasy-3.0/gradle.lockfile b/dd-java-agent/instrumentation/resteasy/resteasy-3.0/gradle.lockfile index 8db38c49a55..054d0d2d0ab 100644 --- a/dd-java-agent/instrumentation/resteasy/resteasy-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/resteasy/resteasy-3.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/restlet-2.2/gradle.lockfile b/dd-java-agent/instrumentation/restlet-2.2/gradle.lockfile index eab8b78d6b8..c37c53db6db 100644 --- a/dd-java-agent/instrumentation/restlet-2.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/restlet-2.2/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=baseForkedTestCompileClasspath,baseForkedTestRuntime com.google.guava:guava:32.0.1-jre=annotationProcessor,baseForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,baseForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,baseForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=baseForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=baseForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/gradle.lockfile b/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/gradle.lockfile index 287b0a6d32c..422fe4a2093 100644 --- a/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepJava11TestCompileClasspath,latestDepJava11T com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepJava11TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepJava11TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepJava11TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepJava11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepJava11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-1.1.1/gradle.lockfile b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-1.1.1/gradle.lockfile index 92f098f0b96..e456db03ce7 100644 --- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-1.1.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-1.1.1/gradle.lockfile @@ -57,7 +57,7 @@ com.google.guava:guava:17.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/gradle.lockfile b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/gradle.lockfile index 9e6f650db5e..bfaa8910933 100644 --- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/gradle.lockfile @@ -54,7 +54,7 @@ com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationPro com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,nestedTestAnnotationProcessor,nestedTestCompileClasspath,nestedTestRuntimeClasspath,resteasy31TestAnnotationProcessor,resteasy31TestCompileClasspath,resteasy31TestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:1.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,nestedTestCompileClasspath,nestedTestRuntimeClasspath,resteasy31TestCompileClasspath,resteasy31TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,nestedTestAnnotationProcessor,resteasy31TestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,nestedTestRuntimeClasspath,resteasy31TestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,nestedTestRuntimeClasspath,resteasy31TestRuntimeClasspath,testRuntimeClasspath com.helger:profiler:1.1.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,nestedTestCompileClasspath,nestedTestRuntimeClasspath,resteasy31TestCompileClasspath,resteasy31TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,nestedTestCompileClasspath,nestedTestRuntimeClasspath,resteasy31TestCompileClasspath,resteasy31TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,nestedTestCompileClasspath,nestedTestRuntimeClasspath,resteasy31TestCompileClasspath,resteasy31TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-1.1/gradle.lockfile b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-1.1/gradle.lockfile index d62e22856a9..8f42d00d2ac 100644 --- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-1.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-1.1/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/gradle.lockfile b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/gradle.lockfile index 2c62688db2f..9491550ef7a 100644 --- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/gradle.lockfile @@ -38,7 +38,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-1.0/gradle.lockfile b/dd-java-agent/instrumentation/rxjava/rxjava-1.0/gradle.lockfile index c6d279cb258..a287e9e4541 100644 --- a/dd-java-agent/instrumentation/rxjava/rxjava-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/rxjava/rxjava-1.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-2.0/gradle.lockfile b/dd-java-agent/instrumentation/rxjava/rxjava-2.0/gradle.lockfile index ec1ad425b48..e188215c803 100644 --- a/dd-java-agent/instrumentation/rxjava/rxjava-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/rxjava/rxjava-2.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/scala/scala-2.10.7/gradle.lockfile b/dd-java-agent/instrumentation/scala/scala-2.10.7/gradle.lockfile index efecf7af88f..e11fe2c7464 100644 --- a/dd-java-agent/instrumentation/scala/scala-2.10.7/gradle.lockfile +++ b/dd-java-agent/instrumentation/scala/scala-2.10.7/gradle.lockfile @@ -41,7 +41,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/gradle.lockfile b/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/gradle.lockfile index fe1e701c148..67e1d582a84 100644 --- a/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/gradle.lockfile @@ -41,7 +41,7 @@ com.google.guava:guava:20.0=latest11TestCompileClasspath,latest11TestRuntimeClas com.google.guava:guava:32.0.1-jre=annotationProcessor,latest11TestAnnotationProcessor,latest12TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latest11TestAnnotationProcessor,latest12TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latest11TestAnnotationProcessor,latest12TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latest11TestRuntimeClasspath,latest12TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latest11TestRuntimeClasspath,latest12TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.squareup.moshi:moshi:1.11.0=latest11TestCompileClasspath,latest11TestRuntimeClasspath,latest12TestCompileClasspath,latest12TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latest11TestCompileClasspath,latest11TestRuntimeClasspath,latest12TestCompileClasspath,latest12TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.10/gradle.lockfile b/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.10/gradle.lockfile index f75a692c9ba..76a85c360b0 100644 --- a/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.10/gradle.lockfile +++ b/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.10/gradle.lockfile @@ -41,7 +41,7 @@ com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedT com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.13/gradle.lockfile b/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.13/gradle.lockfile index 2db4bd0a4ca..edcee3ecfce 100644 --- a/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.13/gradle.lockfile +++ b/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.13/gradle.lockfile @@ -41,7 +41,7 @@ com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedT com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-common/gradle.lockfile b/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-common/gradle.lockfile index ef9ea833a92..8f2c420fab1 100644 --- a/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-common/gradle.lockfile @@ -41,7 +41,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/scalatest-3.0.8/gradle.lockfile b/dd-java-agent/instrumentation/scalatest-3.0.8/gradle.lockfile index 749e25db5f8..3460cc355ca 100644 --- a/dd-java-agent/instrumentation/scalatest-3.0.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/scalatest-3.0.8/gradle.lockfile @@ -45,7 +45,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.8.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/selenium-3.13/gradle.lockfile b/dd-java-agent/instrumentation/selenium-3.13/gradle.lockfile index 45eb3646a7a..984f8e4dabd 100644 --- a/dd-java-agent/instrumentation/selenium-3.13/gradle.lockfile +++ b/dd-java-agent/instrumentation/selenium-3.13/gradle.lockfile @@ -48,7 +48,7 @@ com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=anno com.google.j2objc:j2objc-annotations:1.1=compileClasspath,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.8.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.shapesecurity:salvation2:3.0.1=testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.0/gradle.lockfile b/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.0/gradle.lockfile index 68d671f9f55..aeb516c3f07 100644 --- a/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.0/gradle.lockfile @@ -39,7 +39,7 @@ com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationPro com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.protobuf:protobuf-bom:3.25.1=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.56/gradle.lockfile b/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.56/gradle.lockfile index 241ce1e745d..f880931c142 100644 --- a/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.56/gradle.lockfile +++ b/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.56/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/gradle.lockfile b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/gradle.lockfile index 4ddf38862b2..73ba88a3b48 100644 --- a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testFixturesCompileClasspath,te com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/gradle.lockfile b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/gradle.lockfile index 29c24bb7ab1..f7ee5ccf0c0 100644 --- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/gradle.lockfile b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/gradle.lockfile index bfe3a91d834..430901102ef 100644 --- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedT com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/gradle.lockfile b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/gradle.lockfile index 1deec1c3509..99b4f1d5d02 100644 --- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/gradle.lockfile b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/gradle.lockfile index 04b4beeced6..08c765efe5f 100644 --- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/gradle.lockfile +++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/slick-3.2/gradle.lockfile b/dd-java-agent/instrumentation/slick-3.2/gradle.lockfile index 22da2a0e858..b4d1bef6306 100644 --- a/dd-java-agent/instrumentation/slick-3.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/slick-3.2/gradle.lockfile @@ -41,7 +41,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.h2database:h2:1.4.197=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/snakeyaml-1.33/gradle.lockfile b/dd-java-agent/instrumentation/snakeyaml-1.33/gradle.lockfile index 2c25d8d3264..67decf4c904 100644 --- a/dd-java-agent/instrumentation/snakeyaml-1.33/gradle.lockfile +++ b/dd-java-agent/instrumentation/snakeyaml-1.33/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/gradle.lockfile b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/gradle.lockfile index 0f5e91546c8..87fc7532ff7 100644 --- a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/gradle.lockfile @@ -82,7 +82,7 @@ com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnota com.google.protobuf:protobuf-java-util:3.21.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.protobuf:protobuf-java:3.25.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.6=latestDepTestCompileClasspath,testCompileClasspath -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spark/spark-executor-common/gradle.lockfile b/dd-java-agent/instrumentation/spark/spark-executor-common/gradle.lockfile index 8129cf28877..73993a95449 100644 --- a/dd-java-agent/instrumentation/spark/spark-executor-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/spark/spark-executor-common/gradle.lockfile @@ -65,7 +65,7 @@ com.google.inject:guice:3.0=baseTestCompileClasspath,baseTestRuntimeClasspath,co com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,baseTestAnnotationProcessor,latest212DepTestAnnotationProcessor,latest213DepTestAnnotationProcessor,testAnnotationProcessor com.google.protobuf:protobuf-java:2.5.0=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath com.google.protobuf:protobuf-java:3.19.6=latest212DepTestCompileClasspath,latest212DepTestRuntimeClasspath,latest213DepTestCompileClasspath,latest213DepTestRuntimeClasspath -com.google.re2j:re2j:1.7=baseTestRuntimeClasspath,latest212DepTestRuntimeClasspath,latest213DepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=baseTestRuntimeClasspath,latest212DepTestRuntimeClasspath,latest213DepTestRuntimeClasspath,testRuntimeClasspath com.ning:compress-lzf:1.0.3=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath com.ning:compress-lzf:1.1.2=latest212DepTestCompileClasspath,latest212DepTestRuntimeClasspath,latest213DepTestCompileClasspath,latest213DepTestRuntimeClasspath com.squareup.moshi:moshi:1.11.0=baseTestCompileClasspath,baseTestRuntimeClasspath,latest212DepTestCompileClasspath,latest212DepTestRuntimeClasspath,latest213DepTestCompileClasspath,latest213DepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spark/sparkjava-2.3/gradle.lockfile b/dd-java-agent/instrumentation/spark/sparkjava-2.3/gradle.lockfile index 6f55ed31f4c..0b2e2c9e094 100644 --- a/dd-java-agent/instrumentation/spark/sparkjava-2.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/spark/sparkjava-2.3/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.sparkjava:spark-core:2.3=compileClasspath com.sparkjava:spark-core:2.4=testCompileClasspath,testRuntimeClasspath com.sparkjava:spark-core:2.9.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spray-1.3/gradle.lockfile b/dd-java-agent/instrumentation/spray-1.3/gradle.lockfile index 3cd94493909..cc42b79e664 100644 --- a/dd-java-agent/instrumentation/spray-1.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/spray-1.3/gradle.lockfile @@ -42,7 +42,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-beans-3.1/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-beans-3.1/gradle.lockfile index 5986537ac5c..5b0d23c155d 100644 --- a/dd-java-agent/instrumentation/spring/spring-beans-3.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-beans-3.1/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-boot-1.3/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-boot-1.3/gradle.lockfile index 928ae9777b4..e7b53e69f43 100644 --- a/dd-java-agent/instrumentation/spring/spring-boot-1.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-boot-1.3/gradle.lockfile @@ -42,7 +42,7 @@ com.google.guava:guava:20.0=boot1LatestDepForkedTestCompileClasspath,boot1Latest com.google.guava:guava:32.0.1-jre=annotationProcessor,boot1LatestDepForkedTestAnnotationProcessor,boot1LatestDepTestAnnotationProcessor,boot2ForkedTestAnnotationProcessor,boot2LatestDepForkedTestAnnotationProcessor,boot2LatestDepTestAnnotationProcessor,boot2TestAnnotationProcessor,boot3ForkedTestAnnotationProcessor,boot3TestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,boot1LatestDepForkedTestAnnotationProcessor,boot1LatestDepTestAnnotationProcessor,boot2ForkedTestAnnotationProcessor,boot2LatestDepForkedTestAnnotationProcessor,boot2LatestDepTestAnnotationProcessor,boot2TestAnnotationProcessor,boot3ForkedTestAnnotationProcessor,boot3TestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,boot1LatestDepForkedTestAnnotationProcessor,boot1LatestDepTestAnnotationProcessor,boot2ForkedTestAnnotationProcessor,boot2LatestDepForkedTestAnnotationProcessor,boot2LatestDepTestAnnotationProcessor,boot2TestAnnotationProcessor,boot3ForkedTestAnnotationProcessor,boot3TestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestRuntimeClasspath,boot3ForkedTestRuntimeClasspath,boot3TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestRuntimeClasspath,boot3ForkedTestRuntimeClasspath,boot3TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=boot1LatestDepForkedTestCompileClasspath,boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestCompileClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestCompileClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestCompileClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestCompileClasspath,boot2TestRuntimeClasspath,boot3ForkedTestCompileClasspath,boot3ForkedTestRuntimeClasspath,boot3TestCompileClasspath,boot3TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=boot1LatestDepForkedTestCompileClasspath,boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestCompileClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestCompileClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestCompileClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestCompileClasspath,boot2TestRuntimeClasspath,boot3ForkedTestCompileClasspath,boot3ForkedTestRuntimeClasspath,boot3TestCompileClasspath,boot3TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=boot1LatestDepForkedTestCompileClasspath,boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestCompileClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestCompileClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestCompileClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestCompileClasspath,boot2TestRuntimeClasspath,boot3ForkedTestCompileClasspath,boot3ForkedTestRuntimeClasspath,boot3TestCompileClasspath,boot3TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/gradle.lockfile index bbe883762ef..35383a07138 100644 --- a/dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/gradle.lockfile @@ -49,7 +49,7 @@ com.google.guava:guava:20.0=testCompileClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.jayway.jsonpath:json-path:2.4.0=testCompileClasspath,testRuntimeClasspath com.netflix.archaius:archaius-core:0.7.6=compileClasspath,testCompileClasspath,testRuntimeClasspath com.netflix.hystrix:hystrix-core:1.5.12=compileClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-core-3.2.2/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-core-3.2.2/gradle.lockfile index 8241a84ef02..c8b1860acd2 100644 --- a/dd-java-agent/instrumentation/spring/spring-core-3.2.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-core-3.2.2/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-data-1.8/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-data-1.8/gradle.lockfile index 2b21c5f77cc..5a29e25a17a 100644 --- a/dd-java-agent/instrumentation/spring/spring-data-1.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-data-1.8/gradle.lockfile @@ -39,7 +39,7 @@ com.google.guava:guava:18.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.infradna.tool:bridge-method-annotation:1.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.mysema.commons:mysema-commons-lang:0.2.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.mysema.querydsl:querydsl-core:3.7.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-jms-3.1/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-jms-3.1/gradle.lockfile index c913f6d020e..3197ba35ddb 100644 --- a/dd-java-agent/instrumentation/spring/spring-jms-3.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-jms-3.1/gradle.lockfile @@ -38,7 +38,7 @@ com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedT com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-messaging-4.0/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-messaging-4.0/gradle.lockfile index 6bae6bc6b08..2fac9a546e7 100644 --- a/dd-java-agent/instrumentation/spring/spring-messaging-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-messaging-4.0/gradle.lockfile @@ -52,7 +52,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestImplement com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/gradle.lockfile index ecb9ae0a132..04ced3e4a94 100644 --- a/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/gradle.lockfile @@ -44,7 +44,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.rabbitmq:amqp-client:5.0.0=compileClasspath com.rabbitmq:amqp-client:5.14.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.rabbitmq:amqp-client:5.9.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/gradle.lockfile index 50c2fd81f52..607d075c84b 100644 --- a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/gradle.lockfile @@ -47,7 +47,7 @@ com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedT com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestSpring5TestAnnotationProcessor,spring6TestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestSpring5TestAnnotationProcessor,spring6TestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestSpring5TestAnnotationProcessor,spring6TestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath com.h2database:h2:1.4.199=spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.h2database:h2:2.2.224=latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath com.h2database:h2:2.4.240=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/gradle.lockfile index 90f2f0990c5..30eb66d5dd2 100644 --- a/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/gradle.lockfile @@ -51,7 +51,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.6.0=testCompileClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.7.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-security/spring-security-6.0/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-security/spring-security-6.0/gradle.lockfile index 06d35b7abc9..e981945a5bc 100644 --- a/dd-java-agent/instrumentation/spring/spring-security/spring-security-6.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-security/spring-security-6.0/gradle.lockfile @@ -53,7 +53,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.7.0=testCompileClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/gradle.lockfile index cbdcbabfb96..fcada36bfae 100644 --- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/gradle.lockfile @@ -59,7 +59,7 @@ com.google.guava:guava:20.0=iastTestCompileClasspath,iastTestRuntimeClasspath,la com.google.guava:guava:32.0.1-jre=annotationProcessor,iastTestAnnotationProcessor,latestBoot20TestAnnotationProcessor,latestBoot24TestAnnotationProcessor,latestBoot2LatestTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestIast24TestAnnotationProcessor,latestIast3TestAnnotationProcessor,latestIastTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,iastTestAnnotationProcessor,latestBoot20TestAnnotationProcessor,latestBoot24TestAnnotationProcessor,latestBoot2LatestTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestIast24TestAnnotationProcessor,latestIast3TestAnnotationProcessor,latestIastTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,iastTestAnnotationProcessor,latestBoot20TestAnnotationProcessor,latestBoot24TestAnnotationProcessor,latestBoot2LatestTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestIast24TestAnnotationProcessor,latestIast3TestAnnotationProcessor,latestIastTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=iastTestRuntimeClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestIast24TestRuntimeClasspath,latestIast3TestRuntimeClasspath,latestIastTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=iastTestRuntimeClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestIast24TestRuntimeClasspath,latestIast3TestRuntimeClasspath,latestIastTestRuntimeClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.4.0=iastTestCompileClasspath,iastTestRuntimeClasspath,latestBoot20TestCompileClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestCompileClasspath,latestBoot24TestRuntimeClasspath,latestIast24TestCompileClasspath,latestIast24TestRuntimeClasspath,latestIast3TestCompileClasspath,latestIast3TestRuntimeClasspath com.jayway.jsonpath:json-path:2.7.0=latestBoot2LatestTestCompileClasspath,latestBoot2LatestTestRuntimeClasspath,latestIastTestCompileClasspath,latestIastTestRuntimeClasspath com.squareup.moshi:moshi:1.11.0=iastTestCompileClasspath,iastTestRuntimeClasspath,latestBoot20TestCompileClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestCompileClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestCompileClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestIast24TestCompileClasspath,latestIast24TestRuntimeClasspath,latestIast3TestCompileClasspath,latestIast3TestRuntimeClasspath,latestIastTestCompileClasspath,latestIastTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-6.0/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-6.0/gradle.lockfile index 76b92319395..5af1ac45679 100644 --- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-6.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-6.0/gradle.lockfile @@ -55,7 +55,7 @@ com.google.guava:guava:20.0=bootTestCompileClasspath,bootTestRuntimeClasspath,ia com.google.guava:guava:32.0.1-jre=annotationProcessor,bootTestAnnotationProcessor,iastTestAnnotationProcessor,latestDepBootTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,bootTestAnnotationProcessor,iastTestAnnotationProcessor,latestDepBootTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,bootTestAnnotationProcessor,iastTestAnnotationProcessor,latestDepBootTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=bootTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=bootTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.7.0=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath com.squareup.moshi:moshi:1.11.0=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/gradle.lockfile index ecfc97d7d5c..e1338693049 100644 --- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/gradle.lockfile @@ -49,7 +49,7 @@ com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedT com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.2.0=testCompileClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.7.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/gradle.lockfile index 1eb39aab644..d490b688ef4 100644 --- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/gradle.lockfile @@ -44,7 +44,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.jayway.jsonpath:json-path:2.7.0=testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/gradle.lockfile index 2132238d431..f9b442c736b 100644 --- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/gradle.lockfile @@ -55,7 +55,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.7.0=testCompileClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-ws-2.0/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-ws-2.0/gradle.lockfile index e3bb8d8667b..fe199cba20c 100644 --- a/dd-java-agent/instrumentation/spring/spring-ws-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-ws-2.0/gradle.lockfile @@ -45,7 +45,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spymemcached-2.10/gradle.lockfile b/dd-java-agent/instrumentation/spymemcached-2.10/gradle.lockfile index de71a077068..6d8992feb21 100644 --- a/dd-java-agent/instrumentation/spymemcached-2.10/gradle.lockfile +++ b/dd-java-agent/instrumentation/spymemcached-2.10/gradle.lockfile @@ -41,7 +41,7 @@ com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedT com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/synapse-3.0/gradle.lockfile b/dd-java-agent/instrumentation/synapse-3.0/gradle.lockfile index 5f1f83094ab..31b66e2a303 100644 --- a/dd-java-agent/instrumentation/synapse-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/synapse-3.0/gradle.lockfile @@ -38,7 +38,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.mchange:c3p0:0.9.5.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.mchange:mchange-commons-java:0.2.15=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/testng/testng-6.4/gradle.lockfile b/dd-java-agent/instrumentation/testng/testng-6.4/gradle.lockfile index e92b9f68c47..0ba461f55d0 100644 --- a/dd-java-agent/instrumentation/testng/testng-6.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/testng/testng-6.4/gradle.lockfile @@ -42,7 +42,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.jayway.jsonpath:json-path:2.8.0=testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/testng/testng-7.0/gradle.lockfile b/dd-java-agent/instrumentation/testng/testng-7.0/gradle.lockfile index bfe8ad4dc70..1f4d6a46d5c 100644 --- a/dd-java-agent/instrumentation/testng/testng-7.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/testng/testng-7.0/gradle.lockfile @@ -42,7 +42,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,testng751TestAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,testng751TestAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,testng751TestAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath,testng751TestRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath,testng751TestRuntimeClasspath com.jayway.jsonpath:json-path:2.8.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,testng751TestCompileClasspath,testng751TestRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,testng751TestCompileClasspath,testng751TestRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,testng751TestCompileClasspath,testng751TestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/testng/testng-common/gradle.lockfile b/dd-java-agent/instrumentation/testng/testng-common/gradle.lockfile index 7f33d1c8e7c..e72fd9c5a2f 100644 --- a/dd-java-agent/instrumentation/testng/testng-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/testng/testng-common/gradle.lockfile @@ -42,7 +42,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testFixturesCompileClasspath,te com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=testFixturesRuntimeClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.8.0=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/thymeleaf-3.0/gradle.lockfile b/dd-java-agent/instrumentation/thymeleaf-3.0/gradle.lockfile index 839538efa91..0f43f2e0a67 100644 --- a/dd-java-agent/instrumentation/thymeleaf-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/thymeleaf-3.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/gradle.lockfile b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/gradle.lockfile index e468060c8c6..710de77cf82 100644 --- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/gradle.lockfile +++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/gradle.lockfile b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/gradle.lockfile index 9482d125fcb..b94952e5cbb 100644 --- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/gradle.lockfile b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/gradle.lockfile index 75481504402..d7242ded074 100644 --- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/gradle.lockfile +++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/tinylog-2.0/gradle.lockfile b/dd-java-agent/instrumentation/tinylog-2.0/gradle.lockfile index 01d2e66af0c..26cf100e81a 100644 --- a/dd-java-agent/instrumentation/tinylog-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/tinylog-2.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-5.5/gradle.lockfile b/dd-java-agent/instrumentation/tomcat/tomcat-5.5/gradle.lockfile index bb77de94d35..23ac2e03675 100644 --- a/dd-java-agent/instrumentation/tomcat/tomcat-5.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/tomcat/tomcat-5.5/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latest10ForkedTestCompileClasspath,latest10ForkedTes com.google.guava:guava:32.0.1-jre=annotationProcessor,latest10ForkedTestAnnotationProcessor,latest10TestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,tomcat9TestAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latest10ForkedTestAnnotationProcessor,latest10TestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,tomcat9TestAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latest10ForkedTestAnnotationProcessor,latest10TestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,tomcat9TestAnnotationProcessor -com.google.re2j:re2j:1.7=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath +com.google.re2j:re2j:1.8=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath @@ -75,16 +75,16 @@ org.apache.commons:commons-lang3:3.20.0=latest10ForkedTestCompileClasspath,lates org.apache.commons:commons-text:1.14.0=spotbugs org.apache.logging.log4j:log4j-api:2.25.2=spotbugs org.apache.logging.log4j:log4j-core:2.25.2=spotbugs -org.apache.tomcat.embed:tomcat-embed-core:10.1.55=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath +org.apache.tomcat.embed:tomcat-embed-core:10.1.56=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath org.apache.tomcat.embed:tomcat-embed-core:11.0.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.apache.tomcat.embed:tomcat-embed-core:9.0.118=tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath -org.apache.tomcat.embed:tomcat-embed-websocket:10.1.55=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath +org.apache.tomcat.embed:tomcat-embed-core:9.0.119=tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +org.apache.tomcat.embed:tomcat-embed-websocket:10.1.56=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath org.apache.tomcat.embed:tomcat-embed-websocket:11.0.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.apache.tomcat.embed:tomcat-embed-websocket:9.0.118=tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +org.apache.tomcat.embed:tomcat-embed-websocket:9.0.119=tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath org.apache.tomcat:jakartaee-migration:1.0.12=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.apache.tomcat:tomcat-annotations-api:10.1.55=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath +org.apache.tomcat:tomcat-annotations-api:10.1.56=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath org.apache.tomcat:tomcat-annotations-api:11.0.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.apache.tomcat:tomcat-annotations-api:9.0.118=tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +org.apache.tomcat:tomcat-annotations-api:9.0.119=tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath org.apache.tomcat:tomcat-websocket-api:8.0.1=compileClasspath org.apache.tomcat:tomcat-websocket:8.0.1=compileClasspath org.apiguardian:apiguardian-api:1.1.2=latest10ForkedTestCompileClasspath,latest10TestCompileClasspath,latestDepForkedTestCompileClasspath,latestDepTestCompileClasspath,testCompileClasspath,tomcat9TestCompileClasspath diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-9.0/gradle.lockfile b/dd-java-agent/instrumentation/tomcat/tomcat-9.0/gradle.lockfile index 6a867a91861..7bb6510633b 100644 --- a/dd-java-agent/instrumentation/tomcat/tomcat-9.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/tomcat/tomcat-9.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-5.5/gradle.lockfile b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-5.5/gradle.lockfile index d4698f77048..f5926a4adad 100644 --- a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-5.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-5.5/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-6.0/gradle.lockfile b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-6.0/gradle.lockfile index cd5da6ddb1e..f52bf0c73b7 100644 --- a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-6.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-6.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/gradle.lockfile b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/gradle.lockfile index 57eb9c16bb2..839c4bdb801 100644 --- a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-common/gradle.lockfile b/dd-java-agent/instrumentation/tomcat/tomcat-common/gradle.lockfile index 0dac479c2b6..3739eda9af4 100644 --- a/dd-java-agent/instrumentation/tomcat/tomcat-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/tomcat/tomcat-common/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/twilio-0.0.1/gradle.lockfile b/dd-java-agent/instrumentation/twilio-0.0.1/gradle.lockfile index 36bf6bdeba3..5fed45af3c0 100644 --- a/dd-java-agent/instrumentation/twilio-0.0.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/twilio-0.0.1/gradle.lockfile @@ -50,7 +50,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/unbescape-1.1/gradle.lockfile b/dd-java-agent/instrumentation/unbescape-1.1/gradle.lockfile index c73764723f3..d85ec8a6ef0 100644 --- a/dd-java-agent/instrumentation/unbescape-1.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/unbescape-1.1/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/undertow/undertow-2.0/gradle.lockfile b/dd-java-agent/instrumentation/undertow/undertow-2.0/gradle.lockfile index e4d06c25608..0d8b459a717 100644 --- a/dd-java-agent/instrumentation/undertow/undertow-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/undertow/undertow-2.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedT com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/undertow/undertow-2.2/gradle.lockfile b/dd-java-agent/instrumentation/undertow/undertow-2.2/gradle.lockfile index 66d9e0e543b..5c240a257d3 100644 --- a/dd-java-agent/instrumentation/undertow/undertow-2.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/undertow/undertow-2.2/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latest22ForkedTestCompileClasspath,latest22ForkedTes com.google.guava:guava:32.0.1-jre=annotationProcessor,latest22ForkedTestAnnotationProcessor,latest22TestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latest22ForkedTestAnnotationProcessor,latest22TestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latest22ForkedTestAnnotationProcessor,latest22TestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latest22ForkedTestRuntimeClasspath,latest22TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latest22ForkedTestRuntimeClasspath,latest22TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latest22ForkedTestCompileClasspath,latest22ForkedTestRuntimeClasspath,latest22TestCompileClasspath,latest22TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latest22ForkedTestCompileClasspath,latest22ForkedTestRuntimeClasspath,latest22TestCompileClasspath,latest22TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latest22ForkedTestCompileClasspath,latest22ForkedTestRuntimeClasspath,latest22TestCompileClasspath,latest22TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/undertow/undertow-common/gradle.lockfile b/dd-java-agent/instrumentation/undertow/undertow-common/gradle.lockfile index 69b58c867dd..a770855676e 100644 --- a/dd-java-agent/instrumentation/undertow/undertow-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/undertow/undertow-common/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/valkey-java-5.3/gradle.lockfile b/dd-java-agent/instrumentation/valkey-java-5.3/gradle.lockfile index a6a352adf78..64925369db9 100644 --- a/dd-java-agent/instrumentation/valkey-java-5.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/valkey-java-5.3/gradle.lockfile @@ -39,7 +39,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/velocity-1.5/gradle.lockfile b/dd-java-agent/instrumentation/velocity-1.5/gradle.lockfile index e690980b6e2..599e76a94fe 100644 --- a/dd-java-agent/instrumentation/velocity-1.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/velocity-1.5/gradle.lockfile @@ -39,7 +39,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/gradle.lockfile b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/gradle.lockfile index c58ef76fd5b..c657ed1e650 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/gradle.lockfile @@ -49,7 +49,7 @@ com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotat com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.protobuf:protobuf-java:3.11.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/gradle.lockfile b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/gradle.lockfile index 3a4f4da20aa..64a715cf80b 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/gradle.lockfile @@ -46,7 +46,7 @@ com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotat com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.protobuf:protobuf-java:3.11.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.4.2/gradle.lockfile b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.4.2/gradle.lockfile index fe10aebbaca..66423e9c13b 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.4.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.4.2/gradle.lockfile @@ -40,7 +40,7 @@ com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedT com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/gradle.lockfile b/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/gradle.lockfile index 1c5f6140dcf..9bb64f21f6a 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/gradle.lockfile @@ -45,7 +45,7 @@ com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedT com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.ongres.scram:client:2.1=latestDepForkedTestCompileClasspath,latestDepTestCompileClasspath,testCompileClasspath,testRuntimeClasspath com.ongres.scram:common:2.1=latestDepForkedTestCompileClasspath,latestDepTestCompileClasspath,testCompileClasspath,testRuntimeClasspath com.ongres.scram:scram-client:3.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.4.2/gradle.lockfile b/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.4.2/gradle.lockfile index 06e7a7325b4..8978f0fe1b0 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.4.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.4.2/gradle.lockfile @@ -40,7 +40,7 @@ com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedT com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/gradle.lockfile b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/gradle.lockfile index f019b87dc52..604badfed6c 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/gradle.lockfile @@ -53,7 +53,7 @@ com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedT com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,redis4xForkedTestAnnotationProcessor,redis4xTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,redis4xForkedTestAnnotationProcessor,redis4xTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,redis4xForkedTestAnnotationProcessor,redis4xTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestRuntimeClasspath,testRuntimeClasspath com.redis.testcontainers:testcontainers-redis:1.6.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.redis:redis-enterprise-admin:0.3.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-stubs/gradle.lockfile b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-stubs/gradle.lockfile index 18868df5eeb..1cd09830585 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-stubs/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-stubs/gradle.lockfile @@ -40,7 +40,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/vertx/vertx-rx-3.5/gradle.lockfile b/dd-java-agent/instrumentation/vertx/vertx-rx-3.5/gradle.lockfile index 49a8cf8abe5..9c783a18348 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-rx-3.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx/vertx-rx-3.5/gradle.lockfile @@ -44,7 +44,7 @@ com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedT com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/gradle.lockfile b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/gradle.lockfile index 6becb4ed44f..3e7326d9618 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/gradle.lockfile @@ -40,7 +40,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/gradle.lockfile b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/gradle.lockfile index 2c607446810..16bd3404fbc 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/gradle.lockfile @@ -44,7 +44,7 @@ com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedT com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.5/gradle.lockfile b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.5/gradle.lockfile index 60c268448b2..36044f02c2b 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.5/gradle.lockfile @@ -44,7 +44,7 @@ com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedT com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.9/gradle.lockfile b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.9/gradle.lockfile index 362a152e959..be29715ea0d 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.9/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.9/gradle.lockfile @@ -40,7 +40,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/gradle.lockfile b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/gradle.lockfile index a065ac7d1ad..92798278f4b 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/gradle.lockfile @@ -40,7 +40,7 @@ com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedT com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/weaver-0.9/gradle.lockfile b/dd-java-agent/instrumentation/weaver-0.9/gradle.lockfile index 1b6013eaadb..66bb21dc293 100644 --- a/dd-java-agent/instrumentation/weaver-0.9/gradle.lockfile +++ b/dd-java-agent/instrumentation/weaver-0.9/gradle.lockfile @@ -52,7 +52,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,weaver084TestAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,weaver084TestAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,weaver084TestAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath,weaver084TestRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath,weaver084TestRuntimeClasspath com.jayway.jsonpath:json-path:2.8.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,weaver084TestCompileClasspath,weaver084TestRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,weaver084TestCompileClasspath,weaver084TestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/websocket/jakarta-websocket-2.0/gradle.lockfile b/dd-java-agent/instrumentation/websocket/jakarta-websocket-2.0/gradle.lockfile index 12eca69f12b..97bcbbc3360 100644 --- a/dd-java-agent/instrumentation/websocket/jakarta-websocket-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/websocket/jakarta-websocket-2.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/gradle.lockfile b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/gradle.lockfile index f5f445dd67d..2227c54ca1b 100644 --- a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10.0/gradle.lockfile b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10.0/gradle.lockfile index ced35bd3c3d..bf9c850d8ff 100644 --- a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-11.0/gradle.lockfile b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-11.0/gradle.lockfile index 76b2746ec02..5baf92d455d 100644 --- a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-11.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-11.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-12.0/gradle.lockfile b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-12.0/gradle.lockfile index 7653a6eee40..f313a171e02 100644 --- a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-12.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-12.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/websphere-jmx-8.5/gradle.lockfile b/dd-java-agent/instrumentation/websphere-jmx-8.5/gradle.lockfile index 4564a4c5915..d1add566eab 100644 --- a/dd-java-agent/instrumentation/websphere-jmx-8.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/websphere-jmx-8.5/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/wildfly-9.0/gradle.lockfile b/dd-java-agent/instrumentation/wildfly-9.0/gradle.lockfile index 544f8ea0b21..c634c4c47b3 100644 --- a/dd-java-agent/instrumentation/wildfly-9.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/wildfly-9.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedT com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.googlecode.javaewah:JavaEWAH:1.2.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/ws/jakarta-ws-annotations-3.0/gradle.lockfile b/dd-java-agent/instrumentation/ws/jakarta-ws-annotations-3.0/gradle.lockfile index 7c2ec025690..d948d6fb682 100644 --- a/dd-java-agent/instrumentation/ws/jakarta-ws-annotations-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/ws/jakarta-ws-annotations-3.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-1.1/gradle.lockfile b/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-1.1/gradle.lockfile index 41462d23b46..791b4012446 100644 --- a/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-1.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-1.1/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-2.0/gradle.lockfile b/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-2.0/gradle.lockfile index 33c96f3ec50..108927b9922 100644 --- a/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-2.0/gradle.lockfile @@ -37,7 +37,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/zio/zio-2.0/gradle.lockfile b/dd-java-agent/instrumentation/zio/zio-2.0/gradle.lockfile index c74e11794d3..255dff72e76 100644 --- a/dd-java-agent/instrumentation/zio/zio-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/zio/zio-2.0/gradle.lockfile @@ -41,7 +41,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/apm-tracing-disabled/gradle.lockfile b/dd-smoke-tests/apm-tracing-disabled/gradle.lockfile index 1da555f7013..8e09dd6285e 100644 --- a/dd-smoke-tests/apm-tracing-disabled/gradle.lockfile +++ b/dd-smoke-tests/apm-tracing-disabled/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/appsec/gradle.lockfile b/dd-smoke-tests/appsec/gradle.lockfile index 19d0e7db391..6da92add6f8 100644 --- a/dd-smoke-tests/appsec/gradle.lockfile +++ b/dd-smoke-tests/appsec/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=runtimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=runtimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/appsec/spring-tomcat7/gradle.lockfile b/dd-smoke-tests/appsec/spring-tomcat7/gradle.lockfile index 8479190bbf5..46520d69e37 100644 --- a/dd-smoke-tests/appsec/spring-tomcat7/gradle.lockfile +++ b/dd-smoke-tests/appsec/spring-tomcat7/gradle.lockfile @@ -30,7 +30,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/appsec/springboot-graphql/gradle.lockfile b/dd-smoke-tests/appsec/springboot-graphql/gradle.lockfile index ba2bb6d3ba8..1b84de5c4da 100644 --- a/dd-smoke-tests/appsec/springboot-graphql/gradle.lockfile +++ b/dd-smoke-tests/appsec/springboot-graphql/gradle.lockfile @@ -38,7 +38,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.graphql-java:graphql-java:18.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.graphql-java:java-dataloader:3.1.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/appsec/springboot-grpc/gradle.lockfile b/dd-smoke-tests/appsec/springboot-grpc/gradle.lockfile index f25d2eebee5..23ced86fcb5 100644 --- a/dd-smoke-tests/appsec/springboot-grpc/gradle.lockfile +++ b/dd-smoke-tests/appsec/springboot-grpc/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/appsec/springboot-security/gradle.lockfile b/dd-smoke-tests/appsec/springboot-security/gradle.lockfile index 9438a339d37..c2c6d475298 100644 --- a/dd-smoke-tests/appsec/springboot-security/gradle.lockfile +++ b/dd-smoke-tests/appsec/springboot-security/gradle.lockfile @@ -38,7 +38,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.h2database:h2:2.1.212=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.5.0=testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/appsec/springboot/gradle.lockfile b/dd-smoke-tests/appsec/springboot/gradle.lockfile index a7b3ad59259..0721078c813 100644 --- a/dd-smoke-tests/appsec/springboot/gradle.lockfile +++ b/dd-smoke-tests/appsec/springboot/gradle.lockfile @@ -38,7 +38,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.h2database:h2:2.1.212=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/armeria-grpc/gradle.lockfile b/dd-smoke-tests/armeria-grpc/gradle.lockfile index 2c9330c0e99..5b3a1dace82 100644 --- a/dd-smoke-tests/armeria-grpc/gradle.lockfile +++ b/dd-smoke-tests/armeria-grpc/gradle.lockfile @@ -38,7 +38,7 @@ com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=comp com.google.j2objc:j2objc-annotations:1.3=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.google.protobuf:protobuf-java:3.22.3=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.google.protobuf:protoc:3.22.3=protobufToolsLocator_protoc -com.google.re2j:re2j:1.7=testCompileProtoPath,testRuntimeClasspath +com.google.re2j:re2j:1.8=testCompileProtoPath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath diff --git a/dd-smoke-tests/backend-mock/gradle.lockfile b/dd-smoke-tests/backend-mock/gradle.lockfile index d37a8d46388..d4db288c66c 100644 --- a/dd-smoke-tests/backend-mock/gradle.lockfile +++ b/dd-smoke-tests/backend-mock/gradle.lockfile @@ -33,7 +33,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=runtimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=runtimeClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.8.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/cli/gradle.lockfile b/dd-smoke-tests/cli/gradle.lockfile index b6e7a858bc2..41347104f9b 100644 --- a/dd-smoke-tests/cli/gradle.lockfile +++ b/dd-smoke-tests/cli/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/concurrent/java-21/gradle.lockfile b/dd-smoke-tests/concurrent/java-21/gradle.lockfile index b9f8e9e9857..f2b2dc6fc9b 100644 --- a/dd-smoke-tests/concurrent/java-21/gradle.lockfile +++ b/dd-smoke-tests/concurrent/java-21/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/concurrent/java-25/gradle.lockfile b/dd-smoke-tests/concurrent/java-25/gradle.lockfile index e8c07371f81..347071a64ef 100644 --- a/dd-smoke-tests/concurrent/java-25/gradle.lockfile +++ b/dd-smoke-tests/concurrent/java-25/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/concurrent/java-8/gradle.lockfile b/dd-smoke-tests/concurrent/java-8/gradle.lockfile index 55ad0cfb2c9..2ec1ccd1542 100644 --- a/dd-smoke-tests/concurrent/java-8/gradle.lockfile +++ b/dd-smoke-tests/concurrent/java-8/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/crashtracking/gradle.lockfile b/dd-smoke-tests/crashtracking/gradle.lockfile index b3473b684e7..4f7ca1fdf76 100644 --- a/dd-smoke-tests/crashtracking/gradle.lockfile +++ b/dd-smoke-tests/crashtracking/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:mockwebserver:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/custom-systemloader/gradle.lockfile b/dd-smoke-tests/custom-systemloader/gradle.lockfile index 701f8238eb9..1102e29c73a 100644 --- a/dd-smoke-tests/custom-systemloader/gradle.lockfile +++ b/dd-smoke-tests/custom-systemloader/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/debugger-integration-tests/gradle.lockfile b/dd-smoke-tests/debugger-integration-tests/gradle.lockfile index 5c1e7f504df..c3fd4d672ae 100644 --- a/dd-smoke-tests/debugger-integration-tests/gradle.lockfile +++ b/dd-smoke-tests/debugger-integration-tests/gradle.lockfile @@ -37,7 +37,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:mockwebserver:3.12.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/dynamic-config/gradle.lockfile b/dd-smoke-tests/dynamic-config/gradle.lockfile index 3f4ad6c3501..2b02ed13d79 100644 --- a/dd-smoke-tests/dynamic-config/gradle.lockfile +++ b/dd-smoke-tests/dynamic-config/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/field-injection/gradle.lockfile b/dd-smoke-tests/field-injection/gradle.lockfile index b4940818449..94be84bbfd2 100644 --- a/dd-smoke-tests/field-injection/gradle.lockfile +++ b/dd-smoke-tests/field-injection/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/gradle.lockfile b/dd-smoke-tests/gradle.lockfile index 0e1ca9316d9..2124e5fb238 100644 --- a/dd-smoke-tests/gradle.lockfile +++ b/dd-smoke-tests/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=runtimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=runtimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/gradle/gradle.lockfile b/dd-smoke-tests/gradle/gradle.lockfile index ada3bd99d0b..c111ec8a928 100644 --- a/dd-smoke-tests/gradle/gradle.lockfile +++ b/dd-smoke-tests/gradle/gradle.lockfile @@ -33,7 +33,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.jayway.jsonpath:json-path:2.8.0=testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/grpc-1.5/gradle.lockfile b/dd-smoke-tests/grpc-1.5/gradle.lockfile index 2dcb11e1a12..122e6d76bf3 100644 --- a/dd-smoke-tests/grpc-1.5/gradle.lockfile +++ b/dd-smoke-tests/grpc-1.5/gradle.lockfile @@ -44,7 +44,8 @@ com.google.j2objc:j2objc-annotations:2.8=compileClasspath,compileProtoPath,runti com.google.protobuf:protobuf-java-util:3.24.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.protobuf:protobuf-java:3.24.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.protobuf:protoc:3.24.0=protobufToolsLocator_protoc -com.google.re2j:re2j:1.7=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.7=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath +com.google.re2j:re2j:1.8=testCompileProtoPath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath diff --git a/dd-smoke-tests/iast-propagation/gradle.lockfile b/dd-smoke-tests/iast-propagation/gradle.lockfile index 71057fe16ab..17ed808a681 100644 --- a/dd-smoke-tests/iast-propagation/gradle.lockfile +++ b/dd-smoke-tests/iast-propagation/gradle.lockfile @@ -42,7 +42,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,compileOnlyDependenciesMe com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath diff --git a/dd-smoke-tests/iast-util/gradle.lockfile b/dd-smoke-tests/iast-util/gradle.lockfile index ac0d36d444b..bdbc3d1bd49 100644 --- a/dd-smoke-tests/iast-util/gradle.lockfile +++ b/dd-smoke-tests/iast-util/gradle.lockfile @@ -34,7 +34,7 @@ com.google.code.gson:gson:2.10=compileClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/iast-util/iast-util-11/gradle.lockfile b/dd-smoke-tests/iast-util/iast-util-11/gradle.lockfile index c04de1f9c28..0b7f1de2fa0 100644 --- a/dd-smoke-tests/iast-util/iast-util-11/gradle.lockfile +++ b/dd-smoke-tests/iast-util/iast-util-11/gradle.lockfile @@ -36,7 +36,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/iast-util/iast-util-17/gradle.lockfile b/dd-smoke-tests/iast-util/iast-util-17/gradle.lockfile index e8480656f44..b19e297d644 100644 --- a/dd-smoke-tests/iast-util/iast-util-17/gradle.lockfile +++ b/dd-smoke-tests/iast-util/iast-util-17/gradle.lockfile @@ -37,7 +37,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/java9-modules/gradle.lockfile b/dd-smoke-tests/java9-modules/gradle.lockfile index 4a01ecee187..5bf8254ee3d 100644 --- a/dd-smoke-tests/java9-modules/gradle.lockfile +++ b/dd-smoke-tests/java9-modules/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/jboss-modules/gradle.lockfile b/dd-smoke-tests/jboss-modules/gradle.lockfile index 47926501b94..2622584725a 100644 --- a/dd-smoke-tests/jboss-modules/gradle.lockfile +++ b/dd-smoke-tests/jboss-modules/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/jdk-tool-abort/gradle.lockfile b/dd-smoke-tests/jdk-tool-abort/gradle.lockfile index c6e3b36c9fc..fcae27f11dc 100644 --- a/dd-smoke-tests/jdk-tool-abort/gradle.lockfile +++ b/dd-smoke-tests/jdk-tool-abort/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/jersey-2/gradle.lockfile b/dd-smoke-tests/jersey-2/gradle.lockfile index 4f236a665f5..8de6eaf361e 100644 --- a/dd-smoke-tests/jersey-2/gradle.lockfile +++ b/dd-smoke-tests/jersey-2/gradle.lockfile @@ -30,7 +30,7 @@ com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:14.0.1=compileClasspath,runtimeClasspath,testFixturesRuntimeClasspath com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/jersey-3/gradle.lockfile b/dd-smoke-tests/jersey-3/gradle.lockfile index ec1e84a49e1..1f769d46bef 100644 --- a/dd-smoke-tests/jersey-3/gradle.lockfile +++ b/dd-smoke-tests/jersey-3/gradle.lockfile @@ -34,7 +34,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/junit-console/gradle.lockfile b/dd-smoke-tests/junit-console/gradle.lockfile index 31879bafc9b..5887f8a62a9 100644 --- a/dd-smoke-tests/junit-console/gradle.lockfile +++ b/dd-smoke-tests/junit-console/gradle.lockfile @@ -33,7 +33,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.jayway.jsonpath:json-path:2.8.0=testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/kafka-2/gradle.lockfile b/dd-smoke-tests/kafka-2/gradle.lockfile index 0ad1806c773..66a22568b47 100644 --- a/dd-smoke-tests/kafka-2/gradle.lockfile +++ b/dd-smoke-tests/kafka-2/gradle.lockfile @@ -37,7 +37,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/kafka-3/gradle.lockfile b/dd-smoke-tests/kafka-3/gradle.lockfile index 811393994aa..3f4d04ed63f 100644 --- a/dd-smoke-tests/kafka-3/gradle.lockfile +++ b/dd-smoke-tests/kafka-3/gradle.lockfile @@ -37,7 +37,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/lib-injection/gradle.lockfile b/dd-smoke-tests/lib-injection/gradle.lockfile index a171db45193..4d2ab5e997d 100644 --- a/dd-smoke-tests/lib-injection/gradle.lockfile +++ b/dd-smoke-tests/lib-injection/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/log-injection/gradle.lockfile b/dd-smoke-tests/log-injection/gradle.lockfile index 85371d1c839..3fbb8e42a16 100644 --- a/dd-smoke-tests/log-injection/gradle.lockfile +++ b/dd-smoke-tests/log-injection/gradle.lockfile @@ -47,7 +47,7 @@ com.google.flogger:flogger-slf4j-backend:0.5.1=floggerSlf4jBackend com.google.flogger:flogger-system-backend:0.5.1=floggerJULBackend,floggerSlf4jBackend com.google.flogger:flogger:0.5.1=compileClasspath,floggerInterface,floggerJULBackend,floggerSlf4jBackend com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.jayway.jsonpath:json-path:2.8.0=testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/maven/gradle.lockfile b/dd-smoke-tests/maven/gradle.lockfile index 553a09f161c..c69c295a1f1 100644 --- a/dd-smoke-tests/maven/gradle.lockfile +++ b/dd-smoke-tests/maven/gradle.lockfile @@ -33,7 +33,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.jayway.jsonpath:json-path:2.8.0=testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/openfeature/gradle.lockfile b/dd-smoke-tests/openfeature/gradle.lockfile index 18b650fcb57..4cf130afffc 100644 --- a/dd-smoke-tests/openfeature/gradle.lockfile +++ b/dd-smoke-tests/openfeature/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/opentelemetry/gradle.lockfile b/dd-smoke-tests/opentelemetry/gradle.lockfile index 725879ed0d3..71b21d626ca 100644 --- a/dd-smoke-tests/opentelemetry/gradle.lockfile +++ b/dd-smoke-tests/opentelemetry/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/opentracing/gradle.lockfile b/dd-smoke-tests/opentracing/gradle.lockfile index cf7ac837eda..77d9aaa89fd 100644 --- a/dd-smoke-tests/opentracing/gradle.lockfile +++ b/dd-smoke-tests/opentracing/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/osgi/gradle.lockfile b/dd-smoke-tests/osgi/gradle.lockfile index 8fd5d9fba25..15c09e4166c 100644 --- a/dd-smoke-tests/osgi/gradle.lockfile +++ b/dd-smoke-tests/osgi/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=bundles,compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/play-2.4/gradle.lockfile b/dd-smoke-tests/play-2.4/gradle.lockfile index 8412b789240..a330265f443 100644 --- a/dd-smoke-tests/play-2.4/gradle.lockfile +++ b/dd-smoke-tests/play-2.4/gradle.lockfile @@ -52,7 +52,7 @@ com.google.inject:guice:4.0=compileClasspath,play,runtimeClasspath,testCompileCl com.google.javascript:closure-compiler-externs:v20141215=javaScriptCompiler com.google.javascript:closure-compiler:v20141215=javaScriptCompiler com.google.protobuf:protobuf-java:2.5.0=javaScriptCompiler -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.ning:async-http-client:1.9.40=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/play-2.5/gradle.lockfile b/dd-smoke-tests/play-2.5/gradle.lockfile index 41939716188..cfde32ba928 100644 --- a/dd-smoke-tests/play-2.5/gradle.lockfile +++ b/dd-smoke-tests/play-2.5/gradle.lockfile @@ -53,7 +53,7 @@ com.google.inject:guice:4.0=compileClasspath,play,runtimeClasspath,testCompileCl com.google.javascript:closure-compiler-externs:v20141215=javaScriptCompiler com.google.javascript:closure-compiler:v20141215=javaScriptCompiler com.google.protobuf:protobuf-java:2.5.0=javaScriptCompiler -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/play-2.6/gradle.lockfile b/dd-smoke-tests/play-2.6/gradle.lockfile index 7f1a08dae80..f1c99288cd2 100644 --- a/dd-smoke-tests/play-2.6/gradle.lockfile +++ b/dd-smoke-tests/play-2.6/gradle.lockfile @@ -53,7 +53,7 @@ com.google.j2objc:j2objc-annotations:1.1=compileClasspath,play,runtimeClasspath, com.google.javascript:closure-compiler-externs:v20141215=javaScriptCompiler com.google.javascript:closure-compiler:v20141215=javaScriptCompiler com.google.protobuf:protobuf-java:2.5.0=javaScriptCompiler -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/play-2.7/gradle.lockfile b/dd-smoke-tests/play-2.7/gradle.lockfile index 85c949b5248..ac58d3d2402 100644 --- a/dd-smoke-tests/play-2.7/gradle.lockfile +++ b/dd-smoke-tests/play-2.7/gradle.lockfile @@ -55,7 +55,7 @@ com.google.j2objc:j2objc-annotations:1.1=compileClasspath,play,runtimeClasspath, com.google.javascript:closure-compiler-externs:v20141215=javaScriptCompiler com.google.javascript:closure-compiler:v20141215=javaScriptCompiler com.google.protobuf:protobuf-java:2.5.0=javaScriptCompiler -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/play-2.8-otel/gradle.lockfile b/dd-smoke-tests/play-2.8-otel/gradle.lockfile index f5a9246bd80..9641dddff55 100644 --- a/dd-smoke-tests/play-2.8-otel/gradle.lockfile +++ b/dd-smoke-tests/play-2.8-otel/gradle.lockfile @@ -59,7 +59,7 @@ com.google.j2objc:j2objc-annotations:1.3=compileClasspath,play,runtimeClasspath, com.google.javascript:closure-compiler-externs:v20141215=javaScriptCompiler com.google.javascript:closure-compiler:v20141215=javaScriptCompiler com.google.protobuf:protobuf-java:2.5.0=javaScriptCompiler -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/play-2.8-split-routes/gradle.lockfile b/dd-smoke-tests/play-2.8-split-routes/gradle.lockfile index 3ed13368fdb..4e8d0d9892e 100644 --- a/dd-smoke-tests/play-2.8-split-routes/gradle.lockfile +++ b/dd-smoke-tests/play-2.8-split-routes/gradle.lockfile @@ -59,7 +59,7 @@ com.google.j2objc:j2objc-annotations:1.3=compileClasspath,play,runtimeClasspath, com.google.javascript:closure-compiler-externs:v20141215=javaScriptCompiler com.google.javascript:closure-compiler:v20141215=javaScriptCompiler com.google.protobuf:protobuf-java:2.5.0=javaScriptCompiler -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/play-2.8/gradle.lockfile b/dd-smoke-tests/play-2.8/gradle.lockfile index 9edb1bea4e4..4b40fbd075b 100644 --- a/dd-smoke-tests/play-2.8/gradle.lockfile +++ b/dd-smoke-tests/play-2.8/gradle.lockfile @@ -59,7 +59,7 @@ com.google.j2objc:j2objc-annotations:1.3=compileClasspath,play,runtimeClasspath, com.google.javascript:closure-compiler-externs:v20141215=javaScriptCompiler com.google.javascript:closure-compiler:v20141215=javaScriptCompiler com.google.protobuf:protobuf-java:2.5.0=javaScriptCompiler -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/profiling-integration-tests/gradle.lockfile b/dd-smoke-tests/profiling-integration-tests/gradle.lockfile index 4351f9576ce..ebece392384 100644 --- a/dd-smoke-tests/profiling-integration-tests/gradle.lockfile +++ b/dd-smoke-tests/profiling-integration-tests/gradle.lockfile @@ -34,7 +34,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=runtimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=runtimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:mockwebserver:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/quarkus-native/gradle.lockfile b/dd-smoke-tests/quarkus-native/gradle.lockfile index 29a3e8ec0d3..bd48b4e8b28 100644 --- a/dd-smoke-tests/quarkus-native/gradle.lockfile +++ b/dd-smoke-tests/quarkus-native/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/quarkus/gradle.lockfile b/dd-smoke-tests/quarkus/gradle.lockfile index 18a85e58269..c5824d95fda 100644 --- a/dd-smoke-tests/quarkus/gradle.lockfile +++ b/dd-smoke-tests/quarkus/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/ratpack-1.5/gradle.lockfile b/dd-smoke-tests/ratpack-1.5/gradle.lockfile index c58f8dc1f30..7298f4680ea 100644 --- a/dd-smoke-tests/ratpack-1.5/gradle.lockfile +++ b/dd-smoke-tests/ratpack-1.5/gradle.lockfile @@ -37,7 +37,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:21.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/resteasy/gradle.lockfile b/dd-smoke-tests/resteasy/gradle.lockfile index 71578570e6c..dc3fc5ff02e 100644 --- a/dd-smoke-tests/resteasy/gradle.lockfile +++ b/dd-smoke-tests/resteasy/gradle.lockfile @@ -35,7 +35,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/rum/gradle.lockfile b/dd-smoke-tests/rum/gradle.lockfile index db6bacb5d2f..14a42cc1a6d 100644 --- a/dd-smoke-tests/rum/gradle.lockfile +++ b/dd-smoke-tests/rum/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=runtimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=runtimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/rum/tomcat-10/gradle.lockfile b/dd-smoke-tests/rum/tomcat-10/gradle.lockfile index 772b2510a8c..68f8f3eaf4d 100644 --- a/dd-smoke-tests/rum/tomcat-10/gradle.lockfile +++ b/dd-smoke-tests/rum/tomcat-10/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/rum/tomcat-11/gradle.lockfile b/dd-smoke-tests/rum/tomcat-11/gradle.lockfile index 81465c9eb5d..1921b36e17b 100644 --- a/dd-smoke-tests/rum/tomcat-11/gradle.lockfile +++ b/dd-smoke-tests/rum/tomcat-11/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/rum/tomcat-9/gradle.lockfile b/dd-smoke-tests/rum/tomcat-9/gradle.lockfile index 20279e0524d..1dd42b181f5 100644 --- a/dd-smoke-tests/rum/tomcat-9/gradle.lockfile +++ b/dd-smoke-tests/rum/tomcat-9/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/rum/wildfly-15/gradle.lockfile b/dd-smoke-tests/rum/wildfly-15/gradle.lockfile index b32ba3910bd..e92fd13269d 100644 --- a/dd-smoke-tests/rum/wildfly-15/gradle.lockfile +++ b/dd-smoke-tests/rum/wildfly-15/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/sample-trace/gradle.lockfile b/dd-smoke-tests/sample-trace/gradle.lockfile index 0b673dc7e47..587018c8da8 100644 --- a/dd-smoke-tests/sample-trace/gradle.lockfile +++ b/dd-smoke-tests/sample-trace/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/spring-boot-2.3-webmvc-jetty/gradle.lockfile b/dd-smoke-tests/spring-boot-2.3-webmvc-jetty/gradle.lockfile index 41380c2ba59..6a8654ebbb5 100644 --- a/dd-smoke-tests/spring-boot-2.3-webmvc-jetty/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-2.3-webmvc-jetty/gradle.lockfile @@ -37,7 +37,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.14.9=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.14.9=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/spring-boot-2.4-webflux/gradle.lockfile b/dd-smoke-tests/spring-boot-2.4-webflux/gradle.lockfile index bd7e6dcb37b..4dfbb0a476e 100644 --- a/dd-smoke-tests/spring-boot-2.4-webflux/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-2.4-webflux/gradle.lockfile @@ -37,7 +37,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/spring-boot-2.5-webflux/gradle.lockfile b/dd-smoke-tests/spring-boot-2.5-webflux/gradle.lockfile index dffd0985e7c..8776dd4e956 100644 --- a/dd-smoke-tests/spring-boot-2.5-webflux/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-2.5-webflux/gradle.lockfile @@ -38,7 +38,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/spring-boot-2.6-webflux/gradle.lockfile b/dd-smoke-tests/spring-boot-2.6-webflux/gradle.lockfile index 9632a1192ad..72174c57afb 100644 --- a/dd-smoke-tests/spring-boot-2.6-webflux/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-2.6-webflux/gradle.lockfile @@ -40,7 +40,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.h2database:h2:2.1.214=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/spring-boot-2.6-webmvc/gradle.lockfile b/dd-smoke-tests/spring-boot-2.6-webmvc/gradle.lockfile index 1b24c4dc130..1ebac6665d6 100644 --- a/dd-smoke-tests/spring-boot-2.6-webmvc/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-2.6-webmvc/gradle.lockfile @@ -39,7 +39,7 @@ com.google.code.gson:gson:2.10=compileClasspath,runtimeClasspath,testCompileClas com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.h2database:h2:2.1.214=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/spring-boot-2.7-webflux/gradle.lockfile b/dd-smoke-tests/spring-boot-2.7-webflux/gradle.lockfile index f2f62d305e1..f28fdf4e3d2 100644 --- a/dd-smoke-tests/spring-boot-2.7-webflux/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-2.7-webflux/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/spring-boot-3.0-native/gradle.lockfile b/dd-smoke-tests/spring-boot-3.0-native/gradle.lockfile index 5e14871f3f9..fa1651516f0 100644 --- a/dd-smoke-tests/spring-boot-3.0-native/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-3.0-native/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/spring-boot-3.0-webflux/gradle.lockfile b/dd-smoke-tests/spring-boot-3.0-webflux/gradle.lockfile index 4a65034a835..7d6029f955d 100644 --- a/dd-smoke-tests/spring-boot-3.0-webflux/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-3.0-webflux/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/spring-boot-3.0-webmvc/gradle.lockfile b/dd-smoke-tests/spring-boot-3.0-webmvc/gradle.lockfile index b3b1ff02dd2..3f4232c6473 100644 --- a/dd-smoke-tests/spring-boot-3.0-webmvc/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-3.0-webmvc/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/spring-boot-3.3-webmvc/gradle.lockfile b/dd-smoke-tests/spring-boot-3.3-webmvc/gradle.lockfile index a2f357e2088..6b6d45a6909 100644 --- a/dd-smoke-tests/spring-boot-3.3-webmvc/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-3.3-webmvc/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/spring-boot-rabbit/gradle.lockfile b/dd-smoke-tests/spring-boot-rabbit/gradle.lockfile index 3f6fc01ea72..3587f9c4597 100644 --- a/dd-smoke-tests/spring-boot-rabbit/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-rabbit/gradle.lockfile @@ -41,7 +41,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.rabbitmq:amqp-client:5.9.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/spring-security/gradle.lockfile b/dd-smoke-tests/spring-security/gradle.lockfile index eec2fde191e..c77b67821da 100644 --- a/dd-smoke-tests/spring-security/gradle.lockfile +++ b/dd-smoke-tests/spring-security/gradle.lockfile @@ -36,7 +36,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.nimbusds:nimbus-jose-jwt:9.24.4=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-freemarker/gradle.lockfile b/dd-smoke-tests/springboot-freemarker/gradle.lockfile index 5153424d7be..c4a9c907ca0 100644 --- a/dd-smoke-tests/springboot-freemarker/gradle.lockfile +++ b/dd-smoke-tests/springboot-freemarker/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-java-11/gradle.lockfile b/dd-smoke-tests/springboot-java-11/gradle.lockfile index dc0ce10be77..1a5bb7a663b 100644 --- a/dd-smoke-tests/springboot-java-11/gradle.lockfile +++ b/dd-smoke-tests/springboot-java-11/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-java-17/gradle.lockfile b/dd-smoke-tests/springboot-java-17/gradle.lockfile index c5cef077ac3..36d1b30d325 100644 --- a/dd-smoke-tests/springboot-java-17/gradle.lockfile +++ b/dd-smoke-tests/springboot-java-17/gradle.lockfile @@ -30,7 +30,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-jetty-jsp/gradle.lockfile b/dd-smoke-tests/springboot-jetty-jsp/gradle.lockfile index 00cac933587..6d72d72eb9a 100644 --- a/dd-smoke-tests/springboot-jetty-jsp/gradle.lockfile +++ b/dd-smoke-tests/springboot-jetty-jsp/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-jpa/gradle.lockfile b/dd-smoke-tests/springboot-jpa/gradle.lockfile index 940d0c9dd39..53f5ba632dd 100644 --- a/dd-smoke-tests/springboot-jpa/gradle.lockfile +++ b/dd-smoke-tests/springboot-jpa/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-mongo/gradle.lockfile b/dd-smoke-tests/springboot-mongo/gradle.lockfile index ee714d72539..6ca1d9cd1c9 100644 --- a/dd-smoke-tests/springboot-mongo/gradle.lockfile +++ b/dd-smoke-tests/springboot-mongo/gradle.lockfile @@ -40,7 +40,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-openliberty-20/gradle.lockfile b/dd-smoke-tests/springboot-openliberty-20/gradle.lockfile index ccb7546370a..fc24a5a83e0 100644 --- a/dd-smoke-tests/springboot-openliberty-20/gradle.lockfile +++ b/dd-smoke-tests/springboot-openliberty-20/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-openliberty-23/gradle.lockfile b/dd-smoke-tests/springboot-openliberty-23/gradle.lockfile index b4c81cc75d6..533b24e734c 100644 --- a/dd-smoke-tests/springboot-openliberty-23/gradle.lockfile +++ b/dd-smoke-tests/springboot-openliberty-23/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-thymeleaf/gradle.lockfile b/dd-smoke-tests/springboot-thymeleaf/gradle.lockfile index b5824549e67..a270ce5bed1 100644 --- a/dd-smoke-tests/springboot-thymeleaf/gradle.lockfile +++ b/dd-smoke-tests/springboot-thymeleaf/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-tomcat-jsp/gradle.lockfile b/dd-smoke-tests/springboot-tomcat-jsp/gradle.lockfile index 294b0d8b699..ca2d6ff0dee 100644 --- a/dd-smoke-tests/springboot-tomcat-jsp/gradle.lockfile +++ b/dd-smoke-tests/springboot-tomcat-jsp/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-tomcat/gradle.lockfile b/dd-smoke-tests/springboot-tomcat/gradle.lockfile index e4e99c01463..9d3f20af65c 100644 --- a/dd-smoke-tests/springboot-tomcat/gradle.lockfile +++ b/dd-smoke-tests/springboot-tomcat/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-velocity/gradle.lockfile b/dd-smoke-tests/springboot-velocity/gradle.lockfile index 85f15196b4d..c7fc0f3645d 100644 --- a/dd-smoke-tests/springboot-velocity/gradle.lockfile +++ b/dd-smoke-tests/springboot-velocity/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot/gradle.lockfile b/dd-smoke-tests/springboot/gradle.lockfile index 3a74e8d2f20..3fd8bf2440f 100644 --- a/dd-smoke-tests/springboot/gradle.lockfile +++ b/dd-smoke-tests/springboot/gradle.lockfile @@ -45,7 +45,7 @@ com.google.guava:guava:20.0=compileClasspath,testCompileClasspath com.google.guava:guava:30.0-jre=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:1.3=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.nimbusds:nimbus-jose-jwt:9.22=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/tracer-flare/gradle.lockfile b/dd-smoke-tests/tracer-flare/gradle.lockfile index 04bb791f08c..11f148e5f29 100644 --- a/dd-smoke-tests/tracer-flare/gradle.lockfile +++ b/dd-smoke-tests/tracer-flare/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/vertx-3.4/gradle.lockfile b/dd-smoke-tests/vertx-3.4/gradle.lockfile index d804236c433..29e145f485e 100644 --- a/dd-smoke-tests/vertx-3.4/gradle.lockfile +++ b/dd-smoke-tests/vertx-3.4/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/vertx-3.9-resteasy/gradle.lockfile b/dd-smoke-tests/vertx-3.9-resteasy/gradle.lockfile index 159c660459a..ebf26fac017 100644 --- a/dd-smoke-tests/vertx-3.9-resteasy/gradle.lockfile +++ b/dd-smoke-tests/vertx-3.9-resteasy/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/vertx-3.9/gradle.lockfile b/dd-smoke-tests/vertx-3.9/gradle.lockfile index 64831011f53..2fc08a8aaf0 100644 --- a/dd-smoke-tests/vertx-3.9/gradle.lockfile +++ b/dd-smoke-tests/vertx-3.9/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/vertx-4.2/gradle.lockfile b/dd-smoke-tests/vertx-4.2/gradle.lockfile index 6b82e54119f..dadc238c0ff 100644 --- a/dd-smoke-tests/vertx-4.2/gradle.lockfile +++ b/dd-smoke-tests/vertx-4.2/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/websphere-jmx/gradle.lockfile b/dd-smoke-tests/websphere-jmx/gradle.lockfile index 2f84321bba2..837dc64e3bd 100644 --- a/dd-smoke-tests/websphere-jmx/gradle.lockfile +++ b/dd-smoke-tests/websphere-jmx/gradle.lockfile @@ -33,7 +33,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/wildfly/gradle.lockfile b/dd-smoke-tests/wildfly/gradle.lockfile index ae0b2e06dc9..65270fc647a 100644 --- a/dd-smoke-tests/wildfly/gradle.lockfile +++ b/dd-smoke-tests/wildfly/gradle.lockfile @@ -29,7 +29,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.7=testRuntimeClasspath +com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath From c6f9664e077b4693e229f77e4dfbdb6dc2eb05d9 Mon Sep 17 00:00:00 2001 From: Douglas Q Hawkins Date: Wed, 24 Jun 2026 10:06:14 -0400 Subject: [PATCH 037/139] Remove LegacyTagMap; OptimizedTagMap is the sole TagMap implementation (#11678) Remove LegacyTagMap, its factory abstraction, and the trivial test enums With one implementor, the optimized/legacy split is dead weight. Delete LegacyTagMap and LegacyTagMapFactory; collapse the whole TagMapFactory abstraction (TagMap.create()/create(int)/EMPTY now construct OptimizedTagMap directly via a lazy EmptyHolder that avoids a TagMap<->OptimizedTagMap static-init cycle). OptimizedTagMap is the sole TagMap implementor, satisfying CHA's unique-implementor precondition. Delete the now-trivial TagMapType/TagMapTypePair test enums and de-parameterize their tests to plain @Test; TagMapScenario (size-based) stays. Drop stale "legacy and optimized" references from javadoc. Co-Authored-By: Claude Opus 4.8 Remove the dead optimized.map.enabled config flag The flag only chose between the optimized and legacy TagMap impls; with Legacy gone it controls nothing. Remove the Config field/getter, the GeneralConfig constant, and the metadata/supported-configurations.json entry. Per the Config team, removing the registry entry is detected automatically at the next release (FPD + public docs get a "Max Version: v1.xx.0" marker), so the hard delete is the correct process. Co-Authored-By: Claude Opus 4.8 Merge branch 'master' into dougqh/kill-legacy-tagmap Update internal-api/src/main/java/datadog/trace/api/TagMap.java Co-authored-by: Sarah Chen Co-authored-by: devflow.devflow-routing-intake --- .../trace/api/config/GeneralConfig.java | 1 - .../main/java/datadog/trace/api/Config.java | 6 - .../main/java/datadog/trace/api/TagMap.java | 525 +----------------- .../datadog/trace/api/TagMapLedgerTest.java | 49 -- .../datadog/trace/api/TagMapScenario.java | 17 +- .../java/datadog/trace/api/TagMapTest.java | 210 +++---- .../java/datadog/trace/api/TagMapType.java | 20 - .../datadog/trace/api/TagMapTypePair.java | 16 - metadata/supported-configurations.json | 8 - 9 files changed, 110 insertions(+), 742 deletions(-) delete mode 100644 internal-api/src/test/java/datadog/trace/api/TagMapType.java delete mode 100644 internal-api/src/test/java/datadog/trace/api/TagMapTypePair.java diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/GeneralConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/GeneralConfig.java index 60af53815fc..f6d9fd7e2ba 100644 --- a/dd-trace-api/src/main/java/datadog/trace/api/config/GeneralConfig.java +++ b/dd-trace-api/src/main/java/datadog/trace/api/config/GeneralConfig.java @@ -118,7 +118,6 @@ public final class GeneralConfig { public static final String APM_TRACING_ENABLED = "apm.tracing.enabled"; public static final String JDK_SOCKET_ENABLED = "jdk.socket.enabled"; - public static final String OPTIMIZED_MAP_ENABLED = "optimized.map.enabled"; public static final String TAG_NAME_UTF8_CACHE_SIZE = "tag.name.utf8.cache.size"; public static final String TAG_VALUE_UTF8_CACHE_SIZE = "tag.value.utf8.cache.size"; public static final String SPAN_BUILDER_REUSE_ENABLED = "span.builder.reuse.enabled"; diff --git a/internal-api/src/main/java/datadog/trace/api/Config.java b/internal-api/src/main/java/datadog/trace/api/Config.java index 306e072d27e..605d1fdfc45 100644 --- a/internal-api/src/main/java/datadog/trace/api/Config.java +++ b/internal-api/src/main/java/datadog/trace/api/Config.java @@ -1393,7 +1393,6 @@ public static String getHostName() { private final boolean jdkSocketEnabled; - private final boolean optimizedMapEnabled; private final boolean spanBuilderReuseEnabled; private final int tagNameUtf8CacheSize; private final int tagValueUtf8CacheSize; @@ -3247,7 +3246,6 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment()) this.jdkSocketEnabled = configProvider.getBoolean(JDK_SOCKET_ENABLED, true); - this.optimizedMapEnabled = configProvider.getBoolean(GeneralConfig.OPTIMIZED_MAP_ENABLED, true); this.spanBuilderReuseEnabled = configProvider.getBoolean(GeneralConfig.SPAN_BUILDER_REUSE_ENABLED, true); this.tagNameUtf8CacheSize = @@ -5072,10 +5070,6 @@ public boolean isJdkSocketEnabled() { return jdkSocketEnabled; } - public boolean isOptimizedMapEnabled() { - return optimizedMapEnabled; - } - public boolean isSpanBuilderReuseEnabled() { return spanBuilderReuseEnabled; } diff --git a/internal-api/src/main/java/datadog/trace/api/TagMap.java b/internal-api/src/main/java/datadog/trace/api/TagMap.java index 95f676245ef..7e65b590276 100644 --- a/internal-api/src/main/java/datadog/trace/api/TagMap.java +++ b/internal-api/src/main/java/datadog/trace/api/TagMap.java @@ -6,7 +6,6 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; -import java.util.HashMap; import java.util.Iterator; import java.util.Map; import java.util.NoSuchElementException; @@ -45,7 +44,7 @@ */ public interface TagMap extends Map, Iterable { /** Immutable empty TagMap - similar to {@link Collections#emptyMap()} */ - TagMap EMPTY = TagMapFactory.INSTANCE.empty(); + TagMap EMPTY = OptimizedTagMap.EmptyHolder.EMPTY; /** Creates a new mutable TagMap that contains the contents of map */ static TagMap fromMap(Map map) { @@ -64,11 +63,11 @@ static TagMap fromMapImmutable(Map map) { } static TagMap create() { - return TagMapFactory.INSTANCE.create(); + return new OptimizedTagMap(); } static TagMap create(int size) { - return TagMapFactory.INSTANCE.create(size); + return new OptimizedTagMap(); } /** Creates a new TagMap.Ledger */ @@ -145,12 +144,12 @@ static Ledger ledger(int size) { /** * Deprecated in favor of {@link TagMap#set} methods. set methods don't return the prior value and - * are implemented efficiently for both the legacy and optimized implementations of TagMap. + * are implemented more efficiently. */ @Deprecated Object put(String tag, Object value); - /** Sets value without returning prior value - optimal for legacy & optimized implementations */ + /** Sets value without returning prior value - more efficient than {@link Map#put} */ void set(String tag, Object value); /** @@ -209,15 +208,15 @@ static Ledger ledger(int size) { void fillStringMap(Map stringMap); /** - * Deprecated in favor of {@link TagMap#remove(String)} which returns a boolean and is efficiently - * implemented for both legacy and optimal TagMaps + * Deprecated in favor of {@link TagMap#remove(String)} which returns a boolean and is more + * efficiently implemented */ @Deprecated Object remove(Object tag); /** * Similar to {@link Map#remove(Object)} but doesn't return the prior value (orEntry). Preferred - * when prior value isn't needed - best for both legacy and optimal TagMaps + * when the prior value isn't needed */ boolean remove(String tag); @@ -1106,12 +1105,6 @@ public TagMap build() { return map; } - TagMap build(TagMapFactory mapFactory) { - TagMap map = mapFactory.create(this.estimateSize()); - fill(map); - return map; - } - void fill(TagMap map) { EntryChange[] entryChanges = this.entryChanges; int size = this.nextPos; @@ -1126,14 +1119,6 @@ void fill(TagMap map) { } } - TagMap buildImmutable(TagMapFactory mapFactory) { - if (this.nextPos == 0) { - return mapFactory.empty(); - } else { - return this.build(mapFactory).freeze(); - } - } - public TagMap buildImmutable() { if (this.nextPos == 0) { return TagMap.EMPTY; @@ -1170,67 +1155,6 @@ public EntryChange next() { } } -/* - * Using a class, so class hierarchy analysis kicks in - * That will allow all of the calls to create methods to be devirtualized without a guard - */ -abstract class TagMapFactory { - public static final TagMapFactory INSTANCE = - createFactory(Config.get().isOptimizedMapEnabled()); - - static final TagMapFactory createFactory(boolean useOptimized) { - return useOptimized ? OptimizedTagMapFactory.INSTANCE : LegacyTagMapFactory.INSTANCE; - } - - public abstract MapT create(); - - public abstract MapT create(int size); - - public abstract MapT empty(); -} - -final class OptimizedTagMapFactory extends TagMapFactory { - static final OptimizedTagMapFactory INSTANCE = new OptimizedTagMapFactory(); - - private OptimizedTagMapFactory() {} - - @Override - public OptimizedTagMap create() { - return new OptimizedTagMap(); - } - - @Override - public OptimizedTagMap create(int size) { - return new OptimizedTagMap(); - } - - @Override - public OptimizedTagMap empty() { - return OptimizedTagMap.EMPTY; - } -} - -final class LegacyTagMapFactory extends TagMapFactory { - static final LegacyTagMapFactory INSTANCE = new LegacyTagMapFactory(); - - private LegacyTagMapFactory() {} - - @Override - public LegacyTagMap create() { - return new LegacyTagMap(); - } - - @Override - public LegacyTagMap create(int size) { - return new LegacyTagMap(size); - } - - @Override - public LegacyTagMap empty() { - return LegacyTagMap.EMPTY; - } -} - /* * For memory efficiency, OptimizedTagMap uses a rather complicated bucket system. *

@@ -1251,10 +1175,17 @@ public LegacyTagMap empty() { * removed from the collision chain. */ final class OptimizedTagMap implements TagMap { - // Using special constructor that creates a frozen view of an existing array - // Bucket calculation requires that array length is a power of 2 - // e.g. size 0 will not work, it results in ArrayIndexOutOfBoundsException, but size 1 does - static final OptimizedTagMap EMPTY = new OptimizedTagMap(new Object[1], 0); + // Lazy holder so the shared empty map is built on first access via the constructor — + // never read as a still-null static during the TagMap <-> OptimizedTagMap class-init cycle. + // TagMap declares default methods, so initializing OptimizedTagMap forces TagMap init first, + // and TagMap's EMPTY constant reads back through the factory into here; deferring the build + // to a separate holder keeps that read from observing a half-initialized static. + static final class EmptyHolder { + // Using special constructor that creates a frozen view of an existing array. + // Bucket calculation requires that array length is a power of 2; size 0 fails with + // ArrayIndexOutOfBoundsException, but size 1 works. + static final OptimizedTagMap EMPTY = new OptimizedTagMap(new Object[1], 0); + } private final Object[] buckets; private int size; @@ -2837,424 +2768,6 @@ public Map.Entry mapEntry() { } } -final class LegacyTagMap extends HashMap implements TagMap { - private static final long serialVersionUID = 77473435283123683L; - - static final LegacyTagMap EMPTY = new LegacyTagMap().freeze(); - - private boolean frozen = false; - - LegacyTagMap() { - super(); - } - - LegacyTagMap(int capacity) { - super(capacity); - } - - LegacyTagMap(LegacyTagMap that) { - super(that); - } - - @Override - public boolean isOptimized() { - return false; - } - - @Override - public void clear() { - this.checkWriteAccess(); - - super.clear(); - } - - public LegacyTagMap freeze() { - this.frozen = true; - - return this; - } - - public boolean isFrozen() { - return this.frozen; - } - - public void checkWriteAccess() { - if (this.frozen) throw new IllegalStateException("TagMap frozen"); - } - - @Override - public TagMap copy() { - return new LegacyTagMap(this); - } - - @Override - public Iterator tagIterator() { - return this.keySet().iterator(); - } - - @Override - public Iterator valueIterator() { - return this.values().iterator(); - } - - @Override - public void fillMap(Map map) { - map.putAll(this); - } - - @Override - public void fillStringMap(Map stringMap) { - for (Map.Entry entry : this.entrySet()) { - stringMap.put(entry.getKey(), entry.getValue().toString()); - } - } - - @Override - public void forEach(Consumer consumer) { - EntryReadingHelper entryReadingHelper = new EntryReadingHelper(); - - for (Map.Entry entry : this.entrySet()) { - entryReadingHelper.set(entry); - - consumer.accept(entryReadingHelper); - } - } - - @Override - public void forEach(T thisObj, BiConsumer consumer) { - EntryReadingHelper entryReadingHelper = new EntryReadingHelper(); - - for (Map.Entry entry : this.entrySet()) { - entryReadingHelper.set(entry); - - consumer.accept(thisObj, entryReadingHelper); - } - } - - @Override - public void forEach( - T thisObj, U otherObj, TriConsumer consumer) { - EntryReadingHelper entryReadingHelper = new EntryReadingHelper(); - - for (Map.Entry entry : this.entrySet()) { - entryReadingHelper.set(entry); - - consumer.accept(thisObj, otherObj, entryReadingHelper); - } - } - - @Override - public TagMap.Entry getAndSet(String tag, Object value) { - Object prior = this.put(tag, value); - return prior == null ? null : TagMap.Entry.newAnyEntry(tag, prior); - } - - @Override - public TagMap.Entry getAndSet(String tag, CharSequence value) { - Object prior = this.put(tag, value); - return prior == null ? null : TagMap.Entry.newAnyEntry(tag, prior); - } - - @Override - public TagMap.Entry getAndSet(String tag, boolean value) { - return this.getAndSet(tag, Boolean.valueOf(value)); - } - - @Override - public TagMap.Entry getAndSet(String tag, double value) { - return this.getAndSet(tag, Double.valueOf(value)); - } - - @Override - public TagMap.Entry getAndSet(String tag, float value) { - return this.getAndSet(tag, Float.valueOf(value)); - } - - @Override - public TagMap.Entry getAndSet(String tag, int value) { - return this.getAndSet(tag, Integer.valueOf(value)); - } - - @Override - public TagMap.Entry getAndSet(String tag, long value) { - return this.getAndSet(tag, Long.valueOf(value)); - } - - @Override - public TagMap.Entry getAndSet(TagMap.Entry newEntry) { - return this.getAndSet(newEntry.tag(), newEntry.objectValue()); - } - - @Override - public TagMap.Entry getAndRemove(String tag) { - Object prior = this.remove((Object) tag); - return prior == null ? null : TagMap.Entry.newAnyEntry(tag, prior); - } - - @Override - public Object getObject(String tag) { - return this.get(tag); - } - - @Override - public boolean getBoolean(String tag) { - return this.getBooleanOrDefault(tag, false); - } - - @Override - public boolean getBooleanOrDefault(String tag, boolean defaultValue) { - Object result = this.get(tag); - if (result == null) { - return defaultValue; - } else if (result instanceof Boolean) { - return (Boolean) result; - } else if (result instanceof Number) { - Number number = (Number) result; - return (number.intValue() != 0); - } else { - // deliberately doesn't use defaultValue - return true; - } - } - - @Override - public double getDouble(String tag) { - return this.getDoubleOrDefault(tag, 0D); - } - - @Override - public double getDoubleOrDefault(String tag, double defaultValue) { - Object value = this.get(tag); - if (value == null) { - return defaultValue; - } else if (value instanceof Number) { - return ((Number) value).doubleValue(); - } else if (value instanceof Boolean) { - return ((Boolean) value) ? 1D : 0D; - } else { - // deliberately doesn't use defaultValue - return 0D; - } - } - - @Override - public long getLong(String tag) { - return this.getLongOrDefault(tag, 0L); - } - - public long getLongOrDefault(String tag, long defaultValue) { - Object value = this.get(tag); - if (value == null) { - return defaultValue; - } else if (value instanceof Number) { - return ((Number) value).longValue(); - } else if (value instanceof Boolean) { - return ((Boolean) value) ? 1L : 0L; - } else { - // deliberately doesn't use defaultValue - return 0L; - } - } - - @Override - public float getFloat(String tag) { - return this.getFloatOrDefault(tag, 0F); - } - - @Override - public float getFloatOrDefault(String tag, float defaultValue) { - Object value = this.get(tag); - if (value == null) { - return defaultValue; - } else if (value instanceof Number) { - return ((Number) value).floatValue(); - } else if (value instanceof Boolean) { - return ((Boolean) value) ? 1F : 0F; - } else { - // deliberately doesn't use defaultValue - return 0F; - } - } - - @Override - public int getInt(String tag) { - return this.getIntOrDefault(tag, 0); - } - - @Override - public int getIntOrDefault(String tag, int defaultValue) { - Object value = this.get(tag); - if (value == null) { - return defaultValue; - } else if (value instanceof Number) { - return ((Number) value).intValue(); - } else if (value instanceof Boolean) { - return ((Boolean) value) ? 1 : 0; - } else { - // deliberately doesn't use defaultValue - return 0; - } - } - - @Override - public String getString(String tag) { - Object value = this.get(tag); - return value == null ? null : value.toString(); - } - - @Override - public TagMap.Entry getEntry(String tag) { - Object value = this.get(tag); - return value == null ? null : TagMap.Entry.newAnyEntry(tag, value); - } - - @Override - public void set(String tag, boolean value) { - this.put(tag, Boolean.valueOf(value)); - } - - @Override - public void set(String tag, CharSequence value) { - this.put(tag, value); - } - - @Override - public void set(String tag, double value) { - this.put(tag, Double.valueOf(value)); - } - - @Override - public void set(String tag, float value) { - this.put(tag, Float.valueOf(value)); - } - - @Override - public void set(String tag, int value) { - this.put(tag, Integer.valueOf(value)); - } - - @Override - public void set(String tag, long value) { - this.put(tag, Long.valueOf(value)); - } - - @Override - public void set(String tag, Object value) { - this.put(tag, value); - } - - @Override - public void set(TagMap.EntryReader newEntryReader) { - this.put(newEntryReader.tag(), newEntryReader.objectValue()); - } - - @Override - public Object put(String key, Object value) { - this.checkWriteAccess(); - - return super.put(key, value); - } - - @Override - public void putAll(Map m) { - this.checkWriteAccess(); - - super.putAll(m); - } - - @Override - public void putAll(TagMap that) { - this.putAll((Map) that); - } - - @Override - public Object remove(Object key) { - this.checkWriteAccess(); - - return super.remove(key); - } - - @Override - public boolean remove(Object key, Object value) { - this.checkWriteAccess(); - - return super.remove(key, value); - } - - @Override - public boolean remove(String tag) { - this.checkWriteAccess(); - - return (super.remove(tag) != null); - } - - @Override - public Object compute( - String key, BiFunction remappingFunction) { - this.checkWriteAccess(); - - return super.compute(key, remappingFunction); - } - - @Override - public Object computeIfAbsent( - String key, Function mappingFunction) { - this.checkWriteAccess(); - - return super.computeIfAbsent(key, mappingFunction); - } - - @Override - public Object computeIfPresent( - String key, BiFunction remappingFunction) { - this.checkWriteAccess(); - - return super.computeIfPresent(key, remappingFunction); - } - - @Override - public TagMap immutableCopy() { - if (this.isEmpty()) { - return LegacyTagMap.EMPTY; - } else { - return this.copy().freeze(); - } - } - - @Override - public Iterator iterator() { - return new IteratorImpl(this); - } - - @Override - public Stream stream() { - return StreamSupport.stream(this.spliterator(), false); - } - - private static final class IteratorImpl implements Iterator { - private final Iterator> wrappedIter; - private final EntryReadingHelper entryReadingHelper; - - IteratorImpl(LegacyTagMap legacyMap) { - this.wrappedIter = legacyMap.entrySet().iterator(); - this.entryReadingHelper = new EntryReadingHelper(); - } - - @Override - public boolean hasNext() { - return this.wrappedIter.hasNext(); - } - - @Override - public TagMap.EntryReader next() { - Map.Entry entry = this.wrappedIter.next(); - this.entryReadingHelper.set(entry.getKey(), entry.getValue()); - - return this.entryReadingHelper; - } - } -} - final class TagValueConversions { TagValueConversions() {} diff --git a/internal-api/src/test/java/datadog/trace/api/TagMapLedgerTest.java b/internal-api/src/test/java/datadog/trace/api/TagMapLedgerTest.java index bcf2fb52d6d..ddd7dccf2b4 100644 --- a/internal-api/src/test/java/datadog/trace/api/TagMapLedgerTest.java +++ b/internal-api/src/test/java/datadog/trace/api/TagMapLedgerTest.java @@ -9,8 +9,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.EnumSource; public class TagMapLedgerTest { static final int SIZE = 32; @@ -74,26 +72,6 @@ public void buildMutable() { map.set(key(1000), value(1000)); } - @ParameterizedTest - @EnumSource(TagMapType.class) - public void buildMutable(TagMapType mapType) { - TagMap.Ledger ledger = TagMap.ledger(); - for (int i = 0; i < SIZE; ++i) { - ledger.set(key(i), value(i)); - } - - assertEquals(SIZE, ledger.estimateSize()); - - TagMap map = ledger.build(mapType.factory); - for (int i = 0; i < SIZE; ++i) { - assertEquals(value(i), map.getString(key(i))); - } - assertEquals(SIZE, map.size()); - - // just proving that the map is mutable - map.set(key(1000), value(1000)); - } - @Test public void buildImmutable() { TagMap.Ledger ledger = TagMap.ledger(); @@ -112,25 +90,6 @@ public void buildImmutable() { assertFrozen(map); } - @ParameterizedTest - @EnumSource(TagMapType.class) - public void buildImmutable(TagMapType mapType) { - TagMap.Ledger ledger = TagMap.ledger(); - for (int i = 0; i < SIZE; ++i) { - ledger.set(key(i), value(i)); - } - - assertEquals(SIZE, ledger.estimateSize()); - - TagMap map = ledger.buildImmutable(mapType.factory); - for (int i = 0; i < SIZE; ++i) { - assertEquals(value(i), map.getString(key(i))); - } - assertEquals(SIZE, map.size()); - - assertFrozen(map); - } - @Test public void build_empty() { TagMap.Ledger ledger = TagMap.ledger(); @@ -138,14 +97,6 @@ public void build_empty() { assertNotSame(TagMap.EMPTY, ledger.build()); } - @ParameterizedTest - @EnumSource(TagMapType.class) - public void build_empty(TagMapType mapType) { - TagMap.Ledger ledger = TagMap.ledger(); - assertTrue(ledger.isDefinitelyEmpty()); - assertNotSame(mapType.empty(), ledger.build(mapType.factory)); - } - @Test public void buildImmutable_empty() { TagMap.Ledger ledger = TagMap.ledger(); diff --git a/internal-api/src/test/java/datadog/trace/api/TagMapScenario.java b/internal-api/src/test/java/datadog/trace/api/TagMapScenario.java index 20b9b927d1b..1c07b31c563 100644 --- a/internal-api/src/test/java/datadog/trace/api/TagMapScenario.java +++ b/internal-api/src/test/java/datadog/trace/api/TagMapScenario.java @@ -1,18 +1,15 @@ package datadog.trace.api; public enum TagMapScenario { - LEGACY_EMPTY(LegacyTagMapFactory.INSTANCE, 0), - OPTIMIZED_EMPTY(OptimizedTagMapFactory.INSTANCE, 0), - OPTIMIZED_XSMALL(OptimizedTagMapFactory.INSTANCE, 5), - OPTIMIZED_SMALL(OptimizedTagMapFactory.INSTANCE, 10), - OPTIMIZED_MEDIUM(OptimizedTagMapFactory.INSTANCE, 25), - OPTIMIZED_LARGE(OptimizedTagMapFactory.INSTANCE, 125); + OPTIMIZED_EMPTY(0), + OPTIMIZED_XSMALL(5), + OPTIMIZED_SMALL(10), + OPTIMIZED_MEDIUM(25), + OPTIMIZED_LARGE(125); - final TagMapFactory factory; final int size; - TagMapScenario(TagMapFactory factory, int size) { - this.factory = factory; + TagMapScenario(int size) { this.size = size; } @@ -21,7 +18,7 @@ public final int size() { } public final TagMap create() { - TagMap map = factory.create(); + TagMap map = TagMap.create(); for (int i = 0; i < this.size; ++i) { map.put("filler-key-" + i, "filler-value-" + i); } diff --git a/internal-api/src/test/java/datadog/trace/api/TagMapTest.java b/internal-api/src/test/java/datadog/trace/api/TagMapTest.java index 365ccff23d8..84c9e401f43 100644 --- a/internal-api/src/test/java/datadog/trace/api/TagMapTest.java +++ b/internal-api/src/test/java/datadog/trace/api/TagMapTest.java @@ -79,21 +79,6 @@ public void fromMapImmutable_nonEmptyMap() { assertTrue(tagMap.isFrozen()); } - @ParameterizedTest - @ValueSource(booleans = {false, true}) - public void optimizedFactory(boolean optimized) { - TagMapFactory factory = TagMapFactory.createFactory(optimized); - - TagMap unsizedMap = factory.create(); - assertEquals(optimized, unsizedMap.isOptimized()); - - TagMap sizedMap = factory.create(32); - assertEquals(optimized, sizedMap.isOptimized()); - - TagMap emptyMap = factory.empty(); - assertEquals(optimized, emptyMap.isOptimized()); - } - @ParameterizedTest @EnumSource(TagMapScenario.class) public void map_put(TagMapScenario scenario) { @@ -145,9 +130,8 @@ public void booleanEntry(TagMapScenario scenario) { checkIntegrity(map); } - @ParameterizedTest - @EnumSource(TagMapType.class) - public void numericZeroToBooleanCoercion(TagMapType mapType) { + @Test + public void numericZeroToBooleanCoercion() { TagMap map = TagMap.ledger() .set("int", 0) @@ -158,7 +142,7 @@ public void numericZeroToBooleanCoercion(TagMapType mapType) { .set("floatObj", Float.valueOf(0F)) .set("double", 0D) .set("doubleObj", Double.valueOf(0D)) - .build(mapType.factory); + .build(); assertBoolean(false, map, "int"); assertBoolean(false, map, "intObj"); @@ -172,9 +156,8 @@ public void numericZeroToBooleanCoercion(TagMapType mapType) { checkIntegrity(map); } - @ParameterizedTest - @EnumSource(TagMapType.class) - public void numericNonZeroToBooleanCoercion(TagMapType mapType) { + @Test + public void numericNonZeroToBooleanCoercion() { TagMap map = TagMap.ledger() .set("int", 1) @@ -185,7 +168,7 @@ public void numericNonZeroToBooleanCoercion(TagMapType mapType) { .set("floatObj", Float.valueOf(1F)) .set("double", 1D) .set("doubleObj", Double.valueOf(1D)) - .build(mapType.factory); + .build(); assertBoolean(true, map, "int"); assertBoolean(true, map, "intObj"); @@ -199,15 +182,14 @@ public void numericNonZeroToBooleanCoercion(TagMapType mapType) { checkIntegrity(map); } - @ParameterizedTest - @EnumSource(TagMapType.class) - public void objectToBooleanCoercion(TagMapType mapType) { + @Test + public void objectToBooleanCoercion() { TagMap map = TagMap.ledger() .set("obj", new Object()) .set("trueStr", "true") .set("falseStr", "false") - .build(mapType.factory); + .build(); assertBoolean(true, map, "obj"); assertBoolean(true, map, "trueStr"); @@ -216,10 +198,9 @@ public void objectToBooleanCoercion(TagMapType mapType) { checkIntegrity(map); } - @ParameterizedTest - @EnumSource(TagMapType.class) - public void booleanToNumericCoercion_true(TagMapType mapType) { - TagMap map = TagMap.ledger().set("true", true).build(mapType.factory); + @Test + public void booleanToNumericCoercion_true() { + TagMap map = TagMap.ledger().set("true", true).build(); assertInt(1, map, "true"); assertLong(1L, map, "true"); @@ -229,10 +210,9 @@ public void booleanToNumericCoercion_true(TagMapType mapType) { checkIntegrity(map); } - @ParameterizedTest - @EnumSource(TagMapType.class) - public void booleanToNumericCoercion_false(TagMapType mapType) { - TagMap map = TagMap.ledger().set("false", false).build(mapType.factory); + @Test + public void booleanToNumericCoercion_false() { + TagMap map = TagMap.ledger().set("false", false).build(); assertInt(0, map, "false"); assertLong(0L, map, "false"); @@ -242,10 +222,9 @@ public void booleanToNumericCoercion_false(TagMapType mapType) { checkIntegrity(map); } - @ParameterizedTest - @EnumSource(TagMapType.class) - public void emptyToPrimitiveCoercion(TagMapType mapType) { - TagMap map = mapType.empty(); + @Test + public void emptyToPrimitiveCoercion() { + TagMap map = TagMap.EMPTY; // DQH - assert helpers also check getOrDefault, so they don't work here assertEquals(false, map.getBoolean("dne")); @@ -396,10 +375,9 @@ public void doubleEntry(TagMapScenario scenario) { checkIntegrity(map); } - @ParameterizedTest - @EnumSource(TagMapType.class) - public void empty(TagMapType mapType) { - TagMap empty = mapType.empty(); + @Test + public void empty() { + TagMap empty = TagMap.EMPTY; assertFrozen(empty); assertNull(empty.getEntry("foo")); @@ -409,13 +387,12 @@ public void empty(TagMapType mapType) { checkIntegrity(empty); } - @ParameterizedTest - @EnumSource(TagMapTypePair.class) - public void putAll_empty(TagMapTypePair mapTypePair) { + @Test + public void putAll_empty() { // TagMap.EMPTY breaks the rules and uses a different size bucket array // This test is just to verify that the common use of putAll still works with EMPTY - TagMap newMap = mapTypePair.firstType.create(); - newMap.putAll(mapTypePair.secondType.empty()); + TagMap newMap = TagMap.create(); + newMap.putAll(TagMap.EMPTY); assertSize(0, newMap); assertEmpty(newMap); @@ -541,10 +518,9 @@ public void freeze(TagMapScenario scenario) { checkIntegrity(map); } - @ParameterizedTest - @EnumSource(TagMapType.class) - public void emptyMap(TagMapType mapType) { - TagMap map = mapType.empty(); + @Test + public void emptyMap() { + TagMap map = TagMap.EMPTY; assertSize(0, map); assertEmpty(map); @@ -593,11 +569,10 @@ public void copyMany(TagMapScenario scenario) { checkIntegrity(copy); } - @ParameterizedTest - @EnumSource(TagMapType.class) - public void immutableCopy(TagMapType mapType) { + @Test + public void immutableCopy() { int size = randomSize(); - TagMap orig = createTagMap(mapType, size); + TagMap orig = createTagMap(size); TagMap immutableCopy = orig.immutableCopy(); orig.clear(); // doing this to make sure that copied isn't modified @@ -612,11 +587,10 @@ public void immutableCopy(TagMapType mapType) { checkIntegrity(immutableCopy); } - @ParameterizedTest - @EnumSource(TagMapType.class) - public void replaceALot(TagMapType mapType) { + @Test + public void replaceALot() { int size = randomSize(); - TagMap map = createTagMap(mapType, size); + TagMap map = createTagMap(size); for (int i = 0; i < size; ++i) { int index = ThreadLocalRandom.current().nextInt(size); @@ -628,32 +602,28 @@ public void replaceALot(TagMapType mapType) { checkIntegrity(map); } - @ParameterizedTest - @EnumSource(TagMapTypePair.class) - public void shareEntry(TagMapTypePair mapTypePair) { - TagMap orig = mapTypePair.firstType.create(); + @Test + public void shareEntry() { + TagMap orig = TagMap.create(); orig.set("foo", "bar"); - TagMap dest = mapTypePair.secondType.create(); + TagMap dest = TagMap.create(); dest.set(orig.getEntry("foo")); assertEquals(orig.getEntry("foo"), dest.getEntry("foo")); - if (mapTypePair == TagMapTypePair.BOTH_OPTIMIZED) { - assertSame(orig.getEntry("foo"), dest.getEntry("foo")); - } + assertSame(orig.getEntry("foo"), dest.getEntry("foo")); checkIntegrity(orig); checkIntegrity(dest); } - @ParameterizedTest - @EnumSource(TagMapTypePair.class) - public void putAll_clobberAll(TagMapTypePair mapTypePair) { + @Test + public void putAll_clobberAll() { int size = randomSize(); - TagMap orig = createTagMap(mapTypePair.firstType, size); + TagMap orig = createTagMap(size); assertSize(size, orig); - TagMap dest = mapTypePair.secondType.create(); + TagMap dest = TagMap.create(); for (int i = size - 1; i >= 0; --i) { dest.set(key(i), altValue(i)); } @@ -689,14 +659,13 @@ public void putAll_cloberAll(TagMapScenario scenario) { checkIntegrity(dest); } - @ParameterizedTest - @EnumSource(TagMapTypePair.class) - public void putAll_clobberAndExtras(TagMapTypePair mapTypePair) { + @Test + public void putAll_clobberAndExtras() { int size = randomSize(); - TagMap orig = createTagMap(mapTypePair.firstType, size); + TagMap orig = createTagMap(size); assertSize(size, orig); - TagMap dest = mapTypePair.secondType.create(); + TagMap dest = TagMap.create(); for (int i = size / 2 - 1; i >= 0; --i) { dest.set(key(i), altValue(i)); } @@ -714,11 +683,10 @@ public void putAll_clobberAndExtras(TagMapTypePair mapTypePair) { checkIntegrity(dest); } - @ParameterizedTest - @EnumSource(TagMapType.class) - public void removeMany(TagMapType mapType) { + @Test + public void removeMany() { int size = randomSize(); - TagMap map = createTagMap(mapType, size); + TagMap map = createTagMap(size); for (int i = 0; i < size; ++i) { assertEntry(key(i), value(i), map); @@ -740,11 +708,10 @@ public void removeMany(TagMapType mapType) { checkIntegrity(map); } - @ParameterizedTest - @EnumSource(TagMapType.class) - public void fillMap(TagMapType mapType) { + @Test + public void fillMap() { int size = randomSize(); - TagMap map = mapType.create(); + TagMap map = TagMap.create(); for (int i = 0; i < size; ++i) { map.set(key(i), i); } @@ -760,11 +727,10 @@ public void fillMap(TagMapType mapType) { checkIntegrity(map); } - @ParameterizedTest - @EnumSource(TagMapType.class) - public void fillStringMap(TagMapType mapType) { + @Test + public void fillStringMap() { int size = randomSize(); - TagMap map = mapType.create(); + TagMap map = TagMap.create(); for (int i = 0; i < size; ++i) { map.set(key(i), i); } @@ -780,11 +746,10 @@ public void fillStringMap(TagMapType mapType) { checkIntegrity(map); } - @ParameterizedTest - @EnumSource(TagMapType.class) - public void iterator(TagMapType mapType) { + @Test + public void iterator() { int size = randomSize(); - TagMap map = createTagMap(mapType, size); + TagMap map = createTagMap(size); Set keys = new HashSet<>(); for (TagMap.EntryReader entry : map) { @@ -803,11 +768,10 @@ public void iterator(TagMapType mapType) { checkIntegrity(map); } - @ParameterizedTest - @EnumSource(TagMapType.class) - public void forEachConsumer(TagMapType mapType) { + @Test + public void forEachConsumer() { int size = randomSize(); - TagMap map = createTagMap(mapType, size); + TagMap map = createTagMap(size); Set keys = new HashSet<>(size); map.forEach((entry) -> keys.add(entry.tag())); @@ -823,11 +787,10 @@ public void forEachConsumer(TagMapType mapType) { checkIntegrity(map); } - @ParameterizedTest - @EnumSource(TagMapType.class) - public void forEachBiConsumer(TagMapType mapType) { + @Test + public void forEachBiConsumer() { int size = randomSize(); - TagMap map = createTagMap(mapType, size); + TagMap map = createTagMap(size); Set keys = new HashSet<>(size); map.forEach(keys, (k, entry) -> k.add(entry.tag())); @@ -843,11 +806,10 @@ public void forEachBiConsumer(TagMapType mapType) { checkIntegrity(map); } - @ParameterizedTest - @EnumSource(TagMapType.class) - public void forEachTriConsumer(TagMapType mapType) { + @Test + public void forEachTriConsumer() { int size = randomSize(); - TagMap map = createTagMap(mapType, size); + TagMap map = createTagMap(size); Set keys = new HashSet<>(size); map.forEach(keys, "hi", (k, msg, entry) -> keys.add(entry.tag())); @@ -863,11 +825,10 @@ public void forEachTriConsumer(TagMapType mapType) { checkIntegrity(map); } - @ParameterizedTest - @EnumSource(TagMapType.class) - public void entrySet(TagMapType mapType) { + @Test + public void entrySet() { int size = randomSize(); - TagMap map = createTagMap(mapType, size); + TagMap map = createTagMap(size); Set> actualEntries = map.entrySet(); assertEquals(size, actualEntries.size()); @@ -882,11 +843,10 @@ public void entrySet(TagMapType mapType) { checkIntegrity(map); } - @ParameterizedTest - @EnumSource(TagMapType.class) - public void keySet(TagMapType mapType) { + @Test + public void keySet() { int size = randomSize(); - TagMap map = createTagMap(mapType, size); + TagMap map = createTagMap(size); Set actualKeys = map.keySet(); assertEquals(size, actualKeys.size()); @@ -901,11 +861,10 @@ public void keySet(TagMapType mapType) { checkIntegrity(map); } - @ParameterizedTest - @EnumSource(TagMapType.class) - public void values(TagMapType mapType) { + @Test + public void values() { int size = randomSize(); - TagMap map = createTagMap(mapType, size); + TagMap map = createTagMap(size); Collection actualValues = map.values(); assertEquals(size, actualValues.size()); @@ -920,11 +879,10 @@ public void values(TagMapType mapType) { checkIntegrity(map); } - @ParameterizedTest - @EnumSource(TagMapType.class) - public void _toString(TagMapType mapType) { + @Test + public void _toString() { int size = 4; - TagMap map = createTagMap(mapType, size); + TagMap map = createTagMap(size); String str = map.toString(); @@ -950,12 +908,12 @@ static int randomSize() { return ThreadLocalRandom.current().nextInt(16, MANY_SIZE); } - static TagMap createTagMap(TagMapType mapType) { - return createTagMap(mapType, randomSize()); + static TagMap createTagMap() { + return createTagMap(randomSize()); } - static TagMap createTagMap(TagMapType mapType, int size) { - TagMap map = mapType.create(); + static TagMap createTagMap(int size) { + TagMap map = TagMap.create(); fillMap(map, size); return map; } diff --git a/internal-api/src/test/java/datadog/trace/api/TagMapType.java b/internal-api/src/test/java/datadog/trace/api/TagMapType.java deleted file mode 100644 index 512473d3439..00000000000 --- a/internal-api/src/test/java/datadog/trace/api/TagMapType.java +++ /dev/null @@ -1,20 +0,0 @@ -package datadog.trace.api; - -public enum TagMapType { - OPTIMIZED(OptimizedTagMapFactory.INSTANCE), - LEGACY(LegacyTagMapFactory.INSTANCE); - - final TagMapFactory factory; - - TagMapType(TagMapFactory factory) { - this.factory = factory; - } - - public final TagMap create() { - return factory.create(); - } - - public final TagMap empty() { - return factory.empty(); - } -} diff --git a/internal-api/src/test/java/datadog/trace/api/TagMapTypePair.java b/internal-api/src/test/java/datadog/trace/api/TagMapTypePair.java deleted file mode 100644 index 1b82df3d3a0..00000000000 --- a/internal-api/src/test/java/datadog/trace/api/TagMapTypePair.java +++ /dev/null @@ -1,16 +0,0 @@ -package datadog.trace.api; - -public enum TagMapTypePair { - BOTH_OPTIMIZED(TagMapType.OPTIMIZED, TagMapType.OPTIMIZED), - BOTH_LEGACY(TagMapType.LEGACY, TagMapType.LEGACY), - OPTIMIZED_LEGACY(TagMapType.OPTIMIZED, TagMapType.LEGACY), - LEGACY_OPTIMIZED(TagMapType.LEGACY, TagMapType.OPTIMIZED); - - public final TagMapType firstType; - public final TagMapType secondType; - - TagMapTypePair(TagMapType firstType, TagMapType secondType) { - this.firstType = firstType; - this.secondType = secondType; - } -} diff --git a/metadata/supported-configurations.json b/metadata/supported-configurations.json index 09498b2beda..e3406d024e6 100644 --- a/metadata/supported-configurations.json +++ b/metadata/supported-configurations.json @@ -2425,14 +2425,6 @@ "aliases": [] } ], - "DD_OPTIMIZED_MAP_ENABLED": [ - { - "version": "A", - "type": "boolean", - "default": "false", - "aliases": [] - } - ], "DD_OTLP_METRICS_ENDPOINT": [ { "version": "A", From 6ec67161074be4566ee9d52052601d8193f6fea8 Mon Sep 17 00:00:00 2001 From: Brice Dutheil Date: Wed, 24 Jun 2026 17:25:28 +0200 Subject: [PATCH 038/139] Agent integrations checks (#11692) feat: Expand the jar checks to stricter agent jar validation * Maintains the size check. * Verify some required entries * Ensure there's a minimum number of classes in the whole jar * Ensure products are correctly included and have at least one class * Light size check on the indexes * Fixed list of packages that should not appear in the jar * Run checks as part of the build job, to catch issues earlier feat: verify shipped agent integrations Run `--list-integrations` on the assembled jar as part of check. This exercises dd-java-agent.index, inst/instrumenter.index, and integration class loading end-to-end. The today's 208 integration names are stored in `expected-integrations.txt` and compared against the runtime output. Diff is shown on mismatch. Run `updateAgentJarIntegrationsGolden` after intentional changes and commit the result. fix: Also track the stderr when verifying integrations Multi-version integrations issues could be misreported as valid. InstrumenterIndex.buildModule() logs ERROR and returns null when a module fails to load, while the process exits 0. For integrations with multiple versioned modules sharing one name (akka-http, vertx, servlet...), if any of a versionned integration fails it's invisible. This commit changes that. In a clean run stderr is empty; any output indicates a module load failure and fails the task immediately. fix: merge master into agent integrations check chore: PR review Co-authored-by: brice.dutheil --- dd-java-agent/build.gradle | 83 +++++++++- dd-java-agent/expected-integrations.txt | 208 ++++++++++++++++++++++++ docs/add_new_instrumentation.md | 16 ++ 3 files changed, 305 insertions(+), 2 deletions(-) create mode 100644 dd-java-agent/expected-integrations.txt diff --git a/dd-java-agent/build.gradle b/dd-java-agent/build.gradle index ae78df4410c..13214983663 100644 --- a/dd-java-agent/build.gradle +++ b/dd-java-agent/build.gradle @@ -530,7 +530,7 @@ tasks.register('verifyAgentJarContents') { // Sanity check on the minimum number of classes; update as needed. Set to about 98% of that number. def classCount = entries.keySet().count { it.endsWith('.class') || it.endsWith('.classdata') } - def classFloor = 17_000 // a bit moe than 98% of 17,279 at time of writing + def classFloor = 17_000 // a bit more than 98% of 17,279 at time of writing if (classCount < classFloor) { failures << "Class count ${classCount} is below floor ${classFloor}" } @@ -577,6 +577,85 @@ tasks.register('verifyAgentJarContents') { } } +def integrationsGoldenFile = project.file('expected-integrations.txt') + +tasks.register('verifyAgentJarIntegrations', JavaExec) { + group = LifecycleBasePlugin.VERIFICATION_GROUP + description = 'Verify the agent jar lists exactly the integrations in expected-integrations.txt' + + def jarProvider = tasks.named('shadowJar', ShadowJar).flatMap { it.archiveFile } + inputs.file(jarProvider) + inputs.file(integrationsGoldenFile) + outputs.file(project.layout.buildDirectory.file("tmp/${it.name}/.verified")) + + // Run the assembled agent jar directly — this exercises dd-java-agent.index, + // inst/instrumenter.index, and instrumentation class loading end-to-end. + mainClass = 'datadog.trace.bootstrap.AgentBootstrap' + classpath = objects.fileCollection().from(jarProvider) + args = ['--list-integrations'] + + // Capture both stdout and stderr: InstrumenterIndex.buildModule() logs ERROR and returns null when a module + // fails to load, while the process exits with status 0. + def capturedOutput = new ByteArrayOutputStream() + def capturedError = new ByteArrayOutputStream() + standardOutput = capturedOutput + errorOutput = capturedError + + doLast { + def stderr = capturedError.toString() + if (!stderr.isBlank()) { + throw new GradleException( + "--list-integrations produced unexpected stderr output " + + "(likely a module load failure; see InstrumenterIndex.buildModule):\n${stderr}") + } + + if (!integrationsGoldenFile.exists()) { + throw new GradleException( + "${integrationsGoldenFile.name} not found. " + + "Run './gradlew :dd-java-agent:updateAgentJarIntegrationsGoldenFile' to create it.") + } + + def actual = capturedOutput.toString().readLines().findAll { !it.isBlank() }.toSorted() + def expected = integrationsGoldenFile.readLines().findAll { !it.isBlank() }.toSorted() + def added = actual - expected + def removed = expected - actual + + if (added || removed) { + def msg = new StringBuilder("Integration list differs from ${integrationsGoldenFile.name}.") + msg.append(" Run './gradlew :dd-java-agent:updateAgentJarIntegrationsGoldenFile' to update it.\n") + added.each { msg.append(" + ${it}\n") } + removed.each { msg.append(" - ${it}\n") } + throw new GradleException(msg.toString()) + } + + def marker = outputs.files.singleFile + marker.parentFile.mkdirs() + marker.text = 'verified' + } +} + +// Manual run after adding/removing integrations to update expected-integrations.txt, then add with the new integration. +tasks.register('updateAgentJarIntegrationsGoldenFile', JavaExec) { + group = LifecycleBasePlugin.VERIFICATION_GROUP + description = 'Regenerate expected-integrations.txt from the current agent jar' + + def jarProvider = tasks.named('shadowJar', ShadowJar).flatMap { it.archiveFile } + inputs.file(jarProvider) + + mainClass = 'datadog.trace.bootstrap.AgentBootstrap' + classpath = objects.fileCollection().from(jarProvider) + args = ['--list-integrations'] + + def capturedOutput = new ByteArrayOutputStream() + standardOutput = capturedOutput + + doLast { + def integrations = capturedOutput.toString().readLines().findAll { !it.isBlank() }.toSorted() + integrationsGoldenFile.text = integrations.join('\n') + '\n' + logger.lifecycle("Updated ${integrationsGoldenFile.name} with ${integrations.size()} integrations") + } +} + tasks.named('check') { - dependsOn 'verifyAgentJarContents' + dependsOn 'verifyAgentJarContents', 'verifyAgentJarIntegrations' } diff --git a/dd-java-agent/expected-integrations.txt b/dd-java-agent/expected-integrations.txt new file mode 100644 index 00000000000..dc0d8bd7e7b --- /dev/null +++ b/dd-java-agent/expected-integrations.txt @@ -0,0 +1,208 @@ +IastInstrumentation +aerospike +akka-http +akka-http2 +akka_actor_mailbox +akka_actor_receive +akka_actor_send +akka_concurrent +allocatedirect +amqp +apache-httpclient +armeria-grpc-client +armeria-grpc-server +armeria-jetty +avro +aws-lambda +aws-sdk +axis2 +axway-api +azure-functions +caffeine +cassandra +ci-visibility +cics +classloading +commons-fileupload +commons-http-client +confluent-schema-registry +couchbase +cucumber +cxf +datanucleus +defineclass +dropwizard +dynamodb +elasticsearch +emr-aws-sdk +eventbridge +ffm-native-tracing +finatra +freemarker +gax +glassfish +google-http-client +google-pubsub +gradle +graphql-java +grizzly +grizzly-client +grizzly-filterchain +grpc +gson +guava +hazelcast +hazelcast_legacy +hibernate +httpasyncclient +httpasyncclient5 +httpclient +httpclient5 +httpcore +httpcore-5 +httpurlconnection +hystrix +ignite +inputStream +jackson +jackson-core +jacoco +jakarta-jms +jakarta-mail +jakarta-rs +jakarta-websocket +jakarta-ws +java-http-client +java-lang +java-lang-appsec +java-lang-management +java-module +java-net +java_completablefuture +java_concurrent +java_timer +javax-mail +javax-websocket +jax-rs +jax-ws +jboss-logmanager +jdbc +jdbc-datasource +jedis +jersey +jetty +jetty-client +jetty-concurrent +jms +jni +jsp +jwt +kafka +kotlin_coroutine +lettuce +liberty +log4j +logback +maven +micronaut +mmap +mongo +mule +native-image +netty +netty-concurrent +netty-promise +not-not-trace +ognl +okhttp +openai-java +opensearch +opentelemetry-annotations +opentelemetry-beta +opentelemetry-logs +opentelemetry-metrics +opentelemetry.experimental +opentracing +org-json +pekko-http +pekko-http2 +pekko_actor_mailbox +pekko_actor_receive +pekko_actor_send +play +play-ws +protobuf +quartz +ratpack +ratpack-request-body +reactive-streams +reactor-core +reactor-netty +rediscala +redisson +renaissance +resilience4j +resilience4j-reactor +resteasy +restlet-http +rmi +rxjava +s3 +scala_concurrent +servicetalk +servlet +servlet-filter +servlet-request-body +servlet-service +sfn +shutdown +slick +snakeyaml +sns +socket +sofarpc +spark +spark-executor +spark-exit +spark-launcher +spark-openlineage +sparkjava +spray-http +spring-async +spring-beans +spring-boot +spring-boot-span-origin +spring-cloud-zuul +spring-core +spring-data +spring-jms +spring-messaging +spring-rabbit +spring-scheduling +spring-security +spring-web +spring-web-code-origin +spring-webflux +spring-ws +spymemcached +sqs +sslsocket +synapse3-client +synapse3-server +testng +throwables +thymeleaf +tibco +tinylog +tomcat +trace +twilio-sdk +undertow +urlconnection +valkey +velocity +vertx +wallclock +websphere-jmx +wildfly +zio.experimental diff --git a/docs/add_new_instrumentation.md b/docs/add_new_instrumentation.md index 609890e335e..35343a56baa 100644 --- a/docs/add_new_instrumentation.md +++ b/docs/add_new_instrumentation.md @@ -449,6 +449,22 @@ There are four verification strategies, three of which are mandatory. - [Latest Dependency Tests](./how_instrumentations_work.md#latest-dependency-tests) (Required) - [Smoke tests](./how_instrumentations_work.md#smoke-tests) (Not required) +### Agent jar integrations golden file + +The agent jar check task `checkAgentJarIntegrations` verifies that the set of integrations +listed in `dd-java-agent/expected-integrations.txt` exactly matches the integrations +shipped in the built agent jar. This catches accidental additions or removals. + +When you add or remove an integration, update the golden file: + +```shell +./gradlew :dd-java-agent:updateAgentJarIntegrationsGoldenFile +``` + +Then commit `dd-java-agent/expected-integrations.txt` alongside your instrumentation changes. +The `check` task runs `checkAgentJarIntegrations` automatically, so CI will fail if the file +is out of date. + All integrations must include sufficient test coverage. This HTTP client integration will include a [standard HTTP test class](../dd-java-agent/instrumentation/google-http-client/src/test/groovy/GoogleHttpClientTest.groovy) and From 5071d553cadb8dc17d2cc9e7ab00c70e33e95b47 Mon Sep 17 00:00:00 2001 From: Douglas Q Hawkins Date: Wed, 24 Jun 2026 11:32:29 -0400 Subject: [PATCH 039/139] APMLP-1263 replace TagMap.put with set (#11106) APMLP-1263 replace TagMap.put with set Co-authored-by: dougqh Merge branch 'master' into dd/apmlp-1263-tagmap-set-coretracer Co-authored-by: datadog-datadog-prod-us1-2[bot] <261164178+datadog-datadog-prod-us1-2[bot]@users.noreply.github.com> Co-authored-by: devflow.devflow-routing-intake --- dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java b/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java index 59325f25632..28f9e39c710 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java @@ -904,7 +904,7 @@ private CoreTracer( this.allowInferredServices = SpanNaming.instance().namingSchema().allowInferredServices(); if (profilingContextIntegration != ProfilingContextIntegration.NoOp.INSTANCE) { TagMap tmp = TagMap.fromMap(localRootSpanTags); - tmp.put(PROFILING_CONTEXT_ENGINE, profilingContextIntegration.name()); + tmp.set(PROFILING_CONTEXT_ENGINE, profilingContextIntegration.name()); this.localRootSpanTags = tmp.freeze(); } else { this.localRootSpanTags = TagMap.fromMapImmutable(localRootSpanTags); From 7e083fdf3417da8a5c1d7bef9080ba25f88153ea Mon Sep 17 00:00:00 2001 From: Andrea Marziali Date: Wed, 24 Jun 2026 18:41:19 +0200 Subject: [PATCH 040/139] Unbound virtual thread tests (#11729) Unbound virtual thread tests Co-authored-by: devflow.devflow-routing-intake --- .../java-concurrent/java-concurrent-21.0/build.gradle | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/build.gradle b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/build.gradle index d2d9001f4b1..d95e9432796 100644 --- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/build.gradle +++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/build.gradle @@ -8,9 +8,6 @@ apply from: "$rootDir/gradle/slf4j-simple.gradle" testJvmConstraints { minJavaVersion = JavaVersion.VERSION_21 - // Structured concurrency is a preview feature in Java 21. Methods (e.g. ShutdownOnFailure) used in this instrumentation test are no longer available in Java 25, so we set the max version to 24. - // See: https://download.java.net/java/early_access/loom/docs/api/java.base/java/util/concurrent/StructuredTaskScope.html - maxJavaVersion = JavaVersion.VERSION_24 } muzzle { @@ -30,6 +27,14 @@ idea { */ addTestSuite('previewTest') +tasks.named("previewTest").configure { + testJvmConstraints { + // Structured concurrency is a preview feature in Java 21. Methods (e.g. ShutdownOnFailure) used in this instrumentation test are no longer available in Java 25, so we set the max version to 24. + // See: https://download.java.net/java/early_access/loom/docs/api/java.base/java/util/concurrent/StructuredTaskScope.html + maxJavaVersion = JavaVersion.VERSION_24 + } +} + // Set all compile tasks to use JDK21 but let instrumentation code targets 1.8 compatibility tasks.withType(AbstractCompile).configureEach { configureCompiler(it, 21, JavaVersion.VERSION_1_8) From 42ae556b4051b8ce458bed88d6942e7e024181a8 Mon Sep 17 00:00:00 2001 From: Gyuheon Oh <102937919+gyuheon0h@users.noreply.github.com> Date: Wed, 24 Jun 2026 13:49:29 -0400 Subject: [PATCH 041/139] feat(crashtracking): include JVM distribution details in crash report (#11715) Include JVM distribution details in crash report Add runtime info to experimental instead Co-authored-by: devflow.devflow-routing-intake --- .../datadog/crashtracking/CrashUploader.java | 17 ++++++- .../crashtracking/dto/Experimental.java | 21 +++++++-- .../crashtracking/dto/RuntimeInfo.java | 45 +++++++++++++++++++ .../parsers/HotspotCrashLogParser.java | 23 +++++++++- .../parsers/J9JavacoreParser.java | 17 ++++++- .../parsers/HotspotCrashLogParserTest.java | 22 +++++++++ .../parsers/J9JavacoreParserTest.java | 17 +++++++ 7 files changed, 155 insertions(+), 7 deletions(-) create mode 100644 dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/RuntimeInfo.java diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/CrashUploader.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/CrashUploader.java index 6b0a9b388a5..7a838523993 100644 --- a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/CrashUploader.java +++ b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/CrashUploader.java @@ -581,7 +581,8 @@ private RequestBody makeErrorTrackingRequestBody(@Nonnull CrashLog payload, bool if (payload.experimental != null && (payload.experimental.ucontext != null || payload.experimental.registerToMemoryMapping != null - || payload.experimental.runtimeArgs != null)) { + || payload.experimental.runtimeArgs != null + || payload.experimental.runtimeInfo != null)) { writer.name("experimental"); writer.beginObject(); if (payload.experimental.ucontext != null) { @@ -611,6 +612,20 @@ private RequestBody makeErrorTrackingRequestBody(@Nonnull CrashLog payload, bool } writer.endArray(); } + if (payload.experimental.runtimeInfo != null) { + writer.name("runtime_info"); + writer.beginObject(); + if (payload.experimental.runtimeInfo.jreVersion != null) { + writer.name("jre_version").value(payload.experimental.runtimeInfo.jreVersion); + } + if (payload.experimental.runtimeInfo.javaVm != null) { + writer.name("java_vm").value(payload.experimental.runtimeInfo.javaVm); + } + if (payload.experimental.runtimeInfo.vmInfo != null) { + writer.name("vm_info").value(payload.experimental.runtimeInfo.vmInfo); + } + writer.endObject(); + } writer.endObject(); } // files (e.g. /proc/self/maps or dynamic_libraries) diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/Experimental.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/Experimental.java index 30d04bc3f76..449bdd93156 100644 --- a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/Experimental.java +++ b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/Experimental.java @@ -14,21 +14,33 @@ public final class Experimental { @Json(name = "runtime_args") public final List runtimeArgs; + @Json(name = "runtime_info") + public final RuntimeInfo runtimeInfo; + public Experimental(Map ucontext) { - this(ucontext, null, null); + this(ucontext, null, null, null); } public Experimental(Map ucontext, List runtimeArgs) { - this(ucontext, null, runtimeArgs); + this(ucontext, null, runtimeArgs, null); } public Experimental( Map ucontext, Map registerToMemoryMapping, List runtimeArgs) { + this(ucontext, registerToMemoryMapping, runtimeArgs, null); + } + + public Experimental( + Map ucontext, + Map registerToMemoryMapping, + List runtimeArgs, + RuntimeInfo runtimeInfo) { this.ucontext = ucontext; this.registerToMemoryMapping = registerToMemoryMapping; this.runtimeArgs = runtimeArgs; + this.runtimeInfo = runtimeInfo; } @Override @@ -37,11 +49,12 @@ public boolean equals(Object o) { Experimental that = (Experimental) o; return Objects.equals(ucontext, that.ucontext) && Objects.equals(registerToMemoryMapping, that.registerToMemoryMapping) - && Objects.equals(runtimeArgs, that.runtimeArgs); + && Objects.equals(runtimeArgs, that.runtimeArgs) + && Objects.equals(runtimeInfo, that.runtimeInfo); } @Override public int hashCode() { - return Objects.hash(ucontext, registerToMemoryMapping, runtimeArgs); + return Objects.hash(ucontext, registerToMemoryMapping, runtimeArgs, runtimeInfo); } } diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/RuntimeInfo.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/RuntimeInfo.java new file mode 100644 index 00000000000..b103960158c --- /dev/null +++ b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/RuntimeInfo.java @@ -0,0 +1,45 @@ +package datadog.crashtracking.dto; + +import com.squareup.moshi.Json; +import java.util.Objects; + +/** + * JDK runtime information extracted from the hs_err crash log header and vm_info line. This + * captures the exact JDK vendor and build so crash reports can be correlated with the specific + * binaries in use. + */ +public final class RuntimeInfo { + @Json(name = "jre_version") + public final String jreVersion; + + @Json(name = "java_vm") + public final String javaVm; + + @Json(name = "vm_info") + public final String vmInfo; + + public RuntimeInfo(String jreVersion, String javaVm, String vmInfo) { + this.jreVersion = jreVersion; + this.javaVm = javaVm; + this.vmInfo = vmInfo; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + RuntimeInfo that = (RuntimeInfo) o; + return Objects.equals(jreVersion, that.jreVersion) + && Objects.equals(javaVm, that.javaVm) + && Objects.equals(vmInfo, that.vmInfo); + } + + @Override + public int hashCode() { + return Objects.hash(jreVersion, javaVm, vmInfo); + } +} diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/parsers/HotspotCrashLogParser.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/parsers/HotspotCrashLogParser.java index 0c01f6b57a9..f4cc8e6874f 100644 --- a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/parsers/HotspotCrashLogParser.java +++ b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/parsers/HotspotCrashLogParser.java @@ -12,6 +12,7 @@ import datadog.crashtracking.dto.Metadata; import datadog.crashtracking.dto.OSInfo; import datadog.crashtracking.dto.ProcInfo; +import datadog.crashtracking.dto.RuntimeInfo; import datadog.crashtracking.dto.SigInfo; import datadog.crashtracking.dto.StackFrame; import datadog.crashtracking.dto.StackTrace; @@ -44,6 +45,9 @@ */ public final class HotspotCrashLogParser { private static final String HOTSPOT_JVM_ARGS_PREFIX = "jvm_args:"; + private static final String JRE_VERSION_PREFIX = "# JRE version: "; + private static final String JAVA_VM_PREFIX = "# Java VM: "; + private static final String VM_INFO_PREFIX = "vm_info: "; private static final DateTimeFormatter ZONED_DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("EEE MMM ppd HH:mm:ss yyyy zzz", Locale.getDefault()); private static final DateTimeFormatter OFFSET_DATE_TIME_FORMATTER = @@ -362,6 +366,9 @@ public CrashLog parse(String uuid, String crashLog) { String dynamicLibraryKey = null; boolean previousLineBlank = false; State nextThreadSectionState = null; + String jreVersion = null; + String javaVm = null; + String vmInfo = null; String[] lines = NEWLINE_SPLITTER.split(crashLog); outer: @@ -392,6 +399,11 @@ public CrashLog parse(String uuid, String crashLog) { } } } + if (jreVersion == null && line.startsWith(JRE_VERSION_PREFIX)) { + jreVersion = line.substring(JRE_VERSION_PREFIX.length()).trim(); + } else if (javaVm == null && line.startsWith(JAVA_VM_PREFIX)) { + javaVm = line.substring(JAVA_VM_PREFIX.length()).trim(); + } break; case HEADER: if (line.contains("S U M M A R Y")) { @@ -486,6 +498,8 @@ public CrashLog parse(String uuid, String crashLog) { state = State.DYNAMIC_LIBRARIES; } else if (line.contains("S Y S T E M")) { state = State.SYSTEM; + } else if (vmInfo == null && line.startsWith(VM_INFO_PREFIX)) { + vmInfo = line.substring(VM_INFO_PREFIX.length()).trim(); } else if (line.equals("END.")) { state = State.DONE; } @@ -527,6 +541,8 @@ public CrashLog parse(String uuid, String crashLog) { datetimeRaw = line.substring(6).trim(); } else if (datetime == null && datetimeRaw != null && line.startsWith("timezone: ")) { datetime = dateTimeToISO(datetimeRaw + " " + line.substring(10).trim()); + } else if (vmInfo == null && line.startsWith(VM_INFO_PREFIX)) { + vmInfo = line.substring(VM_INFO_PREFIX.length()).trim(); } break; case DONE: @@ -609,11 +625,16 @@ public CrashLog parse(String uuid, String crashLog) { registerToMemoryMapping.replaceAll((k, v) -> RedactUtils.redactRegisterToMemoryMapping(v)); resolvedMapping = registerToMemoryMapping; } + RuntimeInfo runtimeInfo = + (jreVersion != null || javaVm != null || vmInfo != null) + ? new RuntimeInfo(jreVersion, javaVm, vmInfo) + : null; Experimental experimental = !registers.isEmpty() || resolvedMapping != null || (runtimeArgs != null && !runtimeArgs.isEmpty()) - ? new Experimental(registers, resolvedMapping, runtimeArgs) + || runtimeInfo != null + ? new Experimental(registers, resolvedMapping, runtimeArgs, runtimeInfo) : null; DynamicLibs files = (dynamicLibraryLines != null && !dynamicLibraryLines.isEmpty()) diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/parsers/J9JavacoreParser.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/parsers/J9JavacoreParser.java index f13896b0dca..cb5dc5ed8f5 100644 --- a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/parsers/J9JavacoreParser.java +++ b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/parsers/J9JavacoreParser.java @@ -11,6 +11,7 @@ import datadog.crashtracking.dto.Metadata; import datadog.crashtracking.dto.OSInfo; import datadog.crashtracking.dto.ProcInfo; +import datadog.crashtracking.dto.RuntimeInfo; import datadog.crashtracking.dto.SigInfo; import datadog.crashtracking.dto.StackFrame; import datadog.crashtracking.dto.StackTrace; @@ -46,6 +47,8 @@ */ public final class J9JavacoreParser { private static final String J9_USER_ARG_PREFIX = "2CIUSERARG"; + private static final String J9_JAVA_VERSION_PREFIX = "1CIJAVAVERSION "; + private static final String J9_VM_VERSION_PREFIX = "1CIVMVERSION"; private final BuildIdCollector buildIdCollector; @@ -119,6 +122,8 @@ public CrashLog parse(String uuid, String javacoreContent) { Map registers = null; RuntimeArgs j9UserArgs = new RuntimeArgs(); + String j9JavaVersion = null; + String j9VmVersion = null; String[] lines = NEWLINE_SPLITTER.split(javacoreContent); @@ -179,6 +184,11 @@ public CrashLog parse(String uuid, String javacoreContent) { if (pidMatcher.matches()) { pid = pidMatcher.group(1); } + if (j9JavaVersion == null && line.startsWith(J9_JAVA_VERSION_PREFIX)) { + j9JavaVersion = line.substring(J9_JAVA_VERSION_PREFIX.length()).trim(); + } else if (j9VmVersion == null && line.startsWith(J9_VM_VERSION_PREFIX)) { + j9VmVersion = line.substring(J9_VM_VERSION_PREFIX.length()).trim(); + } break; case THREADS: @@ -299,10 +309,15 @@ public CrashLog parse(String uuid, String javacoreContent) { Integer parsedPid = safelyParseInt(pid); ProcInfo procInfo = parsedPid != null ? new ProcInfo(parsedPid) : null; List runtimeArgs = j9UserArgs.build(); + RuntimeInfo runtimeInfo = + (j9JavaVersion != null || j9VmVersion != null) + ? new RuntimeInfo(j9JavaVersion, null, j9VmVersion) + : null; Experimental experimental = (registers != null && !registers.isEmpty()) || (runtimeArgs != null && !runtimeArgs.isEmpty()) - ? new Experimental(registers, runtimeArgs) + || runtimeInfo != null + ? new Experimental(registers, null, runtimeArgs, runtimeInfo) : null; return new CrashLog( diff --git a/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/parsers/HotspotCrashLogParserTest.java b/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/parsers/HotspotCrashLogParserTest.java index 2008ac78e05..28bcda39e7f 100644 --- a/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/parsers/HotspotCrashLogParserTest.java +++ b/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/parsers/HotspotCrashLogParserTest.java @@ -337,6 +337,28 @@ public void testParseCurrentThreadName(String line, String expected) { HotspotCrashLogParser.parseCurrentThreadName(line)); } + @TableTest({ + "scenario | filename | expectedJreVersion | expectedVmInfo ", + "Zulu 17 | sample-crash-for-telemetry.txt | OpenJDK Runtime Environment Zulu17.42+20-SA (17.0.7+7) (build 17.0.7+7-LTS) | OpenJDK 64-Bit Server VM (17.0.7+7-LTS) for linux-amd64 JRE (17.0.7+7-LTS) (Zulu17.42+20-SA), built on Apr 11 2023 11:39:51 by \"zulu_re\" with gcc 8.3.0 ", + "Temurin 22 | sample-crash-for-telemetry-2.txt | OpenJDK Runtime Environment Temurin-22.0.1+8 (22.0.1+8) (build 22.0.1+8) | OpenJDK 64-Bit Server VM (22.0.1+8) for linux-amd64 JRE (22.0.1+8), built on 2024-04-16T00:00:00Z by \"admin\" with gcc 11.3.0 ", + "Zulu 8 | sample-crash-for-telemetry-3.txt | OpenJDK Runtime Environment (Zulu 8.70.0.23-CA-macos-aarch64) (8.0_372-b07) (build 1.8.0_372-b07) | OpenJDK 64-Bit Server VM (25.372-b07) for bsd-aarch64 JRE (Zulu 8.70.0.23-CA-macos-aarch64) (1.8.0_372-b07), built on Apr 18 2023 01:36:20 by \"zulu_re\" with gcc Apple LLVM 12.0.0 (clang-1200.0.32.28)", + "Corretto 21 | sample-crash-linux-aarch64.txt | OpenJDK Runtime Environment Corretto-21.0.7.6.1 (21.0.7+6) (build 21.0.7+6-LTS) | OpenJDK 64-Bit Server VM (21.0.7+6-LTS) for linux-aarch64-musl JRE (21.0.7+6-LTS), built on 2025-04-09T23:34:45Z by \"jenkins\" with gcc 12.2.1 20220924 ", + "OpenJDK 25 | sample-crash-macos-aarch64.txt | OpenJDK Runtime Environment (25.0.2+10) (build 25.0.2+10-69) | OpenJDK 64-Bit Server VM (25.0.2+10-69) for bsd-aarch64 JRE (25.0.2+10-69), built on 2025-12-18T11:36:35Z with clang Apple LLVM 15.0.0 (clang-1500.3.9.4) " + }) + public void testRuntimeInfoParsing( + String filename, String expectedJreVersion, String expectedVmInfo) throws Exception { + CrashLog crashLog = + new HotspotCrashLogParser().parse(UUID.randomUUID().toString(), readFileAsString(filename)); + + assertNotNull(crashLog.experimental, "experimental should be populated"); + assertNotNull(crashLog.experimental.runtimeInfo, "runtimeInfo should be populated"); + assertNotNull(crashLog.experimental.runtimeInfo.jreVersion, "jreVersion should be populated"); + assertNotNull(crashLog.experimental.runtimeInfo.javaVm, "javaVm should be populated"); + assertNotNull(crashLog.experimental.runtimeInfo.vmInfo, "vmInfo should be populated"); + assertEquals(expectedJreVersion, crashLog.experimental.runtimeInfo.jreVersion); + assertEquals(expectedVmInfo, crashLog.experimental.runtimeInfo.vmInfo); + } + @Test public void testNoSignalProducesInternalError() throws Exception { // A crash log that reaches the PROCESS section but has no siginfo line diff --git a/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/parsers/J9JavacoreParserTest.java b/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/parsers/J9JavacoreParserTest.java index cab2a9a457e..bfa122b0f2e 100644 --- a/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/parsers/J9JavacoreParserTest.java +++ b/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/parsers/J9JavacoreParserTest.java @@ -212,6 +212,23 @@ public void testDateTimeParsing() throws Exception { "Expected ISO-8601 format, got: " + crashLog.timestamp); } + @TableTest({ + "scenario | filename | expectedJreVersion ", + "OpenJ9 11 GPF | sample-j9-javacore-gpf.txt | JRE 11.0.12 Linux amd64-64 ", + "OpenJ9 17 OOM | sample-j9-javacore-oom.txt | JRE 17.0.6 Linux amd64-64 ", + "OpenJ9 11 aarch | sample-openj9-11-javacore-gpf.txt | JRE 11 Linux aarch64-64 (build 11.0.28+6) ", + "IBM J9 8 | sample-ibmj9-8-javacore-gpf.txt | JRE 1.8.0 Linux amd64-64 (build 8.0.8.51 - pxa6480sr8fp51-20250819_01(SR8 FP51))" + }) + public void testRuntimeInfoParsing(String filename, String expectedJreVersion) throws Exception { + CrashLog crashLog = + new J9JavacoreParser().parse(UUID.randomUUID().toString(), readFileAsString(filename)); + + assertNotNull(crashLog.experimental, "experimental should be populated"); + assertNotNull(crashLog.experimental.runtimeInfo, "runtimeInfo should be populated"); + assertNotNull(crashLog.experimental.runtimeInfo.jreVersion, "jreVersion should be populated"); + assertEquals(expectedJreVersion, crashLog.experimental.runtimeInfo.jreVersion); + } + @Test public void testNoSignalProducesInternalError() throws Exception { // A javacore with a THREADS section but no 1TISIGINFO line From 16a52978f242d0e549246d54c163bf750abd149e Mon Sep 17 00:00:00 2001 From: Douglas Q Hawkins Date: Wed, 24 Jun 2026 14:05:53 -0400 Subject: [PATCH 042/139] List iteration benchmark (#10888) List iteration benchmark Merge branch 'master' into dougqh/list-iteration-benchmark Fixing silly oversight - commented out benchmarks to run one in isolation earlier A bit of clean-up Adding missing end ul to doc Moving iterator benchmarks next to enhancedFor Merge branch 'master' into dougqh/list-iteration-benchmark spotless Merge branch 'dougqh/list-iteration-benchmark' of github.com:DataDog/dd-trace-java into dougqh/list-iteration-benchmark Update internal-api/src/jmh/java/datadog/trace/util/ListIterationBenchmark.java Co-authored-by: Sarah Chen Update internal-api/src/jmh/java/datadog/trace/util/ListIterationBenchmark.java Co-authored-by: Sarah Chen Merge branch 'master' into dougqh/list-iteration-benchmark Update internal-api/src/jmh/java/datadog/trace/util/ListIterationBenchmark.java Co-authored-by: Sarah Chen Isolate per-thread collections in ListIterationBenchmark Build each thread's list (and its Elements) in a Scope.Thread @Setup so the manipulate_* mutations stay thread-local. Previously the lists lived in enum constants shared across all 8 threads, so the benchmark measured cross-thread contention on Element.num rather than iteration cost. Also bump to @Fork(2) and fix a Javadoc typo. Co-Authored-By: Claude Opus 4.8 (1M context) Merge remote-tracking branch 'origin/master' into dougqh/list-iteration-benchmark Replace stale results in ListIterationBenchmark with Java 17 numbers Drop the old (pre-per-thread-state) results table; add a condensed Java 17 block. For ArrayList the direct styles (cstyleFor/forEach/enhanced-for/iterator) cluster within ~10%; stream() is ~3.6x slower; parallelStream() is catastrophic for small lists (ForkJoinPool overhead) and erratic. Co-Authored-By: Claude Opus 4.8 (1M context) Merge branch 'master' into dougqh/list-iteration-benchmark Co-authored-by: sarahchen6 Co-authored-by: devflow.devflow-routing-intake --- .../trace/util/ListIterationBenchmark.java | 204 ++++++++++++++++++ 1 file changed, 204 insertions(+) create mode 100644 internal-api/src/jmh/java/datadog/trace/util/ListIterationBenchmark.java diff --git a/internal-api/src/jmh/java/datadog/trace/util/ListIterationBenchmark.java b/internal-api/src/jmh/java/datadog/trace/util/ListIterationBenchmark.java new file mode 100644 index 00000000000..30580f44719 --- /dev/null +++ b/internal-api/src/jmh/java/datadog/trace/util/ListIterationBenchmark.java @@ -0,0 +1,204 @@ +package datadog.trace.util; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.function.Supplier; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.CompilerControl; +import org.openjdk.jmh.annotations.CompilerControl.Mode; +import org.openjdk.jmh.annotations.Fork; +import org.openjdk.jmh.annotations.Level; +import org.openjdk.jmh.annotations.Measurement; +import org.openjdk.jmh.annotations.Param; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.Threads; +import org.openjdk.jmh.annotations.Warmup; + +/** + * Benchmark comparing different ways to iterate list of different types and sizes -- both with + * simple loop bodies (inline case) and complicated loop bodies (dont inline case). + * + *
    + * Compares... + *
  • (RECOMMENDED) enhanced for loop / iterator - usually most performant, since escape analysis + * usually eliminates iterator allocation + *
  • (SITUATIONAL) List.forEach - good when using a non-capturing lambda, when escape analysis + * fails to eliminate iterator allocation - good alternative + *
  • (SITUATIONAL) c-style i=0; i < list.size() - usually worse than enhanced for - might be + * useful with complicated loop body when escape analysis fails to eliminate the iterator + *
  • (DISCOURAGED) List.stream - always incurs allocation overhead - usually unnecessary + *
  • (DISCOURAGED) List.parallelStream - heavy allocation overhead - only beneficial when + * working with sets (uncommon in the java agent) + *
  • + *
+ * + *

Java 17 results (Apple M1, {@code @Fork(2)}, {@code @Threads(8)}; {@code ArrayList}, M ops/s = + * millions, shown at two sizes): + * Iteration style size 10 size 100 + * cstyleFor 1050 165 (fastest) + * forEach 995 163 + * enhancedFor 945 153 + * iterator 935 148 (noisier run-to-run) + * streams 158 45 (~3.6x slower; allocates) + * parallelStreams ~1 ~0.3 (catastrophic at these sizes) + * + * + *

Key findings: + * + *

    + *
  • For {@code ArrayList}, the direct styles -- {@code cstyleFor}, {@code forEach}, + * enhanced-for, and explicit {@code iterator} -- cluster within ~10% of each other; escape + * analysis eliminates the iterator allocation, so enhanced-for/iterator stay competitive + * while reading cleanest (the RECOMMENDED choice). + *
  • {@code stream()} is ~3.6x slower than direct iteration and allocates per call -- avoid on + * hot paths. + *
  • {@code parallelStream()} is catastrophic for small collections (hundreds of times slower): + * ForkJoinPool split/coordinate overhead dwarfs the work, and it is run-to-run erratic. Never + * use it for the small lists typical in the agent. + *
  • {@code _inline} vs {@code _dont_inline} loop bodies barely differ at these sizes -- the + * iteration mechanics dominate, not the body. + *
+ */ +@Fork(2) +@Warmup(iterations = 2) +@Measurement(iterations = 3) +@Threads(8) +@State(Scope.Thread) +public class ListIterationBenchmark { + public static final class Element { + int num = 0; + + @CompilerControl(Mode.INLINE) + void manipulate_inline() { + this.num += 1; + } + + @CompilerControl(Mode.DONT_INLINE) + void manipulate_dont_inline() { + this.num += 1; + } + } + + static ArrayList newArrayList(int size) { + ArrayList newList = new ArrayList<>(size); + for (int i = 0; i < size; ++i) { + newList.add(new Element()); + } + return newList; + } + + /** + * Describes the list under test as a factory rather than a prebuilt instance. Each benchmark + * thread builds its own list (with its own {@link Element}s) in {@link #setUp()}, so the {@code + * manipulate_*} mutations stay thread-local — otherwise, with {@code @Threads(8)} sharing one + * list held in an enum constant, the benchmark would measure cross-thread contention on {@code + * Element.num} rather than iteration cost. + */ + public enum ListSpec { + COLLECTIONS_EMPTY_LIST(Collections::emptyList), + EMPTY_ARRAY_LIST(ArrayList::new), + SINGLETON_LIST(() -> Collections.singletonList(new Element())), + ARRAY_LIST_1(() -> newArrayList(1)), + ARRAY_LIST_5(() -> newArrayList(5)), + ARRAY_LIST_10(() -> newArrayList(10)), + ARRAY_LIST_100(() -> newArrayList(100)); + + private final Supplier> factory; + + ListSpec(Supplier> factory) { + this.factory = factory; + } + + List build() { + return factory.get(); + } + } + + @Param ListSpec listSpec; + + List list; + + @Setup(Level.Trial) + public void setUp() { + // Built per thread (the class is @State(Scope.Thread)) so each thread owns its own Elements. + this.list = this.listSpec.build(); + } + + @Benchmark + public void forEach_inline() { + this.list.forEach(Element::manipulate_inline); + } + + @Benchmark + public void forEach_dont_inline() { + this.list.forEach(Element::manipulate_dont_inline); + } + + @Benchmark + public void enhancedFor_inline() { + // Enhanced for-loop is just syntax sugar for an Iterator + for (Element e : this.list) { + e.manipulate_inline(); + } + } + + @Benchmark + public void enhancedFor_dont_inline() { + // Enhanced for-loop is just syntax sugar for an Iterator + for (Element e : this.list) { + e.manipulate_dont_inline(); + } + } + + @Benchmark + public void iterator_inline() { + for (Iterator iter = this.list.iterator(); iter.hasNext(); ) { + iter.next().manipulate_inline(); + } + } + + @Benchmark + public void iterator_dont_inline() { + for (Iterator iter = this.list.iterator(); iter.hasNext(); ) { + iter.next().manipulate_dont_inline(); + } + } + + @Benchmark + public void cstyleFor_inline() { + for (int i = 0; i < this.list.size(); ++i) { + this.list.get(i).manipulate_inline(); + } + } + + @Benchmark + public void cstyleFor_dont_inline() { + for (int i = 0; i < this.list.size(); ++i) { + this.list.get(i).manipulate_dont_inline(); + } + } + + @Benchmark + public void streams_inline() { + this.list.stream().forEach(Element::manipulate_inline); + } + + @Benchmark + public void streams_dont_inline() { + this.list.stream().forEach(Element::manipulate_dont_inline); + } + + @Benchmark + public void parallelStreams_inline() { + this.list.parallelStream().forEach(Element::manipulate_inline); + } + + @Benchmark + public void parallelStreams_dont_inline() { + this.list.parallelStream().forEach(Element::manipulate_dont_inline); + } +} From 29af0b4898918bc46a126a220259bb8dc8e73014 Mon Sep 17 00:00:00 2001 From: mhlidd Date: Wed, 24 Jun 2026 14:09:07 -0400 Subject: [PATCH 043/139] Add OTLP Trace Metrics Configs (#11653) init adding tests Merge branch 'master' into mhlidd/otlp_trace_metrics_config bugfix fixing issue where internal DD configs are used instead of OTel equivalents Co-authored-by: devflow.devflow-routing-intake --- .../datadog/trace/api/ConfigDefaults.java | 2 + .../trace/api/config/GeneralConfig.java | 3 ++ .../datadog/trace/api/config/OtlpConfig.java | 2 + .../main/java/datadog/trace/api/Config.java | 47 +++++++++++++++++++ .../datadog/trace/api/ConfigTest.groovy | 42 +++++++++++++++++ .../OtelEnvironmentConfigSourceTest.groovy | 43 +++++++++++++++++ metadata/supported-configurations.json | 24 ++++++++++ .../provider/OtelEnvironmentConfigSource.java | 4 ++ 8 files changed, 167 insertions(+) diff --git a/dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java b/dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java index 062687a458e..061698283a7 100644 --- a/dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java +++ b/dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java @@ -115,6 +115,8 @@ public final class ConfigDefaults { static final int DEFAULT_METRICS_OTEL_TIMEOUT = 7_500; // ms static final int DEFAULT_METRICS_OTEL_CARDINALITY_LIMIT = 2_000; + static final int DEFAULT_TRACE_STATS_INTERVAL = 10_000; // ms + public static final boolean DEFAULT_METRICS_OTEL_EXPERIMENTAL_ENABLED = true; public static final int DEFAULT_OTLP_TRACES_TIMEOUT = 10_000; // ms diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/GeneralConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/GeneralConfig.java index f6d9fd7e2ba..79d3861d8ab 100644 --- a/dd-trace-api/src/main/java/datadog/trace/api/config/GeneralConfig.java +++ b/dd-trace-api/src/main/java/datadog/trace/api/config/GeneralConfig.java @@ -69,6 +69,9 @@ public final class GeneralConfig { public static final String TRACE_STATS_COMPUTATION_ENABLED = "trace.stats.computation.enabled"; public static final String TRACE_STATS_COMPUTATION_IGNORE_AGENT_VERSION = "trace.stats.computation.ignore.agent.version"; + + public static final String TRACE_OTEL_SEMANTICS_ENABLED = "trace.otel.semantics.enabled"; + public static final String TRACER_METRICS_ENABLED = "trace.tracer.metrics.enabled"; public static final String TRACER_METRICS_BUFFERING_ENABLED = "trace.tracer.metrics.buffering.enabled"; diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/OtlpConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/OtlpConfig.java index e3925dbeb40..7b9aae5d76a 100644 --- a/dd-trace-api/src/main/java/datadog/trace/api/config/OtlpConfig.java +++ b/dd-trace-api/src/main/java/datadog/trace/api/config/OtlpConfig.java @@ -31,6 +31,8 @@ public final class OtlpConfig { public static final String OTLP_METRICS_TEMPORALITY_PREFERENCE = "otlp.metrics.temporality.preference"; + public static final String TRACES_SPAN_METRICS_ENABLED = "traces.span.metrics.enabled"; + public static final String TRACE_OTEL_ENABLED = "trace.otel.enabled"; public static final String TRACE_OTEL_EXPORTER = "trace.otel.exporter"; diff --git a/internal-api/src/main/java/datadog/trace/api/Config.java b/internal-api/src/main/java/datadog/trace/api/Config.java index 605d1fdfc45..0a748caf358 100644 --- a/internal-api/src/main/java/datadog/trace/api/Config.java +++ b/internal-api/src/main/java/datadog/trace/api/Config.java @@ -186,6 +186,7 @@ import static datadog.trace.api.ConfigDefaults.DEFAULT_TRACE_RATE_LIMIT; import static datadog.trace.api.ConfigDefaults.DEFAULT_TRACE_REPORT_HOSTNAME; import static datadog.trace.api.ConfigDefaults.DEFAULT_TRACE_RESOLVER_ENABLED; +import static datadog.trace.api.ConfigDefaults.DEFAULT_TRACE_STATS_INTERVAL; import static datadog.trace.api.ConfigDefaults.DEFAULT_TRACE_X_DATADOG_TAGS_MAX_LENGTH; import static datadog.trace.api.ConfigDefaults.DEFAULT_WEBSOCKET_MESSAGES_INHERIT_SAMPLING; import static datadog.trace.api.ConfigDefaults.DEFAULT_WEBSOCKET_MESSAGES_SEPARATE_TRACES; @@ -418,6 +419,7 @@ import static datadog.trace.api.config.GeneralConfig.TRACER_METRICS_MAX_PENDING; import static datadog.trace.api.config.GeneralConfig.TRACE_DEBUG; import static datadog.trace.api.config.GeneralConfig.TRACE_LOG_LEVEL; +import static datadog.trace.api.config.GeneralConfig.TRACE_OTEL_SEMANTICS_ENABLED; import static datadog.trace.api.config.GeneralConfig.TRACE_STATS_COMPUTATION_ENABLED; import static datadog.trace.api.config.GeneralConfig.TRACE_STATS_COMPUTATION_IGNORE_AGENT_VERSION; import static datadog.trace.api.config.GeneralConfig.TRACE_TAGS; @@ -487,6 +489,7 @@ import static datadog.trace.api.config.OtlpConfig.OTLP_TRACES_HEADERS; import static datadog.trace.api.config.OtlpConfig.OTLP_TRACES_PROTOCOL; import static datadog.trace.api.config.OtlpConfig.OTLP_TRACES_TIMEOUT; +import static datadog.trace.api.config.OtlpConfig.TRACES_SPAN_METRICS_ENABLED; import static datadog.trace.api.config.OtlpConfig.TRACE_OTEL_EXPORTER; import static datadog.trace.api.config.ProfilingConfig.PROFILING_AGENTLESS; import static datadog.trace.api.config.ProfilingConfig.PROFILING_AGENTLESS_DEFAULT; @@ -997,6 +1000,9 @@ public static String getHostName() { private final int otlpMetricsTimeout; private final OtlpConfig.Temporality otlpMetricsTemporalityPreference; + private final boolean tracesSpanMetricsEnabled; + private final boolean traceOtelSemanticsEnabled; + private final String traceOtelExporter; private final String otlpTracesEndpoint; private final Map otlpTracesHeaders; @@ -1015,6 +1021,7 @@ public static String getHostName() { private final boolean tracerMetricsBufferingEnabled; private final int tracerMetricsMaxAggregates; private final int tracerMetricsMaxPending; + private final int traceStatsInterval; private final boolean reportHostName; @@ -2121,6 +2128,16 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins OtlpConfig.Temporality.class, OtlpConfig.Temporality.DELTA); + traceOtelSemanticsEnabled = configProvider.getBoolean(TRACE_OTEL_SEMANTICS_ENABLED, false); + // Tri-state default: when unset, SDK-computed OTLP span metrics are emitted iff OTLP trace + // export and OTLP metrics export are both enabled. + tracesSpanMetricsEnabled = + configProvider.getBoolean( + TRACES_SPAN_METRICS_ENABLED, + isTraceOtlpExporterEnabled() + && isMetricsOtelEnabled() + && isMetricsOtlpExporterEnabled()); + otlpTimeout = configProvider.getInteger(OTLP_TRACES_TIMEOUT, DEFAULT_OTLP_TRACES_TIMEOUT); if (otlpTimeout < 0) { log.warn("Invalid OTLP traces timeout: {}. The value must be positive", otlpTimeout); @@ -2200,6 +2217,18 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins configProvider.getBoolean(TRACE_STATS_COMPUTATION_IGNORE_AGENT_VERSION, false); tracerMetricsBufferingEnabled = configProvider.getBoolean(TRACER_METRICS_BUFFERING_ENABLED, false); + // Internal, test-only override of the stats flush interval. Read directly from the + // underscore-prefixed env var so it bypasses config-inversion validation and telemetry. + int statsInterval = DEFAULT_TRACE_STATS_INTERVAL; + String statsIntervalOverride = ConfigHelper.env("_DD_TRACE_STATS_INTERVAL"); + if (statsIntervalOverride != null) { + try { + statsInterval = Integer.parseInt(statsIntervalOverride); + } catch (NumberFormatException ignored) { + // fall back to the default + } + } + traceStatsInterval = statsInterval; // The metrics inbox is an MpscArrayQueue; each saturated slot holds one // ~120 B SpanSnapshot. The historical default TRACER_METRICS_MAX_PENDING=2048 (logical) * // LEGACY_BATCH_SIZE=64 = 131072 slots was sized for the prior conflating-Batch model where @@ -3831,6 +3860,10 @@ public int getTracerMetricsMaxPending() { return tracerMetricsMaxPending; } + public int getTraceStatsInterval() { + return traceStatsInterval; + } + public boolean isLogsInjectionEnabled() { return logsInjectionEnabled; } @@ -5575,6 +5608,14 @@ public OtlpConfig.Temporality getOtlpMetricsTemporalityPreference() { return otlpMetricsTemporalityPreference; } + public boolean isTracesSpanMetricsEnabled() { + return tracesSpanMetricsEnabled; + } + + public boolean isTraceOtelSemanticsEnabled() { + return traceOtelSemanticsEnabled; + } + public boolean isTraceOtelEnabled() { return instrumenterConfig.isTraceOtelEnabled(); } @@ -6681,6 +6722,12 @@ public String toString() { + otlpMetricsTimeout + ", otlpMetricsTemporalityPreference=" + otlpMetricsTemporalityPreference + + ", tracesSpanMetricsEnabled=" + + tracesSpanMetricsEnabled + + ", traceOtelSemanticsEnabled=" + + traceOtelSemanticsEnabled + + ", traceStatsInterval=" + + traceStatsInterval + ", traceOtelExporter=" + traceOtelExporter + ", otlpTracesEndpoint=" diff --git a/internal-api/src/test/groovy/datadog/trace/api/ConfigTest.groovy b/internal-api/src/test/groovy/datadog/trace/api/ConfigTest.groovy index faa4d04311e..7db955e49ae 100644 --- a/internal-api/src/test/groovy/datadog/trace/api/ConfigTest.groovy +++ b/internal-api/src/test/groovy/datadog/trace/api/ConfigTest.groovy @@ -53,6 +53,7 @@ import static datadog.trace.api.config.GeneralConfig.SSI_INJECTION_ENABLED import static datadog.trace.api.config.GeneralConfig.SSI_INJECTION_FORCE import static datadog.trace.api.config.GeneralConfig.TAGS import static datadog.trace.api.config.GeneralConfig.TRACER_METRICS_IGNORED_RESOURCES +import static datadog.trace.api.config.GeneralConfig.TRACE_OTEL_SEMANTICS_ENABLED import static datadog.trace.api.config.GeneralConfig.VERSION import static datadog.trace.api.config.JmxFetchConfig.JMX_FETCH_CHECK_PERIOD import static datadog.trace.api.config.JmxFetchConfig.JMX_FETCH_ENABLED @@ -137,6 +138,7 @@ import static datadog.trace.api.config.OtlpConfig.Protocol.HTTP_JSON import static datadog.trace.api.config.OtlpConfig.Temporality.CUMULATIVE import static datadog.trace.api.config.OtlpConfig.Temporality.DELTA import static datadog.trace.api.config.OtlpConfig.METRICS_OTEL_ENABLED +import static datadog.trace.api.config.OtlpConfig.METRICS_OTEL_EXPORTER import static datadog.trace.api.config.OtlpConfig.METRICS_OTEL_INTERVAL import static datadog.trace.api.config.OtlpConfig.METRICS_OTEL_TIMEOUT import static datadog.trace.api.config.OtlpConfig.OTLP_METRICS_ENDPOINT @@ -148,7 +150,9 @@ import static datadog.trace.api.config.OtlpConfig.OTLP_TRACES_ENDPOINT import static datadog.trace.api.config.OtlpConfig.OTLP_TRACES_HEADERS import static datadog.trace.api.config.OtlpConfig.OTLP_TRACES_PROTOCOL import static datadog.trace.api.config.OtlpConfig.OTLP_TRACES_TIMEOUT +import static datadog.trace.api.config.OtlpConfig.TRACES_SPAN_METRICS_ENABLED import static datadog.trace.api.config.OtlpConfig.TRACE_OTEL_ENABLED +import static datadog.trace.api.config.OtlpConfig.TRACE_OTEL_EXPORTER import datadog.trace.config.inversion.ConfigHelper import datadog.trace.api.env.FixedCapturedEnvironment @@ -555,6 +559,10 @@ class ConfigTest extends DDSpecification { config.otlpTracesHeaders == [:] config.otlpTracesProtocol == HTTP_PROTOBUF config.otlpTracesTimeout == 10000 + + !config.tracesSpanMetricsEnabled + !config.traceOtelSemanticsEnabled + config.traceStatsInterval == 10000 } def "otel: check syntax for OTLP headers"() { @@ -715,6 +723,36 @@ class ConfigTest extends DDSpecification { config.otlpTracesEndpoint == "http://localhost:4318/v1/traces" } + def "traces span metrics tri-state default: exporter=#exporter metricsEnabled=#metricsEnabled metricsExporter=#metricsExporter override=#override"() { + setup: + System.setProperty(PREFIX + TRACE_OTEL_EXPORTER, exporter) + System.setProperty(PREFIX + METRICS_OTEL_ENABLED, metricsEnabled) + if (metricsExporter != null) { + System.setProperty(PREFIX + METRICS_OTEL_EXPORTER, metricsExporter) + } + if (override != null) { + System.setProperty(PREFIX + TRACES_SPAN_METRICS_ENABLED, override) + } + + when: + Config config = new Config() + + then: + // Unset: emit iff OTLP trace export and OTLP metrics export are both on. An explicit + // dd.traces.span.metrics.enabled always wins. + config.tracesSpanMetricsEnabled == expected + + where: + exporter | metricsEnabled | metricsExporter | override | expected + "otlp" | "true" | null | null | true // metrics defaults to otlp + "otlp" | "true" | "otlp" | null | true + "otlp" | "true" | "none" | null | false // metrics exporter explicitly disabled + "otlp" | "false" | "otlp" | null | false // metrics feature flag off overrides exporter + "none" | "true" | null | null | false + "none" | "true" | "otlp" | null | false + "none" | "false" | "none" | "true" | true // explicit override wins + "otlp" | "true" | "otlp" | "false" | false // explicit override wins + } def "specify overrides via system properties"() { setup: @@ -831,6 +869,7 @@ class ConfigTest extends DDSpecification { System.setProperty(OTEL_EXPORTER_OTLP_TRACES_PROTOCOL_PROP, "http/protobuf") System.setProperty(OTEL_EXPORTER_OTLP_TRACES_TIMEOUT_PROP, "5002") System.setProperty(OTEL_RESOURCE_ATTRIBUTES_PROP, "service.name=my=app,service.version=1.0.0,deployment.environment=production") + System.setProperty(PREFIX + TRACE_OTEL_SEMANTICS_ENABLED, "true") when: Config config = new Config() @@ -953,6 +992,9 @@ class ConfigTest extends DDSpecification { config.otlpTracesHeaders["traces-config-value"] == "T" config.otlpTracesProtocol == HTTP_PROTOBUF config.otlpTracesTimeout == 5002 + + config.traceOtelSemanticsEnabled + config.tracesSpanMetricsEnabled // tri-state default: OTLP trace export + OTel metrics both on } def "specify overrides via env vars"() { diff --git a/internal-api/src/test/groovy/datadog/trace/bootstrap/config/provider/OtelEnvironmentConfigSourceTest.groovy b/internal-api/src/test/groovy/datadog/trace/bootstrap/config/provider/OtelEnvironmentConfigSourceTest.groovy index 537345a2b23..783df9e76f4 100644 --- a/internal-api/src/test/groovy/datadog/trace/bootstrap/config/provider/OtelEnvironmentConfigSourceTest.groovy +++ b/internal-api/src/test/groovy/datadog/trace/bootstrap/config/provider/OtelEnvironmentConfigSourceTest.groovy @@ -9,6 +9,7 @@ import static datadog.trace.api.config.GeneralConfig.RUNTIME_METRICS_ENABLED import static datadog.trace.api.config.GeneralConfig.SERVICE_NAME import static datadog.trace.api.config.GeneralConfig.TAGS import static datadog.trace.api.config.GeneralConfig.VERSION +import static datadog.trace.api.config.OtlpConfig.TRACES_SPAN_METRICS_ENABLED import static datadog.trace.api.config.OtlpConfig.TRACE_OTEL_ENABLED import static datadog.trace.api.config.OtlpConfig.TRACE_OTEL_EXPORTER import static datadog.trace.api.config.TraceInstrumentationConfig.TRACE_ENABLED @@ -258,6 +259,48 @@ class OtelEnvironmentConfigSourceTest extends DDSpecification { source.get(TRACE_OTEL_EXPORTER) == 'otlp' } + def "otel traces span metrics enabled system property is mapped when otel is enabled"() { + setup: + injectSysConfig('dd.trace.otel.enabled', 'true', false) + injectSysConfig('otel.traces.span.metrics.enabled', value, false) + + when: + def source = new OtelEnvironmentConfigSource() + + then: + source.get(TRACES_SPAN_METRICS_ENABLED) == value + + where: + value << ['true', 'false'] + } + + def "otel traces span metrics enabled environment variable is mapped when otel is enabled"() { + setup: + injectEnvConfig('DD_TRACE_OTEL_ENABLED', 'true', false) + injectEnvConfig('OTEL_TRACES_SPAN_METRICS_ENABLED', value, false) + + when: + def source = new OtelEnvironmentConfigSource() + + then: + source.get(TRACES_SPAN_METRICS_ENABLED) == value + + where: + value << ['true', 'false'] + } + + def "otel traces span metrics enabled is not mapped when otel is disabled"() { + setup: + // Without dd.trace.otel.enabled, setupTraceOtelEnvironment() does not run. + injectSysConfig('otel.traces.span.metrics.enabled', 'true', false) + + when: + def source = new OtelEnvironmentConfigSource() + + then: + source.get(TRACES_SPAN_METRICS_ENABLED) == null + } + def "otel traces exporter none still disables tracing"() { setup: injectEnvConfig('DD_TRACE_OTEL_ENABLED', 'true', false) diff --git a/metadata/supported-configurations.json b/metadata/supported-configurations.json index e3406d024e6..ae081138b71 100644 --- a/metadata/supported-configurations.json +++ b/metadata/supported-configurations.json @@ -8609,6 +8609,22 @@ "aliases": [] } ], + "DD_TRACE_OTEL_SEMANTICS_ENABLED": [ + { + "version": "A", + "type": "boolean", + "default": "false", + "aliases": [] + } + ], + "DD_TRACES_SPAN_METRICS_ENABLED": [ + { + "version": "A", + "type": "boolean", + "default": null, + "aliases": [] + } + ], "DD_TRACE_ORG_GUARD_ENABLED": [ { "version": "A", @@ -11601,6 +11617,14 @@ "aliases": [] } ], + "OTEL_TRACES_SPAN_METRICS_ENABLED": [ + { + "version": "A", + "type": "boolean", + "default": null, + "aliases": [] + } + ], "OTEL_TRACES_SAMPLER_ARG": [ { "version": "C", diff --git a/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/OtelEnvironmentConfigSource.java b/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/OtelEnvironmentConfigSource.java index 4d923dead01..1aea89c9a2d 100644 --- a/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/OtelEnvironmentConfigSource.java +++ b/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/OtelEnvironmentConfigSource.java @@ -37,6 +37,7 @@ import static datadog.trace.api.config.OtlpConfig.OTLP_TRACES_HEADERS; import static datadog.trace.api.config.OtlpConfig.OTLP_TRACES_PROTOCOL; import static datadog.trace.api.config.OtlpConfig.OTLP_TRACES_TIMEOUT; +import static datadog.trace.api.config.OtlpConfig.TRACES_SPAN_METRICS_ENABLED; import static datadog.trace.api.config.OtlpConfig.TRACE_OTEL_ENABLED; import static datadog.trace.api.config.OtlpConfig.TRACE_OTEL_EXPORTER; import static datadog.trace.api.config.TraceInstrumentationConfig.TRACE_ENABLED; @@ -161,6 +162,9 @@ private void setupTraceOtelEnvironment() { capture(REQUEST_HEADER_TAGS, mapHeaderTags("http.request.header.", requestHeaders)); capture(RESPONSE_HEADER_TAGS, mapHeaderTags("http.response.header.", responseHeaders)); capture(TRACE_EXTENSIONS_PATH, extensions); + capture( + TRACES_SPAN_METRICS_ENABLED, + getOtelProperty("otel.traces.span.metrics.enabled", "dd." + TRACES_SPAN_METRICS_ENABLED)); String exporter = getOtelProperty("otel.traces.exporter"); if ("otlp".equalsIgnoreCase(exporter)) { // traces defaults to non-OTLP (i.e. datadog) From 0ac2d5498f73d0eeb3a1b531333f74e66bc4c835 Mon Sep 17 00:00:00 2001 From: Douglas Q Hawkins Date: Wed, 24 Jun 2026 19:33:38 -0400 Subject: [PATCH 044/139] Adding lighter String processing methods to Strings (#10640) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adding to StringUtiils - fast replaceAll for a fixed string & replacement, 3x throughput compared to regex based solutions, 1/2x allocation compared to regex solutions - added SubSequence which provides a view into a subsequence of a String without incurring extra allocation - Strings.spliit returns an Iterable can be used to do light weight processing of a String Checking hashCode Reducing whitespace Fixing ugly spotless formatting Fixing ugly spotless formatting Renaming benchmark method Clarifying Javadoc grammar Allowing forbidden API usage These benchmarks exist to show why the APIs are forbidden Merge branch 'master' into dougqh/strings-improvements Merge branch 'master' into dougqh/strings-improvements Adding String.replace to the benchmark grammar Added comment explaining implementation approach Clean-up imports spotless Merge branch 'master' into dougqh/strings-improvements Fixing package after moving code from stand-alone reproduction Merge branch 'dougqh/strings-improvements' of github.com:DataDog/dd-trace-java into dougqh/strings-improvements Add motivation to SubSequence Javadoc (why avoid the substring allocation) Per bric3 review: the doc said what SubSequence avoids allocating but not why it matters. Explain the use case — allocation-free lightweight parsing: substring/ subSequence copy per call, so splitting a string into many pieces on a hot path allocates O(pieces) Strings; SubSequence is a zero-copy view. Also fixes a typo. Co-Authored-By: Claude Opus 4.8 (1M context) Merge remote-tracking branch 'origin/master' into dougqh/strings-improvements Merge branch 'master' into dougqh/strings-improvements Co-authored-by: devflow.devflow-routing-intake --- .../trace/util/StringReplaceAllBenchmark.java | 109 +++++++++++++ .../trace/util/StringSplitBenchmark.java | 94 +++++++++++ .../util/StringSubSequenceBenchmark.java | 64 ++++++++ .../main/java/datadog/trace/util/Strings.java | 147 ++++++++++++++++++ .../java/datadog/trace/util/SubSequence.java | 124 +++++++++++++++ .../java/datadog/trace/util/StringsTest2.java | 116 ++++++++++++++ .../datadog/trace/util/SubSequenceTest.java | 111 +++++++++++++ 7 files changed, 765 insertions(+) create mode 100644 internal-api/src/jmh/java/datadog/trace/util/StringReplaceAllBenchmark.java create mode 100644 internal-api/src/jmh/java/datadog/trace/util/StringSplitBenchmark.java create mode 100644 internal-api/src/jmh/java/datadog/trace/util/StringSubSequenceBenchmark.java create mode 100644 internal-api/src/main/java/datadog/trace/util/SubSequence.java create mode 100644 internal-api/src/test/java/datadog/trace/util/StringsTest2.java create mode 100644 internal-api/src/test/java/datadog/trace/util/SubSequenceTest.java diff --git a/internal-api/src/jmh/java/datadog/trace/util/StringReplaceAllBenchmark.java b/internal-api/src/jmh/java/datadog/trace/util/StringReplaceAllBenchmark.java new file mode 100644 index 00000000000..492b56bb654 --- /dev/null +++ b/internal-api/src/jmh/java/datadog/trace/util/StringReplaceAllBenchmark.java @@ -0,0 +1,109 @@ +package datadog.trace.util; + +import de.thetaphi.forbiddenapis.SuppressForbidden; +import java.util.regex.Pattern; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.Fork; +import org.openjdk.jmh.annotations.Measurement; +import org.openjdk.jmh.annotations.Threads; +import org.openjdk.jmh.annotations.Warmup; + +/** + *

For simple replacements, Strings.replaceAll is recommened. + * + *

+ * For simple replacements, Strings.replaceAll or String.replace out performs the regex based + * methods String.replaceAll and regex.Matcher.replaceAll by 3x in terms of throughput. + * + *

String.replace and Strings.replaceAll also require less allocation. + * + *

Strings.replaceAll out performs String.replace by 1.2x in terms of throughput, + * but results may vary depending on the JVM version being used. + * + *

When pattern matching is needed, compiling the regex to Pattern slightly improves overhead, + * but dramatically reduces memory allocation to 1/4x of String.replaceAll. + * MacBook M1 with 8 threads (Java 21) + * + * + * MacBook M1 - 8 Threads - Java 21 + * + * StringReplaceAllBenchmark.regex_replaceAll thrpt 6 15500559.098 ± 8640183.754 ops/s + * StringReplaceAllBenchmark.regex_replaceAll:gc.alloc.rate thrpt 6 4516.464 ± 2561.063 MB/sec + * + * StringReplaceAllBenchmark.string_replace thrpt 6 35429131.963 ± 3203548.932 ops/s + * StringReplaceAllBenchmark.string_replace:gc.alloc.rate thrpt 6 3185.108 ± 152.601 MB/sec + * + * StringReplaceAllBenchmark.string_replaceAll thrpt 6 14253964.929 ± 4060225.866 ops/s + * StringReplaceAllBenchmark.string_replaceAll:gc.alloc.rate thrpt 6 11114.939 ± 3129.891 MB/sec + * + * StringReplaceAllBenchmark.strings_replaceAll thrpt 6 43789250.524 ± 1910948.420 ops/s + * StringReplaceAllBenchmark.strings_replaceAll:gc.alloc.rate thrpt 6 3079.973 ± 134.617 MB/sec + * + */ +@Fork(2) +@Warmup(iterations = 2) +@Measurement(iterations = 3) +@Threads(8) +@SuppressForbidden +public class StringReplaceAllBenchmark { + static final String[] INPUTS = { + "foo", + "baz", + "foobar", + "foobaz", + "foo=baz", + "bar=foo", + "foo=foo&bar=foo", + "lorem ipsum", + "datadog" + }; + + static int sharedInputIndex = 0; + + static String nextInput() { + int localIndex = ++sharedInputIndex; + if (localIndex >= INPUTS.length) { + sharedInputIndex = localIndex = 0; + } + return INPUTS[localIndex]; + } + + @Benchmark + public String string_replaceAll() { + return _string_replaceAll(nextInput()); + } + + static String _string_replaceAll(String input) { + // Underneath, this does Pattern.compile("foo").matcher(str).replaceAll() + return input.replaceAll("foo", "*redacted*"); + } + + @Benchmark + public String string_replace() { + return _string_replace(nextInput()); + } + + static String _string_replace(String input) { + return input.replace("foo", "*redacted*"); + } + + static final Pattern REGEX_COMPILED = Pattern.compile("foo"); + + @Benchmark + public String regex_replaceAll() { + return _regex_replaceAll(nextInput()); + } + + static String _regex_replaceAll(String input) { + return REGEX_COMPILED.matcher(input).replaceAll("*redcated*"); + } + + @Benchmark + public String strings_replaceAll() { + return _strings_replaceAll(nextInput()); + } + + static String _strings_replaceAll(String input) { + return Strings.replaceAll(input, "foo", "*redacted*"); + } +} diff --git a/internal-api/src/jmh/java/datadog/trace/util/StringSplitBenchmark.java b/internal-api/src/jmh/java/datadog/trace/util/StringSplitBenchmark.java new file mode 100644 index 00000000000..584c375cdea --- /dev/null +++ b/internal-api/src/jmh/java/datadog/trace/util/StringSplitBenchmark.java @@ -0,0 +1,94 @@ +package datadog.trace.util; + +import de.thetaphi.forbiddenapis.SuppressForbidden; +import java.util.regex.Pattern; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.Fork; +import org.openjdk.jmh.annotations.Measurement; +import org.openjdk.jmh.annotations.Param; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.Threads; +import org.openjdk.jmh.annotations.Warmup; +import org.openjdk.jmh.infra.Blackhole; + +/** + * Strings.split is generally faster for String processing, since it creates SubSequences that are + * views into the backing String rather than new String objects. + * Benchmark (testStr) Mode Cnt Score Error Units + * StringSplitBenchmark.pattern_split EMPTY thrpt 6 291274421.621 ± 14834420.899 ops/s + * StringSplitBenchmark.string_split EMPTY thrpt 6 1035461179.368 ± 60212686.921 ops/s + * StringSplitBenchmark.strings_split EMPTY thrpt 6 8161781738.019 ± 178530888.497 ops/s + * + * StringSplitBenchmark.pattern_split TRIVIAL thrpt 6 83982270.075 ± 10250565.633 ops/s + * StringSplitBenchmark.string_split TRIVIAL thrpt 6 848615850.339 ± 42453569.634 ops/s + * StringSplitBenchmark.strings_split TRIVIAL thrpt 6 1765290890.948 ± 160053487.111 ops/s + * + * StringSplitBenchmark.pattern_split SMALL thrpt 6 27383819.756 ± 5454020.100 ops/s + * StringSplitBenchmark.string_split SMALL thrpt 6 149047480.037 ± 6124271.615 ops/s + * StringSplitBenchmark.strings_split SMALL thrpt 6 564058097.162 ± 49305418.971 ops/s + * + * StringSplitBenchmark.pattern_split MEDIUM thrpt 6 14879131.729 ± 1981850.920 ops/s + * StringSplitBenchmark.string_split MEDIUM thrpt 6 51237769.598 ± 1808521.138 ops/s + * StringSplitBenchmark.strings_split MEDIUM thrpt 6 176976970.705 ± 6813886.658 ops/s + * + * StringSplitBenchmark.pattern_split LARGE thrpt 6 482340.838 ± 24903.187 ops/s + * StringSplitBenchmark.string_split LARGE thrpt 6 2460212.879 ± 86911.652 ops/s + * StringSplitBenchmark.strings_split LARGE thrpt 6 4023658.103 ± 30305.699 ops/s + * + */ +@Fork(2) +@Warmup(iterations = 2) +@Measurement(iterations = 3) +@Threads(8) +@State(Scope.Benchmark) +@SuppressForbidden +public class StringSplitBenchmark { + public enum TestString { + EMPTY(""), + TRIVIAL("app_key=1111"), + SMALL("app_key=1111&foo=bar&baz=quux"), + MEDIUM(repeat("app_key=1111", '&', 100)), + LARGE(repeat("app_key=1111&application_key=2222&token=0894-4832", '&', 4096)); + + final String str; + + TestString(String str) { + this.str = str; + } + }; + + @Param TestString testStr; + + static final String repeat(String repeat, char separator, int length) { + StringBuilder builder = new StringBuilder(length); + builder.append(repeat); + while (builder.length() + repeat.length() + 1 < length) { + builder.append(separator).append(repeat); + } + return builder.toString(); + } + + @Benchmark + public void string_split(Blackhole bh) { + for (String substr : this.testStr.str.split("\\&")) { + bh.consume(substr); + } + } + + static final Pattern PATTERN = Pattern.compile("\\&"); + + @Benchmark + public void pattern_split(Blackhole bh) { + for (String str : PATTERN.split(this.testStr.str)) { + bh.consume(str); + } + } + + @Benchmark + public void strings_split(Blackhole bh) { + for (SubSequence subSeq : Strings.split(this.testStr.str, '&')) { + bh.consume(subSeq); + } + } +} diff --git a/internal-api/src/jmh/java/datadog/trace/util/StringSubSequenceBenchmark.java b/internal-api/src/jmh/java/datadog/trace/util/StringSubSequenceBenchmark.java new file mode 100644 index 00000000000..d24755e950b --- /dev/null +++ b/internal-api/src/jmh/java/datadog/trace/util/StringSubSequenceBenchmark.java @@ -0,0 +1,64 @@ +package datadog.trace.util; + +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.Fork; +import org.openjdk.jmh.annotations.Measurement; +import org.openjdk.jmh.annotations.Threads; +import org.openjdk.jmh.annotations.Warmup; +import org.openjdk.jmh.infra.Blackhole; + +/** + * Strings.substring has 5x throughput. This is primarily achieved through less allocation. + * + *

NOTE: The higher allocation rate is misleading because 5x the work was performed. After + * accounting for the 5x throughput difference, the actual allocation rate is 0.25x that of + * String.substring or String.subSequence / SubSequence.of. + * Benchmark Mode Cnt Score Error Units + * StringSubSequenceBenchmark.string_subSequence thrpt 6 140369998.493 ± 4387855.861 ops/s + * StringSubSequenceBenchmark.string_subSequence:gc.alloc.rate thrpt 6 88880.463 ± 2778.032 MB/sec + * + * StringSubSequenceBenchmark.string_substring thrpt 6 136916708.207 ± 12299226.575 ops/s + * StringSubSequenceBenchmark.string_substring:gc.alloc.rate thrpt 6 86689.852 ± 7777.642 MB/sec + * + * StringSubSequenceBenchmark.subSequence thrpt 6 679669385.260 ± 7194043.619 ops/s + * StringSubSequenceBenchmark.subSequence:gc.alloc.rate thrpt 6 103702.745 ± 1095.741 MB/sec + * + */ +@Fork(2) +@Warmup(iterations = 2) +@Measurement(iterations = 3) +@Threads(8) +public class StringSubSequenceBenchmark { + static final String LOREM_IPSUM = + "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."; + + @Benchmark + public void string_substring(Blackhole bh) { + String str = LOREM_IPSUM; + int len = str.length(); + + for (int i = 0; i < str.length(); i += 100) { + bh.consume(str.substring(i, Math.min(i + 100, len))); + } + } + + @Benchmark + public void string_subSequence(Blackhole bh) { + String str = LOREM_IPSUM; + int len = str.length(); + + for (int i = 0; i < str.length(); i += 100) { + bh.consume(str.subSequence(i, Math.min(i + 100, len))); + } + } + + @Benchmark + public void subSequence(Blackhole bh) { + String str = LOREM_IPSUM; + int len = str.length(); + + for (int i = 0; i < str.length(); i += 100) { + bh.consume(SubSequence.of(str, i, Math.min(i + 100, len))); + } + } +} diff --git a/internal-api/src/main/java/datadog/trace/util/Strings.java b/internal-api/src/main/java/datadog/trace/util/Strings.java index adf54c90fb2..df339d65bac 100644 --- a/internal-api/src/main/java/datadog/trace/util/Strings.java +++ b/internal-api/src/main/java/datadog/trace/util/Strings.java @@ -6,6 +6,9 @@ import java.nio.charset.StandardCharsets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; +import java.util.Collections; +import java.util.Iterator; +import java.util.NoSuchElementException; import java.util.concurrent.ThreadLocalRandom; import javax.annotation.Nullable; @@ -193,4 +196,148 @@ public static String coalesce(@Nullable final String first, @Nullable final Stri return null; } } + + /** Low overhead replaceAll */ + public static final String replaceAll(String input, String needle, String replacement) { + int index = input.indexOf(needle); + if (index == -1) return input; + + int needleLen = needle.length(); + + StringBuilder builder = new StringBuilder(input.length() + 10); + builder.append(input, 0, index); + builder.append(replacement); + + int prevIndex = index; + index = input.indexOf(needle, index + needleLen); + for (; index != -1; prevIndex = index, index = input.indexOf(needle, index + needleLen)) { + builder.append(input, prevIndex + needleLen, index); + builder.append(replacement); + } + builder.append(input, prevIndex + needleLen, input.length()); + + return builder.toString(); + } + + /** + * Provides a SubSequence which a view into the provided String Unlike String.subSequence (which + * is usually just a wrapper around String.substring), this routine doesn't allocate a new String + * or byte[]/char[]. + */ + public static final SubSequence subSequence(String str, int beginIndex) { + return new SubSequence(str, beginIndex, str.length()); + } + + /** + * Provides a SubSequence which a view into the provided String Unlike String.subSequence (which + * is usually just a wrapper around String.substring), this routine doesn't allocate a new + * String or byte[] / char[]. + */ + public static final SubSequence subSequence(String str, int beginIndex, int endIndex) { + return new SubSequence(str, beginIndex, endIndex); + } + + /** + * Provides an Iterable where the sub-sequences are separated by splitChar + * . Unlike other approaches to splitting, this routine doesn't allocate any new + * String or byte[] / char[] + */ + public static final Iterable split(String str, char splitChar) { + if (str.isEmpty()) { + return Collections.emptyList(); + } + + int firstIndex = str.indexOf(splitChar); + if (firstIndex == -1) { + return Collections.singletonList(subSequence(str, 0)); + } + + return new SplitIterable(str, splitChar, firstIndex); + } + + static final class SplitIterable implements Iterable { + private final String str; + private final int len; + private final char splitChar; + private final int firstIndex; + + SplitIterable(String str, char splitChar, int firstIndex) { + this.str = str; + this.len = str.length(); + this.splitChar = splitChar; + this.firstIndex = firstIndex; + } + + @Override + public SplitIterator iterator() { + return new SplitIterator(this.str, this.len, this.splitChar, this.firstIndex); + } + } + + static final class SplitIterator implements Iterator { + private final String str; + private final int len; + private final char splitChar; + + private int curIndex; + private int nextIndex; + + SplitIterator(String str, int len, char splitChar, int firstIndex) { + this.str = str; + this.len = len; + this.splitChar = splitChar; + + this.curIndex = 0; + this.nextIndex = firstIndex == -1 ? len : firstIndex; + } + + @Override + public boolean hasNext() { + return (this.curIndex <= this.len); + } + + @Override + public SubSequence next() { + int curIndex = this.curIndex; + int len = this.len; + + if (curIndex > len) throw new NoSuchElementException(); + + // NOTE: Experimented with returning a single mutable SubSequence + // where the index range is updated each time. In typical usage, + // that was slightly worse -- likely because escape analysis was + // able to eliminate the allocation, but that hasn't been directly + // confirmed. + SubSequence subSeq; + + int nextIndex = this.nextIndex; + if (nextIndex == len - 1) { + // Handles the case where there's a trailing separator, + // curIndex is moved to len to represent the empty string + // after the trailing separator + + // Next call then goes into the special case below + subSeq = new SubSequence(this.str, curIndex, nextIndex); + this.curIndex = len; + this.nextIndex = len; + } else if (curIndex == len) { + // Handles the empty string after the trailing separator + // curIndex is given the terminating value `len + 1` + + // Don't use SubSequence.EMPTY because it wouldn't have + // the correct beginIndex + subSeq = new SubSequence(this.str, len, len); + this.curIndex = len + 1; + } else { + subSeq = new SubSequence(this.str, curIndex, nextIndex); + + // core advancing logic + this.curIndex = nextIndex + 1; + int searchIndex = this.str.indexOf(this.splitChar, nextIndex + 1); + this.nextIndex = (searchIndex == -1) ? len : searchIndex; + } + + return subSeq; + } + } } diff --git a/internal-api/src/main/java/datadog/trace/util/SubSequence.java b/internal-api/src/main/java/datadog/trace/util/SubSequence.java new file mode 100644 index 00000000000..3cda505d1db --- /dev/null +++ b/internal-api/src/main/java/datadog/trace/util/SubSequence.java @@ -0,0 +1,124 @@ +package datadog.trace.util; + +/** + * A CharSequence that is a view into a sub-sequence of a String. Unlike + * String.subSequence, this class doesn't allocate an additional String, + * char[], or byte[]. + * + *

Why that matters: String.substring / subSequence copy the selected + * range into a fresh backing array on every call, so scanning or splitting a string into many + * pieces — parsing headers, tags, or query strings on a hot path — allocates one intermediate + * String per slice. A SubSequence is a zero-copy window over the original + * (an offset + length into the existing backing array), so the same parse allocates nothing per + * slice. Use it for transient, read-only views; materialize a real String only when + * the value must be retained or handed off. + */ +public final class SubSequence implements CharSequence { + public static final SubSequence EMPTY = new SubSequence("", 0, 0); + + /** + * SubSequence from beginIndex to end of str Equivalent to + * str.subSequence(str, startIndex) + */ + public static final SubSequence of(String str, int startIndex) { + return new SubSequence(str, startIndex, str.length()); + } + + /** + * SubSequence from beginIndex inclusive to endIndex exclusive of + * str Equivalent to str.subSequence(str, startIndex, endIndex) + */ + public static final SubSequence of(String str, int startIndex, int endIndex) { + return new SubSequence(str, startIndex, endIndex); + } + + private final String str; + private final int beginIndex; + private final int endIndex; + + private String cachedSubstr = null; + + SubSequence(String str, int startIndex, int endIndex) { + this.str = str; + this.beginIndex = startIndex; + this.endIndex = endIndex; + } + + /** Beginning index of the subseqence in the backing String - can be useful in text processing */ + public int beginIndex() { + return this.beginIndex; + } + + /** Ending index of the subsequence in the backing String - can be useful in text processing */ + public int endIndex() { + return this.endIndex; + } + + @Override + public char charAt(int index) { + return this.str.charAt(this.beginIndex + index); + } + + @Override + public int length() { + return this.endIndex - this.beginIndex; + } + + @Override + public SubSequence subSequence(int start, int end) { + int newBeginIndex = this.beginIndex + start; + int newEndIndex = this.beginIndex + start + end; + + return new SubSequence(this.str, newBeginIndex, newEndIndex); + } + + /** Appends this SubSequence to the StringBuilder Equivalent to builder.append(this) but faster */ + public void appendTo(StringBuilder builder) { + int beginIndex = this.beginIndex; + int endIndex = this.endIndex; + + // Guards against the special case empty SubSequence at this.str.length + if (beginIndex != endIndex) builder.append(this.str, beginIndex, endIndex); + } + + /** Returns the hash code as backingStr.substr(beginIndex, endIndex).hashCode() */ + @Override + public int hashCode() { + return this.toString().hashCode(); + } + + /** + * Also handles String comparisons this.equals(backingStr.substr(beginIndex, endIndex)) is true + */ + @Override + public boolean equals(Object obj) { + if (!(obj instanceof CharSequence)) return false; + + return this.equals((CharSequence) obj); + } + + public final boolean equals(CharSequence that) { + int thisLen = this.length(); + int thatLen = that.length(); + + if (thisLen != thatLen) return false; + + for (int i = 0; i < Math.min(this.length(), that.length()); ++i) { + if (this.charAt(i) != that.charAt(i)) return false; + } + return true; + } + + @Override + public String toString() { + String cached = this.cachedSubstr; + if (cached != null) return cached; + + int beginIndex = this.beginIndex; + int endIndex = this.endIndex; + + String substr = (beginIndex == endIndex) ? "" : this.str.substring(beginIndex, endIndex); + this.cachedSubstr = substr; + return substr; + } +} diff --git a/internal-api/src/test/java/datadog/trace/util/StringsTest2.java b/internal-api/src/test/java/datadog/trace/util/StringsTest2.java new file mode 100644 index 00000000000..c949da41a5d --- /dev/null +++ b/internal-api/src/test/java/datadog/trace/util/StringsTest2.java @@ -0,0 +1,116 @@ +package datadog.trace.util; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.Iterator; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +public class StringsTest2 { + @Test + @DisplayName("replaceAll - single replace") + public void replaceAllNoReplace() { + assertEquals("foobar", Strings.replaceAll("foobar", "dne", "unchanged")); + } + + @Test + @DisplayName("replaceAll - single replace") + public void replaceAllSingleReplace() { + assertEquals("foobaz", Strings.replaceAll("foobar", "bar", "baz")); + } + + @Test + @DisplayName("replaceAll - single replace") + public void replaceAllMultiReplace() { + assertEquals("foo=baz&quux=baz", Strings.replaceAll("foo=bar&quux=bar", "bar", "baz")); + } + + @Test + @DisplayName("split - empty") + public void splitEmpty() { + Iterator iter = Strings.split("", '&').iterator(); + assertFalse(iter.hasNext()); + } + + @Test + @DisplayName("split - no separator") + public void splitNoSeparator() { + Iterator iter = Strings.split("foo=bar", '&').iterator(); + assertContentEquals("foo=bar", iter.next()); + assertFalse(iter.hasNext()); + } + + @Test + @DisplayName("split - with separator") + public void splitWithSeparator() { + Iterator iter = Strings.split("foo=bar&hello=world", '&').iterator(); + assertContentEquals("foo=bar", iter.next()); + assertContentEquals("hello=world", iter.next()); + assertFalse(iter.hasNext()); + } + + @Test + @DisplayName("split - leading separator") + public void splitLeadingSeparator() { + Iterator iter = Strings.split("&foo=bar", '&').iterator(); + assertSubSeq("", 0, 0, iter.next()); // empty string before the separator + assertSubSeq("foo=bar", 1, 8, iter.next()); + assertFalse(iter.hasNext()); + } + + @Test + @DisplayName("split - trailing separator") + public void splitTrailingSeparator() { + Iterator iter = Strings.split("foo=bar&", '&').iterator(); + assertSubSeq("foo=bar", 0, 7, iter.next()); + assertSubSeq("", 8, 8, iter.next()); // empty string after the separator + assertFalse(iter.hasNext()); + } + + @Test + @DisplayName("split - only separator") + public void splitOnlySeparator() { + Iterator iter = Strings.split("&", '&').iterator(); + assertSubSeq("", 0, 0, iter.next()); // empty string before the separator + assertSubSeq("", 1, 1, iter.next()); // empty string after the separator + assertFalse(iter.hasNext()); + } + + @Test + @DisplayName("split - sanity check") + public void splitSanityCheck() { + String testStr = "foo=bar&hello=world&baz=quux&firstName=Jon&lastName=Doe"; + + String[] strSplit = testStr.split("\\&"); + Iterable iterable = Strings.split(testStr, '&'); + + Iterator iter = iterable.iterator(); + for (String expected : strSplit) { + assertTrue(iter.hasNext()); + assertContentEquals(expected, iter.next()); + } + assertFalse(iter.hasNext()); + + // repeat, just to check iterable functionality + Iterator iter2 = iterable.iterator(); + for (String expected : strSplit) { + assertTrue(iter2.hasNext()); + assertContentEquals(expected, iter2.next()); + } + assertFalse(iter2.hasNext()); + } + + static void assertContentEquals(String expectedStr, SubSequence actualSeq) { + assertTrue(actualSeq.equals(expectedStr), "equals String"); + assertEquals(expectedStr, actualSeq.toString(), "toString"); + } + + static void assertSubSeq( + String expected, int expectedBeginIndex, int expectedEndIndex, SubSequence actualSeq) { + assertContentEquals(expected, actualSeq); + assertEquals(expectedBeginIndex, actualSeq.beginIndex(), "beginIndex"); + assertEquals(expectedEndIndex, actualSeq.endIndex(), "endIndex"); + } +} diff --git a/internal-api/src/test/java/datadog/trace/util/SubSequenceTest.java b/internal-api/src/test/java/datadog/trace/util/SubSequenceTest.java new file mode 100644 index 00000000000..78d52fa6931 --- /dev/null +++ b/internal-api/src/test/java/datadog/trace/util/SubSequenceTest.java @@ -0,0 +1,111 @@ +package datadog.trace.util; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; + +public class SubSequenceTest { + static final String LOREM_IPSUM = + "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."; + + @Test + public void empty() { + SubSequence subSeq = SubSequence.EMPTY; + assertEquals("", subSeq.toString()); + assertEquals("".hashCode(), subSeq.hashCode()); + + StringBuilder builder0 = new StringBuilder(); + builder0.append(subSeq); + assertEquals("", builder0.toString()); + + StringBuilder builder1 = new StringBuilder(); + subSeq.appendTo(builder1); + assertEquals("", builder1.toString()); + } + + @Test + public void emptyTail() { + // This is allowed to represent the logical empty string after a match at the end of + // backing string. There is an important distinction from the canonical empty + // SubSequence which wouldn't have the correct beginIndex / endIndex pair. + SubSequence subSeq = new SubSequence("foo", "foo".length(), "foo".length()); + assertEquals("foo".length(), subSeq.beginIndex()); + assertEquals("foo".length(), subSeq.endIndex()); + assertEquals("", subSeq.toString()); + assertEquals("".hashCode(), subSeq.hashCode()); + + StringBuilder builder0 = new StringBuilder(); + builder0.append(subSeq); + assertEquals("", builder0.toString()); + + StringBuilder builder1 = new StringBuilder(); + subSeq.appendTo(builder1); + assertEquals("", builder1.toString()); + } + + @Test + public void subSequence() { + String str = LOREM_IPSUM; + int len = str.length(); + + for (int i = 0; i < str.length(); i += 100) { + int endIndex = Math.min(i + 100, len); + + String subStr = str.substring(i, endIndex); + CharSequence subCharSeq = str.subSequence(i, endIndex); + SubSequence subSeq = SubSequence.of(str, i, endIndex); + SubSequence altSubSeq = Strings.subSequence(str, i, endIndex); + + assertTrue(subSeq.equals(subStr)); + assertEquals(subStr, subSeq.toString()); + assertEquals(subStr.hashCode(), subSeq.hashCode()); + + assertTrue(subSeq.equals(subCharSeq)); + assertEquals(subCharSeq.toString(), subSeq.toString()); + + assertEquals(subSeq, altSubSeq); + + assertSame(subSeq.toString(), subSeq.toString()); + } + } + + @Test + public void subSequenceToEnd() { + String str = LOREM_IPSUM; + int len = str.length(); + + for (int i = 0; i < str.length(); i += 100) { + String subStr = str.substring(i); + SubSequence subSeq = SubSequence.of(str, i); + SubSequence altSubSeq = Strings.subSequence(str, i); + + assertTrue(subSeq.equals(subStr)); + assertEquals(subStr, subSeq.toString()); + assertEquals(subStr.hashCode(), subSeq.hashCode()); + + assertEquals(subSeq, altSubSeq); + + assertSame(subSeq.toString(), subSeq.toString()); + } + } + + @Test + public void appendToBuilder() { + SubSequence subSeq = SubSequence.of(LOREM_IPSUM, 50, 150); + + StringBuilder expectedBuilder = new StringBuilder(); + expectedBuilder.append(LOREM_IPSUM, 50, 150); + + String expectedStr = expectedBuilder.toString(); + + StringBuilder builder0 = new StringBuilder(); + builder0.append(subSeq); + assertEquals(expectedStr, builder0.toString()); + + StringBuilder builder1 = new StringBuilder(); + subSeq.appendTo(builder1); + assertEquals(expectedStr, builder1.toString()); + } +} From b1db32e43c88eeab3c734c1826753bbc6fae9975 Mon Sep 17 00:00:00 2001 From: Stuart McCulloch Date: Thu, 25 Jun 2026 10:16:30 +0100 Subject: [PATCH 045/139] Provide ability to capture continuations using the Context API (#11663) Provide ability to capture continuations using the Context API This is meant as a stepping stone from the old API towards a simpler foundation Clean up use of EmptyContext.INSTANCE Apply @ParametersAreNonnullByDefault to test listeners Explain choice of rehash value Extend context/scope tests Introduce ContextHolder to hold/update current context without the overhead of ThreadLocal Replace weak-ref NoopContextScope cache with simple allocation Benchmarking shows these scopes aren't alive long enough to pay for the caching Greatly reduce allocations by treating existing context containers as no-op scopes Add microbenchmarks to exercise Context API for both old and new implementations Refactor no-op scope approach Allow contexts to wrap themselves as scopes without attaching. This helps reduce allocations when attaching the same context multiple times. Merge remote-tracking branch 'origin/master' into mcculls/context-continuations Rename previous to beforeAttach / beforeSwap Make DDSpan, NoopSpan (and BlackHoleSpan) all SelfScopedContexts to further reduce allocations Fix merge conflict Merge remote-tracking branch 'origin/master' into mcculls/context-continuations Use dotted property form for JMH options (jmh.includes) and testJvm property for the JMH JVM Co-authored-by: devflow.devflow-routing-intake --- .../main/java/datadog/context/Context.java | 18 + .../datadog/context/ContextContinuation.java | 79 ++++ .../java/datadog/context/ContextListener.java | 33 ++ .../java/datadog/context/ContextManager.java | 25 ++ .../java/datadog/context/EmptyContext.java | 6 +- .../datadog/context/ImplicitContextKeyed.java | 3 - .../java/datadog/context/IndexedContext.java | 4 +- .../context/NoopContextContinuation.java | 31 ++ .../datadog/context/NoopContextScope.java | 18 + .../datadog/context/SelfScopedContext.java | 17 + .../datadog/context/SingletonContext.java | 4 +- .../datadog/context/TestContextManager.java | 14 + .../context/ThreadLocalContextManager.java | 304 +++++++++++++-- .../datadog/context/WeakMapContextBinder.java | 2 - .../datadog/context/ContextBinderTest.java | 8 +- .../context/ContextContinuationTest.java | 368 ++++++++++++++++++ .../context/ContextListenerEventTest.java | 104 +++++ .../context/ContextListenerExceptionTest.java | 74 ++++ .../datadog/context/ContextManagerTest.java | 88 +++-- .../context/ContextProvidersForkedTest.java | 20 +- .../java/datadog/context/ContextTestBase.java | 72 ++++ dd-trace-core/build.gradle | 12 + .../context/ContextManagerBenchmark.java | 352 +++++++++++++++++ .../context/ContextManagerDepthBenchmark.java | 88 +++++ .../main/java/datadog/trace/core/DDSpan.java | 4 +- .../java/datadog/trace/core/PendingTrace.java | 1 + .../scopemanager/ContinuableScopeManager.java | 27 ++ .../core/scopemanager/ScopeManagerTest.java | 68 ++++ .../instrumentation/api/AgentScope.java | 15 +- .../instrumentation/api/NoopSpan.java | 3 +- 30 files changed, 1767 insertions(+), 95 deletions(-) create mode 100644 components/context/src/main/java/datadog/context/ContextContinuation.java create mode 100644 components/context/src/main/java/datadog/context/ContextListener.java create mode 100644 components/context/src/main/java/datadog/context/NoopContextContinuation.java create mode 100644 components/context/src/main/java/datadog/context/NoopContextScope.java create mode 100644 components/context/src/main/java/datadog/context/SelfScopedContext.java create mode 100644 components/context/src/test/java/datadog/context/ContextContinuationTest.java create mode 100644 components/context/src/test/java/datadog/context/ContextListenerEventTest.java create mode 100644 components/context/src/test/java/datadog/context/ContextListenerExceptionTest.java create mode 100644 components/context/src/test/java/datadog/context/ContextTestBase.java create mode 100644 dd-trace-core/src/jmh/java/datadog/context/ContextManagerBenchmark.java create mode 100644 dd-trace-core/src/jmh/java/datadog/context/ContextManagerDepthBenchmark.java diff --git a/components/context/src/main/java/datadog/context/Context.java b/components/context/src/main/java/datadog/context/Context.java index 967feb86fe9..34a07524de8 100644 --- a/components/context/src/main/java/datadog/context/Context.java +++ b/components/context/src/main/java/datadog/context/Context.java @@ -101,6 +101,15 @@ static Context detachFrom(Object carrier) { return binder().detachFrom(carrier); } + /** + * Captures this (attached) context so it can be resumed in another execution unit. + * + * @return continuation capturing this context. + */ + default ContextContinuation capture() { + return manager().capture(this); + } + /** * Gets the value stored in this context under the given key. * @@ -159,4 +168,13 @@ default Context with(@Nullable ImplicitContextKeyed value) { } return value.storeInto(this); } + + /** + * Wraps context as a scope without attaching it to the current execution unit. + * + * @return a scope that has no effect on execution units. + */ + default ContextScope asScope() { + return new NoopContextScope(this); + } } diff --git a/components/context/src/main/java/datadog/context/ContextContinuation.java b/components/context/src/main/java/datadog/context/ContextContinuation.java new file mode 100644 index 00000000000..c516a7b35bf --- /dev/null +++ b/components/context/src/main/java/datadog/context/ContextContinuation.java @@ -0,0 +1,79 @@ +package datadog.context; + +/** + * Captures a context attached to one execution unit so it can be resumed in another. + * + *

To propagate context to a single background task: + * + * 

{@code
+ * ContextContinuation continuation = Context.current().capture();
+ * executor.execute(() -> {
+ *   try (ContextScope scope = continuation.resume()) {
+ *     // ... Context.current() here returns the captured context
+ *   }
+ *   // context implicitly released from continuation when resumed scope closes
+ * });
+ * }
+ * + *

If a continuation is never resumed (e.g. a task is cancelled before it runs), you must release + * it explicitly to avoid resource leaks: + * + * 

{@code
+ * ContextContinuation continuation = Context.current().capture();
+ * Future future = executor.submit(() -> {
+ *   try (ContextScope scope = continuation.resume()) {
+ *     // ...
+ *   }
+ * });
+ * // ...
+ * if (future.cancel(false)) {
+ *   continuation.release(); // task will never resume, so release manually
+ * }
+ * }
+ * + *

When the same context is resumed concurrently across multiple threads, call {@link #hold()} + * immediately after capture to prevent the first {@link #resume()} from releasing the context: + * + * 

{@code
+ * ContextContinuation continuation = Context.current().capture().hold();
+ * for (int i = 0; i < N; i++) {
+ *   executor.execute(() -> {
+ *     try (ContextScope scope = continuation.resume()) {
+ *       // ...
+ *     }
+ *   });
+ * }
+ * // ...
+ * continuation.release(); // remember to release the hold once all tasks are resumed/done
+ * }
+ */ +public interface ContextContinuation { + + /** + * Optional builder method to stop {@link #resume()} from implicitly releasing the captured + * context. This is useful when multiple threads may concurrently resume the context. You must + * then explicitly {@link #release() release} the context once all threads are resumed/done. + * + * @return this continuation, but with implicit release-after-resume turned off. + */ + ContextContinuation hold(); + + /** + * Returns the context captured by this continuation. + * + * @return the captured context. + */ + Context context(); + + /** + * Resumes the context captured by this continuation by attaching it to the current execution + * unit. Implicitly {@link #release() releases} the captured context at the end of the resumed + * scope, unless {@link #hold()} was called when creating the continuation. + * + * @return a scope to be closed when the resumed context is invalid. + */ + ContextScope resume(); + + /** Explicitly releases the context captured by this continuation. */ + void release(); +} diff --git a/components/context/src/main/java/datadog/context/ContextListener.java b/components/context/src/main/java/datadog/context/ContextListener.java new file mode 100644 index 00000000000..1bf06a7e974 --- /dev/null +++ b/components/context/src/main/java/datadog/context/ContextListener.java @@ -0,0 +1,33 @@ +package datadog.context; + +/** Listener of context events. */ +public interface ContextListener { + + /** + * Notifies that the given context has been attached to the current execution unit. + * + * @param context the attached context. + */ + default void onAttach(Context context) {} + + /** + * Notifies that the given context has been detached from the current execution unit. + * + * @param context the detached context. + */ + default void onDetach(Context context) {} + + /** + * Notifies that the given context has been captured by a continuation. + * + * @param context the captured context. + */ + default void onCapture(Context context) {} + + /** + * Notifies that the given context has been released from a continuation. + * + * @param context the released context. + */ + default void onRelease(Context context) {} +} diff --git a/components/context/src/main/java/datadog/context/ContextManager.java b/components/context/src/main/java/datadog/context/ContextManager.java index af0a2b9289a..6828352d1d4 100644 --- a/components/context/src/main/java/datadog/context/ContextManager.java +++ b/components/context/src/main/java/datadog/context/ContextManager.java @@ -1,5 +1,7 @@ package datadog.context; +import static datadog.context.ContextProviders.manager; + /** Manages context across execution units. */ public interface ContextManager { /** @@ -25,6 +27,29 @@ public interface ContextManager { */ Context swap(Context context); + /** + * Captures the given (attached) context so it can be resumed in another execution unit. + * + * @return continuation capturing the context. + */ + ContextContinuation capture(Context context); + + /** + * Registers the given listener to receive context events. + * + * @param listener the listener to register + */ + void addListener(ContextListener listener); + + /** + * Registers the given listener to receive context events. + * + * @param listener the listener to register. + */ + static void register(ContextListener listener) { + manager().addListener(listener); + } + /** * Requests use of a custom {@link ContextManager}. * diff --git a/components/context/src/main/java/datadog/context/EmptyContext.java b/components/context/src/main/java/datadog/context/EmptyContext.java index 20023482647..e9fee391373 100644 --- a/components/context/src/main/java/datadog/context/EmptyContext.java +++ b/components/context/src/main/java/datadog/context/EmptyContext.java @@ -3,13 +3,13 @@ import static java.util.Objects.requireNonNull; import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; /** {@link Context} containing no values. */ -@ParametersAreNonnullByDefault -final class EmptyContext implements Context { +final class EmptyContext implements SelfScopedContext { static final Context INSTANCE = new EmptyContext(); + private EmptyContext() {} + @Override @Nullable public T get(ContextKey key) { diff --git a/components/context/src/main/java/datadog/context/ImplicitContextKeyed.java b/components/context/src/main/java/datadog/context/ImplicitContextKeyed.java index a852a19c01b..cdc4107d01a 100644 --- a/components/context/src/main/java/datadog/context/ImplicitContextKeyed.java +++ b/components/context/src/main/java/datadog/context/ImplicitContextKeyed.java @@ -1,9 +1,6 @@ package datadog.context; -import javax.annotation.ParametersAreNonnullByDefault; - /** {@link Context} value that has its own implicit {@link ContextKey}. */ -@ParametersAreNonnullByDefault public interface ImplicitContextKeyed { /** * Creates a new context with this value under its chosen key. diff --git a/components/context/src/main/java/datadog/context/IndexedContext.java b/components/context/src/main/java/datadog/context/IndexedContext.java index e2c520fffdb..ff9acb33e57 100644 --- a/components/context/src/main/java/datadog/context/IndexedContext.java +++ b/components/context/src/main/java/datadog/context/IndexedContext.java @@ -6,11 +6,9 @@ import java.util.Arrays; import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; /** {@link Context} containing many values. */ -@ParametersAreNonnullByDefault -final class IndexedContext implements Context { +final class IndexedContext implements SelfScopedContext { final Object[] store; IndexedContext(Object[] store) { diff --git a/components/context/src/main/java/datadog/context/NoopContextContinuation.java b/components/context/src/main/java/datadog/context/NoopContextContinuation.java new file mode 100644 index 00000000000..02ede9b862d --- /dev/null +++ b/components/context/src/main/java/datadog/context/NoopContextContinuation.java @@ -0,0 +1,31 @@ +package datadog.context; + +/** {@link ContextContinuation} that has no effect on execution units. */ +final class NoopContextContinuation implements ContextContinuation, ContextScope { + private final Context context; + + NoopContextContinuation(Context context) { + this.context = context; + } + + @Override + public ContextContinuation hold() { + return this; + } + + @Override + public Context context() { + return context; + } + + @Override + public ContextScope resume() { + return this; // acts as no-op scope, avoiding allocation + } + + @Override + public void release() {} + + @Override + public void close() {} +} diff --git a/components/context/src/main/java/datadog/context/NoopContextScope.java b/components/context/src/main/java/datadog/context/NoopContextScope.java new file mode 100644 index 00000000000..648221036c5 --- /dev/null +++ b/components/context/src/main/java/datadog/context/NoopContextScope.java @@ -0,0 +1,18 @@ +package datadog.context; + +/** {@link ContextScope} that has no effect on execution units. */ +final class NoopContextScope implements ContextScope { + private final Context context; + + NoopContextScope(Context context) { + this.context = context; + } + + @Override + public Context context() { + return context; + } + + @Override + public void close() {} +} diff --git a/components/context/src/main/java/datadog/context/SelfScopedContext.java b/components/context/src/main/java/datadog/context/SelfScopedContext.java new file mode 100644 index 00000000000..f19dbf98b73 --- /dev/null +++ b/components/context/src/main/java/datadog/context/SelfScopedContext.java @@ -0,0 +1,17 @@ +package datadog.context; + +/** Context that acts as its own unattached scope. */ +public interface SelfScopedContext extends Context, ContextScope { + @Override + default ContextScope asScope() { + return this; // acts as no-op scope, avoiding allocation + } + + @Override + default Context context() { + return this; + } + + @Override + default void close() {} +} diff --git a/components/context/src/main/java/datadog/context/SingletonContext.java b/components/context/src/main/java/datadog/context/SingletonContext.java index 94c9ff091fc..773c26b1fa3 100644 --- a/components/context/src/main/java/datadog/context/SingletonContext.java +++ b/components/context/src/main/java/datadog/context/SingletonContext.java @@ -5,11 +5,9 @@ import java.util.Objects; import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; /** {@link Context} containing a single value. */ -@ParametersAreNonnullByDefault -final class SingletonContext implements Context { +final class SingletonContext implements SelfScopedContext { final int index; final Object value; diff --git a/components/context/src/main/java/datadog/context/TestContextManager.java b/components/context/src/main/java/datadog/context/TestContextManager.java index 9c60f4dc2e0..a0b1302653c 100644 --- a/components/context/src/main/java/datadog/context/TestContextManager.java +++ b/components/context/src/main/java/datadog/context/TestContextManager.java @@ -27,6 +27,20 @@ public Context swap(Context context) { return delegate().swap(context); } + @Override + public ContextContinuation capture(Context context) { + return delegate().capture(context); + } + + @Override + public void addListener(ContextListener listener) { + delegate().addListener(listener); + } + + static void clearListeners() { + ThreadLocalContextManager.INSTANCE.clearListeners(); + } + private static ContextManager delegate() { ContextManager delegate = ContextProviders.customManager; if (delegate == TEST_INSTANCE) { diff --git a/components/context/src/main/java/datadog/context/ThreadLocalContextManager.java b/components/context/src/main/java/datadog/context/ThreadLocalContextManager.java index 0d652868e52..9b94f578409 100644 --- a/components/context/src/main/java/datadog/context/ThreadLocalContextManager.java +++ b/components/context/src/main/java/datadog/context/ThreadLocalContextManager.java @@ -1,45 +1,297 @@ package datadog.context; +import java.util.Arrays; +import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; +import javax.annotation.Nullable; + /** {@link ContextManager} that uses a {@link ThreadLocal} to track context per thread. */ final class ThreadLocalContextManager implements ContextManager { - static final ContextManager INSTANCE = new ThreadLocalContextManager(); + static final ThreadLocalContextManager INSTANCE = new ThreadLocalContextManager(); + + private static final NoopContextContinuation ROOT_CONTINUATION = + new NoopContextContinuation(Context.root()); + + private static final ThreadLocal CONTEXT_HOLDER = + ThreadLocal.withInitial(ContextHolder::new); - private static final ThreadLocal CURRENT_HOLDER = - ThreadLocal.withInitial(() -> new Context[] {EmptyContext.INSTANCE}); + private final Object listenersWriteLock = new Object(); + volatile ContextListener[] listeners = {}; @Override public Context current() { - return CURRENT_HOLDER.get()[0]; + return CONTEXT_HOLDER.get().current; } @Override public ContextScope attach(Context context) { - Context[] holder = CURRENT_HOLDER.get(); - Context previous = holder[0]; - holder[0] = context; - return new ContextScope() { - private boolean closed; - - @Override - public Context context() { - return context; - } - - @Override - public void close() { - if (!closed && context == holder[0]) { - holder[0] = previous; - closed = true; - } + return doAttach(context, null); + } + + ContextScope doAttach(Context context, @Nullable ContextContinuationImpl continuation) { + ContextHolder holder = CONTEXT_HOLDER.get(); + + Context beforeAttach = holder.current; + if (context == beforeAttach) { + if (continuation != null) { + // already attached, safe to release early to avoid resource leak + continuation.releaseOnScopeClose(); + return continuation; // acts as no-op scope, avoiding allocation } - }; + return context.asScope(); // convert to scope without attaching + } + + ContextListener[] ls = listeners; + notifyDetach(beforeAttach, ls); + holder.current = context; + notifyAttach(context, ls); + + if (continuation == null) { + return new ContextScopeImpl(context, holder, beforeAttach); + } else { + return new ResumedScopeImpl(context, holder, beforeAttach, continuation); + } } @Override public Context swap(Context context) { - Context[] holder = CURRENT_HOLDER.get(); - Context previous = holder[0]; - holder[0] = context; - return previous; + ContextHolder holder = CONTEXT_HOLDER.get(); + + Context beforeSwap = holder.current; + if (context == beforeSwap) { + return beforeSwap; + } + + ContextListener[] ls = listeners; + notifyDetach(beforeSwap, ls); + holder.current = context; + notifyAttach(context, ls); + + return beforeSwap; + } + + @Override + public ContextContinuation capture(Context context) { + if (context == Context.root()) { + return ROOT_CONTINUATION; + } else { + return new ContextContinuationImpl(context); + } + } + + @Override + public void addListener(ContextListener listener) { + synchronized (listenersWriteLock) { + for (ContextListener l : listeners) { + if (l == listener) { + return; + } + } + int oldLength = listeners.length; + ContextListener[] update = Arrays.copyOf(listeners, oldLength + 1); + update[oldLength] = listener; + listeners = update; + } + } + + void clearListeners() { + synchronized (listenersWriteLock) { + listeners = new ContextListener[] {}; + } + } + + static void notifyAttach(Context context, ContextListener[] listeners) { + if (context == Context.root()) { + return; // don't emit attach events for the default "no context" case + } + for (ContextListener l : listeners) { + try { + l.onAttach(context); + } catch (Throwable ignore) { + } + } + } + + static void notifyDetach(Context context, ContextListener[] listeners) { + if (context == Context.root()) { + return; // don't emit detach events for the default "no context" case + } + for (ContextListener l : listeners) { + try { + l.onDetach(context); + } catch (Throwable ignore) { + } + } + } + + static void notifyCapture(Context context, ContextListener[] listeners) { + // only called for non-empty continuations + for (ContextListener l : listeners) { + try { + l.onCapture(context); + } catch (Throwable ignore) { + } + } + } + + static void notifyRelease(Context context, ContextListener[] listeners) { + // only called for non-empty continuations + for (ContextListener l : listeners) { + try { + l.onRelease(context); + } catch (Throwable ignore) { + } + } + } + + private static class ContextScopeImpl implements ContextScope { + + private final Context context; + private final ContextHolder holder; + private final Context beforeAttach; + + private boolean closed; + + ContextScopeImpl(Context context, ContextHolder holder, Context beforeAttach) { + this.context = context; + this.holder = holder; + this.beforeAttach = beforeAttach; + } + + @Override + public final Context context() { + return context; + } + + @Override + public void close() { + // check for out-of-order close to avoid corrupting the current state + if (!closed && context == holder.current) { + ContextListener[] ls = INSTANCE.listeners; + notifyDetach(context, ls); + holder.current = beforeAttach; + notifyAttach(beforeAttach, ls); + closed = true; + } + } + } + + private static final class ResumedScopeImpl extends ContextScopeImpl { + @Nullable private ContextContinuationImpl continuation; + + ResumedScopeImpl( + Context context, + ContextHolder holder, + Context beforeAttach, + @Nullable ContextContinuationImpl continuation) { + super(context, holder, beforeAttach); + this.continuation = continuation; + } + + @Override + public void close() { + if (continuation != null) { + // release first to avoid resource leak, even on out-of-order close + continuation.releaseOnScopeClose(); + continuation = null; + } + super.close(); // proceed to try and update the current execution unit + } + } + + private static final class ContextContinuationImpl implements ContextContinuation, ContextScope { + + private static final AtomicIntegerFieldUpdater COUNT = + AtomicIntegerFieldUpdater.newUpdater(ContextContinuationImpl.class, "count"); + + // these boundaries were selected to allow for speculative counting and fuzzy checks + private static final int RELEASED = Integer.MIN_VALUE >> 1; + private static final int HELD = (Integer.MAX_VALUE >> 1) + 1; + + private final Context context; + + /** + * When positive this reflects the number of outstanding resumed scopes as well as whether there + * is an active hold on the continuation: + * + * + * + * + * + * + * + *
Value Meaning
0Not held or resumed
1..HELD-1Resumed, not held
HELDHeld, not yet resumed
HELD..MAX_INTResumed and held
+ * + * where HELD is at the mid-point between 1 and MAX_INT. + * + *

A negative value of RELEASED reflects that the continuation has either been resumed and + * all associated scopes are now closed, or it has been explicitly released. This value was + * chosen to be half the size of MIN_INT to avoid speculative additions in {@link #resume()} + * from overflowing to a positive count. + */ + private volatile int count = 0; + + ContextContinuationImpl(Context context) { + this.context = context; + notifyCapture(context, INSTANCE.listeners); + } + + @Override + public ContextContinuation hold() { + // update initial count to record that this continuation has a hold + COUNT.compareAndSet(this, 0, HELD); + return this; + } + + @Override + public Context context() { + return context; + } + + @Override + public ContextScope resume() { + if (COUNT.incrementAndGet(this) > 0) { + // speculative update succeeded, continuation can be resumed + return INSTANCE.doAttach(context, this); + } else { + // continuation released or too many resumes; rollback count + COUNT.decrementAndGet(this); + return this; // acts as no-op scope, avoiding allocation + } + } + + @Override + public void release() { + int current = count; + while (current >= HELD) { + // remove the hold on this continuation by removing the offset + COUNT.compareAndSet(this, current, current - HELD); + current = count; + } + while (current == 0) { + // no outstanding resumes and hold has been removed + if (COUNT.compareAndSet(this, current, RELEASED)) { + notifyRelease(context, INSTANCE.listeners); + return; + } + current = count; + } + } + + void releaseOnScopeClose() { + if (COUNT.compareAndSet(this, 1, RELEASED)) { + // fast path: only one resume of the continuation (no hold) + notifyRelease(context, INSTANCE.listeners); + } else if (COUNT.decrementAndGet(this) == 0) { + // slow path: multiple resumes, all scopes now closed (no hold) + release(); + } /* else there are outstanding resumes or hold is in place */ + } + + @Override + public void close() {} + } + + private static final class ContextHolder { + Context current = Context.root(); } } diff --git a/components/context/src/main/java/datadog/context/WeakMapContextBinder.java b/components/context/src/main/java/datadog/context/WeakMapContextBinder.java index 9b5fd24299e..15e0154f25a 100644 --- a/components/context/src/main/java/datadog/context/WeakMapContextBinder.java +++ b/components/context/src/main/java/datadog/context/WeakMapContextBinder.java @@ -6,10 +6,8 @@ import java.util.Map; import java.util.WeakHashMap; -import javax.annotation.ParametersAreNonnullByDefault; /** {@link ContextBinder} that uses a global weak map of carriers to contexts. */ -@ParametersAreNonnullByDefault final class WeakMapContextBinder implements ContextBinder { static final ContextBinder INSTANCE = new WeakMapContextBinder(); diff --git a/components/context/src/test/java/datadog/context/ContextBinderTest.java b/components/context/src/test/java/datadog/context/ContextBinderTest.java index 9af265fea50..eb2bb35563e 100644 --- a/components/context/src/test/java/datadog/context/ContextBinderTest.java +++ b/components/context/src/test/java/datadog/context/ContextBinderTest.java @@ -8,15 +8,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -class ContextBinderTest { - @BeforeEach - void setUp() { - assertEquals(root(), current(), "No context is expected to be set"); - } - +class ContextBinderTest extends ContextTestBase { @Test void testAttachAndDetach() { // Setting up test diff --git a/components/context/src/test/java/datadog/context/ContextContinuationTest.java b/components/context/src/test/java/datadog/context/ContextContinuationTest.java new file mode 100644 index 00000000000..0b6508220bf --- /dev/null +++ b/components/context/src/test/java/datadog/context/ContextContinuationTest.java @@ -0,0 +1,368 @@ +package datadog.context; + +import static datadog.context.Context.current; +import static datadog.context.Context.root; +import static java.util.Arrays.asList; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import javax.annotation.ParametersAreNonnullByDefault; +import org.junit.jupiter.api.Test; + +@ParametersAreNonnullByDefault +class ContextContinuationTest extends ContextTestBase { + private static final ContextKey CONTINUATION_KEY = ContextKey.named("continuation-key"); + + @Test + void testCaptureRootContextIsNoop() { + ContextContinuation continuation = root().capture(); + assertEquals(root(), continuation.context()); + assertSame(continuation, continuation.hold()); // hold is a no-op, returns self + try (ContextScope scope = continuation.resume()) { + assertEquals(root(), current()); // nothing changes for root + } + assertEquals(root(), current()); + continuation.release(); // no-op + } + + @Test + void testCaptureStoresContext() { + Context context = root().with(CONTINUATION_KEY, "captured"); + try (ContextScope scope = context.attach()) { + ContextContinuation continuation = context.capture(); + assertEquals(context, continuation.context()); + continuation.release(); + } + } + + @Test + void testCaptureFiresOnCaptureEvent() { + List events = new ArrayList<>(); + ContextManager.register(trackingListener(events)); + Context context = root().with(CONTINUATION_KEY, "value"); + try (ContextScope scope = context.attach()) { + ContextContinuation continuation = + context.capture(); // capture while active (recommended pattern) + assertEquals(asList("attach", "capture"), events); + continuation.release(); + } + assertEquals(asList("attach", "capture", "release", "detach"), events); + } + + @Test + void testResumeAttachesContextAndRestoresPreviousOnClose() { + Context context = root().with(CONTINUATION_KEY, "value"); + ContextContinuation continuation; + try (ContextScope scope = context.attach()) { + continuation = context.capture(); // capture while active (recommended pattern) + } + // original scope is closed; resume the continuation here (same or different thread) + try (ContextScope scope = continuation.resume()) { + assertEquals(context, current()); + assertEquals(context, scope.context()); + } + assertEquals(root(), current()); + } + + @Test + void testResumeAndScopeCloseFiresLifecycleEvents() { + List events = new ArrayList<>(); + ContextManager.register(trackingListener(events)); + Context context = root().with(CONTINUATION_KEY, "value"); + ContextContinuation continuation; + try (ContextScope scope = context.attach()) { + continuation = context.capture(); // capture while active + } + assertEquals(asList("attach", "capture", "detach"), events); + try (ContextScope scope = continuation.resume()) { + assertEquals(asList("attach", "capture", "detach", "attach"), events); + } + // release fires before detach (continuation is released first inside ContextScopeImpl.close) + assertEquals(asList("attach", "capture", "detach", "attach", "release", "detach"), events); + } + + @Test + void testHoldPreventsAutoReleaseOnScopeClose() { + List events = new ArrayList<>(); + ContextManager.register(trackingListener(events)); + Context context = root().with(CONTINUATION_KEY, "value"); + ContextContinuation continuation; + try (ContextScope scope = context.attach()) { + continuation = context.capture(); // capture while active + continuation.hold(); + } + try (ContextScope scope = continuation.resume()) { + assertEquals(context, current()); + } + assertEquals(root(), current()); + assertEquals( + asList("attach", "capture", "detach", "attach", "detach"), + events, + "release should not fire while hold is active"); + continuation.release(); + assertEquals(asList("attach", "capture", "detach", "attach", "detach", "release"), events); + } + + @Test + void testExplicitReleaseWithoutResumeFiresReleaseEvent() { + List events = new ArrayList<>(); + ContextManager.register(trackingListener(events)); + Context context = root().with(CONTINUATION_KEY, "value"); + ContextContinuation continuation; + try (ContextScope scope = context.attach()) { + continuation = context.capture(); // capture while active + } + assertEquals(asList("attach", "capture", "detach"), events); + continuation.release(); + assertEquals(asList("attach", "capture", "detach", "release"), events); + } + + @Test + void testResumeAfterReleaseIsNoop() { + Context context = root().with(CONTINUATION_KEY, "value"); + ContextContinuation continuation; + try (ContextScope scope = context.attach()) { + continuation = context.capture(); // capture while active + } + continuation.release(); + // Resuming a released continuation should not attach the context + try (ContextScope scope = continuation.resume()) { + assertEquals(root(), current()); + } + assertEquals(root(), current()); + } + + @Test + void testResumeOnDifferentThread() { + Context context = root().with(CONTINUATION_KEY, "value"); + ContextContinuation continuation; + try (ContextScope scope = context.attach()) { + continuation = context.capture(); // capture while active (recommended pattern) + } + // original scope is closed; resume the context on another thread + ExecutorService executor = Executors.newSingleThreadExecutor(); + try { + Future future = + executor.submit( + () -> { + assertEquals(root(), current()); // thread starts with root context + try (ContextScope scope = continuation.resume()) { + assertEquals(context, current()); + } + assertEquals(root(), current()); // restored after scope close + }); + assertDoesNotThrow(() -> future.get()); + } finally { + executor.shutdown(); + } + } + + @Test + void testMultipleResumesReleaseAfterLastScopeCloses() throws InterruptedException { + List events = Collections.synchronizedList(new ArrayList<>()); + ContextManager.register( + new ContextListener() { + @Override + public void onRelease(Context c) { + events.add("release"); + } + }); + Context context = root().with(CONTINUATION_KEY, "value"); + ContextContinuation continuation; + try (ContextScope scope = context.attach()) { + continuation = context.capture(); // capture while active + } + CountDownLatch bothResumed = new CountDownLatch(2); + CountDownLatch closeFirst = new CountDownLatch(1); + CountDownLatch firstClosed = new CountDownLatch(1); + CountDownLatch closeSecond = new CountDownLatch(1); + ExecutorService executor = Executors.newFixedThreadPool(2); + try { + Future f1 = + executor.submit( + () -> { + try (ContextScope scope = continuation.resume()) { + bothResumed.countDown(); + closeFirst.await(); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + } finally { + firstClosed.countDown(); + } + }); + Future f2 = + executor.submit( + () -> { + try (ContextScope scope = continuation.resume()) { + bothResumed.countDown(); + closeSecond.await(); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + } + }); + bothResumed.await(); + assertTrue(events.isEmpty(), "release should not fire while scopes are open"); + closeFirst.countDown(); + firstClosed.await(); // wait for f1's scope to fully close + assertTrue(events.isEmpty(), "release should not fire after first scope closes"); + closeSecond.countDown(); + assertDoesNotThrow(() -> f1.get()); + assertDoesNotThrow(() -> f2.get()); + assertEquals(asList("release"), events); + } finally { + executor.shutdown(); + } + } + + @Test + void testSameContextResumeReleasesImmediately() { + List events = new ArrayList<>(); + ContextManager.register(trackingListener(events)); + Context context = root().with(CONTINUATION_KEY, "value"); + try (ContextScope outer = context.attach()) { + // Context is already current; resume is a noop and continuation is released immediately + ContextContinuation continuation = context.capture(); + try (ContextScope noop = continuation.resume()) { + assertEquals(context, current()); + assertEquals(asList("attach", "capture", "release"), events); // released synchronously + } + assertEquals(context, current()); // outer scope still holds context + } + assertEquals(asList("attach", "capture", "release", "detach"), events); + } + + @Test + void testOutOfOrderScopeCloseReleasesImmediately() { + // Recommended pattern: attach C, capture, close original scope + Context contextC = root().with(CONTINUATION_KEY, "C"); + ContextContinuation continuation; + try (ContextScope scope = contextC.attach()) { + continuation = contextC.capture(); + } + + List events = new ArrayList<>(); + ContextManager.register(keyedTrackingListener(events, CONTINUATION_KEY)); + + Context contextD = root().with(CONTINUATION_KEY, "D"); + try (ContextScope scopeR = continuation.resume()) { + assertEquals(contextC, current()); + try (ContextScope scopeD = contextD.attach()) { // attaching D fires detach:C, attach:D + assertEquals(contextD, current()); + + // close the resume scope out-of-order while D is still nested on top; + // release fires immediately, but detach:C does not (C is not current) + scopeR.close(); + assertEquals(asList("attach:C", "detach:C", "attach:D", "release:C"), events); + assertEquals(contextD, current()); // D is still current + } // scopeD closes here: unwind D normally, restores C + assertEquals( + asList("attach:C", "detach:C", "attach:D", "release:C", "detach:D", "attach:C"), events); + } // try-with-resources closes scopeR again; no second release, C unwinds to root + + assertEquals(root(), current()); + assertEquals( + asList("attach:C", "detach:C", "attach:D", "release:C", "detach:D", "attach:C", "detach:C"), + events); + } + + @Test + void testHoldWithOutOfOrderScopeCloseFiresReleaseOnExplicitRelease() { + // Regression test: hold() + out-of-order close must not corrupt the count, + // which would cause release() to silently no-op and lose the release event. + Context contextC = root().with(CONTINUATION_KEY, "C"); + ContextContinuation continuation; + try (ContextScope scope = contextC.attach()) { + continuation = contextC.capture(); + continuation.hold(); + } + + List events = new ArrayList<>(); + ContextManager.register(keyedTrackingListener(events, CONTINUATION_KEY)); + + Context contextD = root().with(CONTINUATION_KEY, "D"); + try (ContextScope scopeR = continuation.resume()) { + assertEquals(contextC, current()); + try (ContextScope scopeD = contextD.attach()) { // detach:C, attach:D + assertEquals(contextD, current()); + + scopeR.close(); // out-of-order close while D is still on top; hold prevents auto-release + assertEquals(asList("attach:C", "detach:C", "attach:D"), events); + assertEquals(contextD, current()); + } // scopeD closes here: unwind D, restores C + } // TWR closes scopeR again (now in-order); detach:C, no release yet (hold is active) + + assertEquals(root(), current()); + assertEquals( + asList("attach:C", "detach:C", "attach:D", "detach:D", "attach:C", "detach:C"), events); + + continuation.release(); // explicit release must fire release:C + assertEquals( + asList("attach:C", "detach:C", "attach:D", "detach:D", "attach:C", "detach:C", "release:C"), + events); + } + + @Test + void testMultipleHoldCallsAreIdempotent() { + // Calling hold() more than once should not require more than one explicit release(). + List events = new ArrayList<>(); + ContextManager.register(trackingListener(events)); + Context context = root().with(CONTINUATION_KEY, "value"); + ContextContinuation continuation; + try (ContextScope scope = context.attach()) { + continuation = context.capture(); + continuation.hold(); + continuation.hold(); // second hold must be a no-op + } + // One explicit release() is enough — no extra releases needed for the second hold(). + continuation.release(); + assertEquals(asList("attach", "capture", "detach", "release"), events); + continuation.release(); // still idempotent after the final release + assertEquals(asList("attach", "capture", "detach", "release"), events); + } + + @Test + void testHoldAfterReleaseIsIgnored() { + // hold() on an already-released continuation must not resurrect it. + List events = new ArrayList<>(); + ContextManager.register(trackingListener(events)); + Context context = root().with(CONTINUATION_KEY, "value"); + ContextContinuation continuation; + try (ContextScope scope = context.attach()) { + continuation = context.capture(); + } + continuation.release(); + assertEquals(asList("attach", "capture", "detach", "release"), events); + continuation.hold(); // must be silently ignored + // resume() after release is already a noop, even with the spurious hold() + try (ContextScope scope = continuation.resume()) { + assertEquals(root(), current()); + } + continuation.release(); // must not fire a second release event + assertEquals(asList("attach", "capture", "detach", "release"), events); + } + + @Test + void testHoldAllowsMultipleReleaseCalls() { + List events = new ArrayList<>(); + ContextManager.register(trackingListener(events)); + Context context = root().with(CONTINUATION_KEY, "value"); + ContextContinuation continuation; + try (ContextScope scope = context.attach()) { + continuation = context.capture(); // capture while active + continuation.hold(); + } + continuation.release(); + assertEquals(asList("attach", "capture", "detach", "release"), events); + continuation.release(); // second release is a no-op + assertEquals(asList("attach", "capture", "detach", "release"), events); + } +} diff --git a/components/context/src/test/java/datadog/context/ContextListenerEventTest.java b/components/context/src/test/java/datadog/context/ContextListenerEventTest.java new file mode 100644 index 00000000000..cce5d10f167 --- /dev/null +++ b/components/context/src/test/java/datadog/context/ContextListenerEventTest.java @@ -0,0 +1,104 @@ +package datadog.context; + +import static datadog.context.Context.current; +import static datadog.context.Context.root; +import static datadog.context.ContextTest.STRING_KEY; +import static java.util.Arrays.asList; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.ArrayList; +import java.util.List; +import org.junit.jupiter.api.Test; + +class ContextListenerEventTest extends ContextTestBase { + @Test + void testListenersNotifiedOnAttachAndDetach() { + List events = new ArrayList<>(); + ContextManager.register(keyedTrackingListener(events, STRING_KEY)); + Context context = root().with(STRING_KEY, "value"); + try (ContextScope scope = context.attach()) { + assertEquals(asList("attach:value"), events); + } + assertEquals(asList("attach:value", "detach:value"), events); + } + + @Test + void testListenersNotNotifiedForRootContext() { + List events = new ArrayList<>(); + ContextManager.register(trackingListener(events)); + root().attach(); // current is already root, no events + assertTrue(events.isEmpty(), "root attach should not trigger listeners"); + root().swap(); // current is already root, no events + assertTrue(events.isEmpty(), "root swap should not trigger listeners"); + Context context = root().with(STRING_KEY, "value"); + try (ContextScope scope = context.attach()) { + assertEquals(1, events.size()); // attach:non-root only + } + assertEquals(2, events.size()); // detach:non-root but not attach:root + } + + @Test + void testListenersNotNotifiedOnSameContextAttach() { + List events = new ArrayList<>(); + ContextManager.register(trackingListener(events)); + Context context = root().with(STRING_KEY, "same"); + try (ContextScope outer = context.attach()) { + assertEquals(asList("attach"), events); + try (ContextScope noop = context.attach()) { + assertEquals(context, current()); + assertEquals(asList("attach"), events); // no new events on same-context attach + } + assertEquals(asList("attach"), events); // noop close fires no events either + } + assertEquals(asList("attach", "detach"), events); + } + + @Test + void testListenersNotNotifiedOnSameContextSwap() { + List events = new ArrayList<>(); + ContextManager.register(trackingListener(events)); + Context context = root().with(STRING_KEY, "same"); + context.swap(); + assertEquals(asList("attach"), events); + context.swap(); // same context again, no events + assertEquals(asList("attach"), events); + root().swap(); + assertEquals(asList("attach", "detach"), events); + } + + @Test + void testDuplicateListenerIgnored() { + List events = new ArrayList<>(); + ContextListener listener = trackingListener(events); + ContextManager.register(listener); + ContextManager.register(listener); // should be ignored + try (ContextScope scope = root().with(STRING_KEY, "value").attach()) {} + assertEquals(asList("attach", "detach"), events); + } + + @Test + void testMultipleListenersAllNotified() { + List events1 = new ArrayList<>(); + List events2 = new ArrayList<>(); + ContextManager.register(trackingListener(events1)); + ContextManager.register(trackingListener(events2)); + try (ContextScope scope = root().with(STRING_KEY, "value").attach()) {} + assertEquals(asList("attach", "detach"), events1); + assertEquals(asList("attach", "detach"), events2); + } + + @Test + void testSwapNotifiesListeners() { + List events = new ArrayList<>(); + ContextManager.register(keyedTrackingListener(events, STRING_KEY)); + Context context = root().with(STRING_KEY, "value"); + Context previous = context.swap(); + assertSame(root(), previous); + assertEquals(asList("attach:value"), events); + previous = root().swap(); + assertSame(context, previous); + assertEquals(asList("attach:value", "detach:value"), events); + } +} diff --git a/components/context/src/test/java/datadog/context/ContextListenerExceptionTest.java b/components/context/src/test/java/datadog/context/ContextListenerExceptionTest.java new file mode 100644 index 00000000000..972f3733ddc --- /dev/null +++ b/components/context/src/test/java/datadog/context/ContextListenerExceptionTest.java @@ -0,0 +1,74 @@ +package datadog.context; + +import static datadog.context.Context.current; +import static datadog.context.Context.root; +import static datadog.context.ContextTest.STRING_KEY; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +import javax.annotation.ParametersAreNonnullByDefault; +import org.junit.jupiter.api.Test; + +@ParametersAreNonnullByDefault +class ContextListenerExceptionTest extends ContextTestBase { + @Test + void testListenerExceptionSwallowed() { + ContextManager.register( + new ContextListener() { + @Override + public void onAttach(Context c) { + throw new RuntimeException("listener failure"); + } + + @Override + public void onDetach(Context c) { + throw new RuntimeException("listener failure"); + } + }); + Context context = root().with(STRING_KEY, "value"); + assertDoesNotThrow( + () -> { + try (ContextScope scope = context.attach()) { + assertEquals(context, current()); + } + }); + } + + @Test + void testListenerExceptionSwallowedOnCapture() { + ContextManager.register( + new ContextListener() { + @Override + public void onCapture(Context c) { + throw new RuntimeException("listener failure on capture"); + } + }); + Context context = root().with(STRING_KEY, "value"); + try (ContextScope scope = context.attach()) { + assertDoesNotThrow( + () -> { + ContextContinuation continuation = context.capture(); + assertNotNull(continuation); + assertEquals(context, continuation.context()); + continuation.release(); + }); + } + } + + @Test + void testListenerExceptionSwallowedOnRelease() { + ContextManager.register( + new ContextListener() { + @Override + public void onRelease(Context c) { + throw new RuntimeException("listener failure on release"); + } + }); + Context context = root().with(STRING_KEY, "value"); + try (ContextScope scope = context.attach()) { + ContextContinuation continuation = context.capture(); + assertDoesNotThrow(continuation::release); + } + } +} diff --git a/components/context/src/test/java/datadog/context/ContextManagerTest.java b/components/context/src/test/java/datadog/context/ContextManagerTest.java index d8927abf76d..789f6fc6eaf 100644 --- a/components/context/src/test/java/datadog/context/ContextManagerTest.java +++ b/components/context/src/test/java/datadog/context/ContextManagerTest.java @@ -10,17 +10,9 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.Phaser; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -class ContextManagerTest { - @BeforeEach - void init() { - // Ensure no current context prior starting test - assertEquals(root(), current()); - } - +class ContextManagerTest extends ContextTestBase { @Test void testContextAttachment() { Context context1 = root().with(STRING_KEY, "value1"); @@ -57,22 +49,57 @@ void testContextSwapping() { assertEquals(root(), current()); } + @Test + void testNoopScopeContextReturnsAttachedContext() { + Context context = root().with(STRING_KEY, "value"); + try (ContextScope outer = context.attach()) { + // second attach returns a noop scope; verify context() reflects the attached context + try (ContextScope noop = context.attach()) { + assertEquals(context, noop.context()); + } + } + } + + @Test + void testNoopScopeReturnsCorrectContext() { + Context context = root().with(STRING_KEY, "value"); + try (ContextScope outer = context.attach()) { + try (ContextScope noop1 = context.attach(); + ContextScope noop2 = context.attach()) { + assertEquals(context, noop1.context()); + assertEquals(context, noop2.context()); + } + } + } + + @Test + void testNoopScopeCorrectContextAcrossManyContexts() { + for (int i = 0; i < 200; i++) { + Context ctx = root().with(STRING_KEY, "ctx-" + i); + try (ContextScope outer = ctx.attach()) { + try (ContextScope noop = ctx.attach()) { + assertEquals(ctx, noop.context()); + } + } + } + } + @Test void testAttachSameContextMultipleTimes() { Context context = root().with(STRING_KEY, "value1"); - try (ContextScope ignored1 = context.attach()) { + try (ContextScope scope1 = context.attach()) { assertEquals(context, current()); - try (ContextScope ignored2 = context.attach()) { - try (ContextScope ignored3 = context.attach()) { - assertEquals(context, current()); + // re-attaching an already-active context returns a noop scope + try (ContextScope noop2 = context.attach()) { + assertEquals(context, noop2.context()); + try (ContextScope noop3 = context.attach()) { + assertEquals(context, noop3.context()); } - // Test closing a scope on the current context should not deactivate it if activated - // multiple times - assertEquals(context, current()); + assertEquals(context, current()); // noop close: context remains active } + assertEquals(context, current()); // still active after all noop closes } - // Test closing the same number of scope as activation should deactivate the context - assertEquals(root(), current()); + assertEquals(root(), current()); // only the original scope deactivates on close } @Test @@ -96,15 +123,16 @@ void testClosingMultipleTimes() { Context context1 = root().with(STRING_KEY, "value1"); try (ContextScope ignored = context1.attach()) { Context context2 = context1.with(STRING_KEY, "value2"); - ContextScope scope = context2.attach(); - // Test current context - assertEquals(context2, current()); - // Test current context deactivation - scope.close(); - assertEquals(context1, current()); - // Test multiple context deactivations don’t change current context - scope.close(); - assertEquals(context1, current()); + try (ContextScope scope = context2.attach()) { + // Test current context + assertEquals(context2, current()); + // Test current context deactivation + scope.close(); + assertEquals(context1, current()); + // Test multiple context deactivations don’t change current context + scope.close(); + assertEquals(context1, current()); + } } } @@ -208,10 +236,4 @@ void testNonThreadInheritance() { assertDoesNotThrow(() -> future.get()); } } - - @AfterEach - void tearDown() { - // Ensure no current context after ending test - assertEquals(root(), current()); - } } diff --git a/components/context/src/test/java/datadog/context/ContextProvidersForkedTest.java b/components/context/src/test/java/datadog/context/ContextProvidersForkedTest.java index 915186554a6..b8e61ddc4a4 100644 --- a/components/context/src/test/java/datadog/context/ContextProvidersForkedTest.java +++ b/components/context/src/test/java/datadog/context/ContextProvidersForkedTest.java @@ -73,23 +73,21 @@ public Context current() { @Override public ContextScope attach(Context context) { - return new ContextScope() { - @Override - public Context context() { - return root(); - } - - @Override - public void close() { - // no-op - } - }; + return new NoopContextScope(root()); } @Override public Context swap(Context context) { return root(); } + + @Override + public ContextContinuation capture(Context context) { + return new NoopContextContinuation(root()); + } + + @Override + public void addListener(ContextListener listener) {} }); // NOOP manager, context will always be root diff --git a/components/context/src/test/java/datadog/context/ContextTestBase.java b/components/context/src/test/java/datadog/context/ContextTestBase.java new file mode 100644 index 00000000000..ecb0183e635 --- /dev/null +++ b/components/context/src/test/java/datadog/context/ContextTestBase.java @@ -0,0 +1,72 @@ +package datadog.context; + +import static datadog.context.Context.current; +import static datadog.context.Context.root; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.util.List; +import javax.annotation.ParametersAreNonnullByDefault; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; + +@ParametersAreNonnullByDefault +abstract class ContextTestBase { + @BeforeEach + void verifyNoContextBefore() { + assertEquals(root(), current()); + } + + @AfterEach + void verifyNoContextAfter() { + TestContextManager.clearListeners(); + assertEquals(root(), current()); + } + + static ContextListener trackingListener(List events) { + return new ContextListener() { + @Override + public void onAttach(Context c) { + events.add("attach"); + } + + @Override + public void onDetach(Context c) { + events.add("detach"); + } + + @Override + public void onCapture(Context c) { + events.add("capture"); + } + + @Override + public void onRelease(Context c) { + events.add("release"); + } + }; + } + + static ContextListener keyedTrackingListener(List events, ContextKey key) { + return new ContextListener() { + @Override + public void onAttach(Context c) { + events.add("attach:" + c.get(key)); + } + + @Override + public void onDetach(Context c) { + events.add("detach:" + c.get(key)); + } + + @Override + public void onCapture(Context c) { + events.add("capture:" + c.get(key)); + } + + @Override + public void onRelease(Context c) { + events.add("release:" + c.get(key)); + } + }; + } +} diff --git a/dd-trace-core/build.gradle b/dd-trace-core/build.gradle index 3df31b0388f..ee8ef78ee16 100644 --- a/dd-trace-core/build.gradle +++ b/dd-trace-core/build.gradle @@ -1,3 +1,5 @@ +import datadog.gradle.plugin.testJvmConstraints.TestJvmSpec + plugins { id 'me.champeau.jmh' id 'dd-trace-java.version-file' @@ -114,4 +116,14 @@ dependencies { jmh { jmhVersion = libs.versions.jmh.get() duplicateClassesStrategy = DuplicatesStrategy.EXCLUDE + if (project.hasProperty('jmh.includes')) { + includes = [project.property('jmh.includes').replace(',', '|')] + } + if (project.hasProperty('jmh.profilers')) { + profilers = project.property('jmh.profilers').tokenize(',') + } + if (project.hasProperty('testJvm')) { + def testJvmSpec = new TestJvmSpec(project) + jvm = testJvmSpec.javaTestLauncher.map { it.executablePath.asFile.absolutePath } + } } diff --git a/dd-trace-core/src/jmh/java/datadog/context/ContextManagerBenchmark.java b/dd-trace-core/src/jmh/java/datadog/context/ContextManagerBenchmark.java new file mode 100644 index 00000000000..039f0bad160 --- /dev/null +++ b/dd-trace-core/src/jmh/java/datadog/context/ContextManagerBenchmark.java @@ -0,0 +1,352 @@ +package datadog.context; + +import static java.util.concurrent.TimeUnit.MICROSECONDS; +import static java.util.concurrent.TimeUnit.SECONDS; + +import datadog.trace.core.scopemanager.ContinuableScopeManager; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Semaphore; +import java.util.concurrent.ThreadFactory; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.BenchmarkMode; +import org.openjdk.jmh.annotations.Fork; +import org.openjdk.jmh.annotations.Level; +import org.openjdk.jmh.annotations.Measurement; +import org.openjdk.jmh.annotations.Mode; +import org.openjdk.jmh.annotations.OutputTimeUnit; +import org.openjdk.jmh.annotations.Param; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.TearDown; +import org.openjdk.jmh.annotations.Threads; +import org.openjdk.jmh.annotations.Warmup; + +/** + * Compares {@link ThreadLocalContextManager} vs {@link ContinuableScopeManager} across context + * attach, swap, and cross-thread continuation scenarios — including virtual threads (requires JDK + * 21+). + * + *

For the same-non-root-context stack-depth scenario see {@link ContextManagerDepthBenchmark}. + * + *

Run with: + * + * 

+ * {@code ./gradlew :dd-trace-core:jmh -Pjmh.includes=ContextManagerBenchmark -PtestJvm=25 -Pjmh.profilers=gc}
+ *
+ */ +@State(Scope.Benchmark) +@Warmup(iterations = 3, time = 1) +@Measurement(iterations = 5, time = 1) +@BenchmarkMode(Mode.Throughput) +@Threads(8) +@OutputTimeUnit(MICROSECONDS) +@Fork(value = 1) +public class ContextManagerBenchmark { + + // ── Constants ────────────────────────────────────────────────────────────── + + // Reflective access to Thread.ofVirtual().factory() (Java 21+). + // Used to create fixed-size pools of virtual threads so no new VT is spawned per task. + // Falls back to platform threads on older JVMs — the benchmark still runs, but + // captureAndResumeOnVirtualThread and captureAndFanOutToVirtualThreads will measure + // platform-thread overhead instead. + static final boolean VIRTUAL_THREADS_AVAILABLE; + static final ThreadFactory VIRTUAL_OR_PLATFORM_FACTORY; + + static { + ThreadFactory factory = null; + try { + Object builder = Thread.class.getMethod("ofVirtual").invoke(null); + factory = (ThreadFactory) builder.getClass().getMethod("factory").invoke(builder); + } catch (Exception ignored) { + } + VIRTUAL_THREADS_AVAILABLE = factory != null; + VIRTUAL_OR_PLATFORM_FACTORY = factory != null ? factory : Thread::new; + } + + // Creates a fixed pool whose threads are virtual (Java 21+) or platform (older JVMs). + // Using a fixed pool rather than newVirtualThreadPerTaskExecutor avoids spawning a + // fresh virtual thread on every task submission, keeping thread-creation cost out of + // the measured critical path. + static ExecutorService newFixedVirtualPool(int nThreads) { + return Executors.newFixedThreadPool(nThreads, VIRTUAL_OR_PLATFORM_FACTORY); + } + + static final ContextKey KEY = ContextKey.named("benchmark-key"); + // power of 2 so cycling wraps cheaply with bit-mask + static final int CONTEXT_COUNT = 16; + // virtual threads spawned per continuation fan-out + static final int FAN_OUT = 8; + + // ── Parameters ───────────────────────────────────────────────────────────── + + /** + * Which {@link ContextManager} implementation to benchmark. + * + *

{@code ThreadLocal} — {@link ThreadLocalContextManager} (the lightweight default). + * + *

{@code Continuable} — {@link ContinuableScopeManager} (the full scope/span manager). + */ + @Param({"ThreadLocal", "Continuable"}) + public String managerType; + + // ── Benchmark-scoped shared state ───────────────────────────────────────── + + ContextManager manager; + // CONTEXT_COUNT distinct non-root contexts; threads cycle through them to + // avoid artificial same-context hits in benchmarks that don't want them + Context[] contexts; + + @Setup + public void setup() { + manager = createManager(managerType); + contexts = createContexts(); + } + + static ContextManager createManager(String type) { + return "Continuable".equals(type) + ? new ContinuableScopeManager(0, false) + : ThreadLocalContextManager.INSTANCE; + } + + static Context[] createContexts() { + Context[] contexts = new Context[CONTEXT_COUNT]; + for (int i = 0; i < CONTEXT_COUNT; i++) { + contexts[i] = Context.root().with(KEY, "value-" + i); + } + return contexts; + } + + // ── Per-thread state ─────────────────────────────────────────────────────── + + @State(Scope.Thread) + public static class ThreadState { + int index; + // Pre-allocated barrier reused across fan-out invocations. + // Avoids a new CountDownLatch allocation per invocation that would inflate gc.alloc.rate.norm. + final Semaphore fanOutBarrier = new Semaphore(0); + ExecutorService platformExecutor; + ExecutorService virtualExecutor; + + @Setup(Level.Trial) + public void setup() { + // Both pools are fixed-size so no new thread is created per submitted task. + // The virtual pool uses virtual threads (Java 21+) or falls back to platform threads. + // Pool size is intentionally larger than the JMH thread count to avoid executor starvation + // when benchmark threads all submit tasks concurrently. + platformExecutor = Executors.newFixedThreadPool(16); + virtualExecutor = newFixedVirtualPool(16); + } + + @TearDown(Level.Trial) + public void tearDown() throws InterruptedException { + platformExecutor.shutdown(); + virtualExecutor.shutdown(); + platformExecutor.awaitTermination(10, SECONDS); + virtualExecutor.awaitTermination(10, SECONDS); + } + + Context nextContext(Context[] contexts) { + return contexts[(index++) & (CONTEXT_COUNT - 1)]; + } + } + + // ── Thread state with a pre-attached context (for read benchmarks) ───────── + + /** + * Attaches a context once per trial so that {@link #current} and {@link #currentAndGet} measure + * only the read path, not the attach overhead. + */ + @State(Scope.Thread) + public static class ActiveContextState { + ContextScope scope; + + @Setup(Level.Trial) + public void setup(ContextManagerBenchmark benchmark) { + scope = benchmark.manager.attach(benchmark.contexts[0]); + } + + @TearDown(Level.Trial) + public void tearDown() { + scope.close(); + } + } + + // ── Scenario 1: attach a different context, close scope ─────────────────── + + /** Attach one distinct context then close its scope. The hot path for most instrumentations. */ + @Benchmark + public void attachAndClose(ThreadState thread) { + Context ctx = thread.nextContext(contexts); + try (ContextScope scope = manager.attach(ctx)) { + // scope is active + } + } + + // ── Scenario 2: nested attach of two different contexts ─────────────────── + + /** + * Attach two distinct contexts in sequence and close both. Exercises the stack push/pop cycle + * that occurs at every instrumented method boundary. + */ + @Benchmark + public void nestedAttachAndClose(ThreadState thread) { + Context outer = thread.nextContext(contexts); + Context inner = thread.nextContext(contexts); + try (ContextScope outerScope = manager.attach(outer)) { + try (ContextScope innerScope = manager.attach(inner)) { + // inner is active + } + } + } + + // ── Scenario 3: swap different contexts ─────────────────────────────────── + + /** + * Swap in a new context then swap back the previous one. {@link + * ContinuableScopeManager#swap(Context)} replaces the entire scope stack, making this a heavier + * operation than in {@link ThreadLocalContextManager}. + * + *

Note: GCProfiler will show allocation asymmetry here by design. {@link + * ContinuableScopeManager} swap allocates a {@code ScopeStack}, a {@code ContinuableScope}, and a + * {@code ScopeContext} per invocation; {@link ThreadLocalContextManager} swap is a plain field + * write. That asymmetry is the real cost of each manager's swap operation, not scaffolding. + */ + @Benchmark + public void swapContexts(ThreadState thread) { + Context ctx = thread.nextContext(contexts); + Context previous = manager.swap(ctx); + manager.swap(previous); + } + + // ── Scenario 4: capture + same-thread resume (continuation baseline) ─────── + + /** + * Capture the current context as a continuation and immediately resume it on the same thread. + * Establishes the allocation and atomic-counter cost of the continuation mechanism without any + * cross-thread scheduling overhead. + */ + @Benchmark + public void captureThenResumeSameThread(ThreadState thread) { + Context ctx = thread.nextContext(contexts); + try (ContextScope scope = manager.attach(ctx)) { + ContextContinuation cont = manager.capture(ctx); + try (ContextScope resumed = cont.resume()) { + // context restored on the same thread + } + } + } + + // ── Scenario 5: capture, resume on a platform thread ───────────────────── + + /** + * Capture the current context as a continuation and resume it on a pooled platform thread. + * Measures cross-thread handoff latency (submit + schedule + execute) for each manager. + * + *

Fewer JMH threads than the default so the platform executor is never saturated. + */ + @Benchmark + @Threads(4) + public void captureAndResumeOnPlatformThread(ThreadState thread) throws Exception { + captureAndResumeOnExecutor(thread, thread.platformExecutor); + } + + // ── Scenario 6: capture, resume on a virtual thread ────────────────────── + + /** + * Capture the current context as a continuation and resume it on a fixed-pool virtual thread. + * Shows how well each manager scales when continuations are used for structured concurrency or + * reactive pipelines on virtual threads. + */ + @Benchmark + @Threads(4) + public void captureAndResumeOnVirtualThread(ThreadState thread) throws Exception { + captureAndResumeOnExecutor(thread, thread.virtualExecutor); + } + + private void captureAndResumeOnExecutor(ThreadState thread, ExecutorService executor) + throws Exception { + Context ctx = thread.nextContext(contexts); + try (ContextScope scope = manager.attach(ctx)) { + ContextContinuation cont = manager.capture(ctx); + CompletableFuture.runAsync( + () -> { + try (ContextScope resumed = cont.resume()) { + // context propagated to executor thread + } + }, + executor) + .get(10, SECONDS); + } + } + + // ── Scenario 7: fan-out — one held continuation resumed on N virtual threads + + /** + * Capture one context, hold the continuation, then fan it out to {@value #FAN_OUT} virtual + * threads concurrently. Each virtual thread resumes the same continuation and closes its scope; + * only the explicit {@link ContextContinuation#release()} after the barrier completes the + * lifecycle. + * + *

This reflects async frameworks that dispatch a single request context to a pool of worker + * coroutines / virtual threads. + * + *

Uses {@link Mode#SampleTime} to capture percentile tail latency in addition to the mean. + * Warmup and measurement windows are extended because each invocation waits for {@value #FAN_OUT} + * round-trips before returning. + */ + @Benchmark + @Threads(2) + @BenchmarkMode(Mode.SampleTime) + @Warmup(iterations = 3, time = 3) + @Measurement(iterations = 5, time = 5) + public void captureAndFanOutToVirtualThreads(ThreadState thread) throws Exception { + Context ctx = thread.nextContext(contexts); + try (ContextScope scope = manager.attach(ctx)) { + ContextContinuation cont = manager.capture(ctx).hold(); + Semaphore barrier = thread.fanOutBarrier; + for (int i = 0; i < FAN_OUT; i++) { + thread.virtualExecutor.execute( + () -> { + try (ContextScope resumed = cont.resume()) { + // each virtual thread sees the same captured context + } finally { + barrier.release(); + } + }); + } + try { + if (!barrier.tryAcquire(FAN_OUT, 10, SECONDS)) { + throw new IllegalStateException("fan-out timed out"); + } + } finally { + cont.release(); + } + } + } + + // ── Scenario 8: read the current context ───────────────────────────────── + + /** + * Returns the currently active context. The most frequent operation in any traced application — + * called at every instrumented method boundary before reading a span or key. + */ + @Benchmark + public Context current(ActiveContextState active) { + return manager.current(); + } + + // ── Scenario 9: read a value from the current context ──────────────────── + + /** + * Returns a value from the currently active context. The full "read active span" path that + * instrumentation executes at every traced method boundary. + */ + @Benchmark + public Object currentAndGet(ActiveContextState active) { + return manager.current().get(KEY); + } +} diff --git a/dd-trace-core/src/jmh/java/datadog/context/ContextManagerDepthBenchmark.java b/dd-trace-core/src/jmh/java/datadog/context/ContextManagerDepthBenchmark.java new file mode 100644 index 00000000000..04da28efc9c --- /dev/null +++ b/dd-trace-core/src/jmh/java/datadog/context/ContextManagerDepthBenchmark.java @@ -0,0 +1,88 @@ +package datadog.context; + +import static java.util.concurrent.TimeUnit.MICROSECONDS; + +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.BenchmarkMode; +import org.openjdk.jmh.annotations.Fork; +import org.openjdk.jmh.annotations.Measurement; +import org.openjdk.jmh.annotations.Mode; +import org.openjdk.jmh.annotations.OutputTimeUnit; +import org.openjdk.jmh.annotations.Param; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.Threads; +import org.openjdk.jmh.annotations.Warmup; + +/** + * Benchmarks attaching the same non-root context {@code depth} times then closing all scopes in + * LIFO order, isolating the same-context fast-path cost from the general attach/close benchmarks in + * {@link ContextManagerBenchmark}. + * + *

In {@link ThreadLocalContextManager} each re-attach after the first returns a no-op scope. In + * {@link datadog.trace.core.scopemanager.ContinuableScopeManager} the first attach creates the + * scope and subsequent re-attaches increment its reference count; each close decrements it, with + * the final close doing the real work. + * + *

Run with: + * + * 

+ * {@code ./gradlew :dd-trace-core:jmh -Pjmh.includes=ContextManagerDepthBenchmark -PtestJvm=25 -Pjmh.profilers=gc}
+ *
+ */ +@State(Scope.Benchmark) +@Warmup(iterations = 3, time = 1) +@Measurement(iterations = 5, time = 1) +@BenchmarkMode(Mode.Throughput) +@Threads(8) +@OutputTimeUnit(MICROSECONDS) +@Fork(value = 1) +public class ContextManagerDepthBenchmark { + + /** + * Which {@link ContextManager} implementation to benchmark. + * + * @see ContextManagerBenchmark#managerType + */ + @Param({"ThreadLocal", "Continuable"}) + public String managerType; + + @Param({"1", "4", "8", "100"}) + public int depth; + + ContextManager manager; + Context[] contexts; + + @Setup + public void setup() { + manager = ContextManagerBenchmark.createManager(managerType); + contexts = ContextManagerBenchmark.createContexts(); + } + + @State(Scope.Thread) + public static class ThreadState { + final ContextScope[] scopes = new ContextScope[100]; + + int nextContextIndex; + + Context nextContext(Context[] contexts) { + return contexts[(nextContextIndex++) & (ContextManagerBenchmark.CONTEXT_COUNT - 1)]; + } + } + + // ── Benchmark ───────────────────────────────────────────────────────────── + + /** Attach the same context {@code depth} times then close all scopes in LIFO order. */ + @Benchmark + public void attachSameContextDepth(ThreadState thread) { + Context ctx = thread.nextContext(contexts); + ContextScope[] scopes = thread.scopes; + for (int i = 0; i < depth; i++) { + scopes[i] = manager.attach(ctx); + } + for (int i = depth - 1; i >= 0; i--) { + scopes[i].close(); + } + } +} diff --git a/dd-trace-core/src/main/java/datadog/trace/core/DDSpan.java b/dd-trace-core/src/main/java/datadog/trace/core/DDSpan.java index ad46c7ecccc..33206b491b8 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/DDSpan.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/DDSpan.java @@ -9,6 +9,7 @@ import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.NANOSECONDS; +import datadog.context.SelfScopedContext; import datadog.trace.api.Config; import datadog.trace.api.DDSpanId; import datadog.trace.api.DDTags; @@ -50,7 +51,8 @@ *

Spans are created by the {@link CoreTracer#buildSpan}. This implementation adds some features * according to the DD agent. */ -public class DDSpan implements AgentSpan, CoreSpan, AttachableWrapper { +@SuppressWarnings("resource") +public class DDSpan implements AgentSpan, CoreSpan, AttachableWrapper, SelfScopedContext { private static final Logger log = LoggerFactory.getLogger(DDSpan.class); static DDSpan create( diff --git a/dd-trace-core/src/main/java/datadog/trace/core/PendingTrace.java b/dd-trace-core/src/main/java/datadog/trace/core/PendingTrace.java index 04e97058aa0..3372404a42f 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/PendingTrace.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/PendingTrace.java @@ -210,6 +210,7 @@ private void trackRunningTrace(final DDSpan span) { } Integer evaluateSamplingPriority() { + @SuppressWarnings("resource") DDSpan span = spans.peek(); if (span == null) { return null; diff --git a/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScopeManager.java b/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScopeManager.java index 53e4d5b7da6..d278097b053 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScopeManager.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScopeManager.java @@ -13,6 +13,8 @@ import static java.util.concurrent.TimeUnit.SECONDS; import datadog.context.Context; +import datadog.context.ContextContinuation; +import datadog.context.ContextListener; import datadog.context.ContextManager; import datadog.context.ContextScope; import datadog.logging.RatelimitedLogger; @@ -409,6 +411,31 @@ public Context swap(Context context) { return new ScopeContext(oldStack); } + @Override + public ContextContinuation capture(Context context) { + // respect async propagation flag for Context.current().capture() + ContinuableScope activeScope = scopeStack().active(); + if (activeScope != null + && activeScope.context == context + && !activeScope.isAsyncPropagating()) { + return AgentTracer.noopContinuation(); + } + AgentSpan span = AgentSpan.fromContext(context); + AgentTraceCollector traceCollector; + if (span != null) { + traceCollector = span.spanContext().getTraceCollector(); + } else { + traceCollector = AgentTracer.NoopAgentTraceCollector.INSTANCE; + } + return new ScopeContinuation(this, context, CONTEXT, traceCollector).register(); + } + + @Override + public void addListener(ContextListener unused) { + // this new API is not expected to be used in legacy mode... + log.warn("Unexpected call to ContextManager.addListener(...)"); + } + static final class ScopeStackThreadLocal extends ThreadLocal { private final ProfilingContextIntegration profilingContextIntegration; diff --git a/dd-trace-core/src/test/java/datadog/trace/core/scopemanager/ScopeManagerTest.java b/dd-trace-core/src/test/java/datadog/trace/core/scopemanager/ScopeManagerTest.java index 122ddd560c7..cf1748cece0 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/scopemanager/ScopeManagerTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/scopemanager/ScopeManagerTest.java @@ -5,6 +5,7 @@ import static datadog.trace.core.scopemanager.ScopeManagerTest.EVENT.ACTIVATE; import static datadog.trace.core.scopemanager.ScopeManagerTest.EVENT.CLOSE; import static datadog.trace.test.util.GCUtils.awaitGC; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertInstanceOf; @@ -24,6 +25,7 @@ import static org.mockito.Mockito.when; import datadog.context.Context; +import datadog.context.ContextContinuation; import datadog.context.ContextKey; import datadog.context.ContextScope; import datadog.trace.api.DDTraceId; @@ -1075,6 +1077,72 @@ void contextsCanBeSwappedOutAndBack() { assertEquals(Context.root(), scopeManager.current()); } + @Test + void captureViaContextContinuationAPIHoldsTrace() throws Exception { + AgentSpan span = tracer.buildSpan("test", "test").start(); + AgentScope scope = tracer.activateSpan(span); + + // Context.current().capture() routes through ContinuableScopeManager.capture(Context) + ContextContinuation continuation = Context.current().capture(); + + scope.close(); + span.finish(); + assertTrue(writer.isEmpty()); // trace held pending continuation + + continuation.release(); // delegates to cancel(), unblocks trace reporting + writer.waitForTraces(1); + assertFalse(writer.isEmpty()); + } + + @Test + void continuationResumeActivatesSpan() throws Exception { + AgentSpan span = tracer.buildSpan("test", "test").start(); + AgentScope scope = tracer.activateSpan(span); + AgentScope.Continuation continuation = tracer.captureActiveSpan(); + scope.close(); + span.finish(); + + assertNull(scopeManager.active()); + assertTrue(writer.isEmpty()); // trace held by continuation + + // resume() delegates to activate() + ContextScope resumedScope = continuation.resume(); + assertSame(span, scopeManager.active().span()); + + resumedScope.close(); + assertNull(scopeManager.active()); + writer.waitForTraces(1); + assertFalse(writer.isEmpty()); + } + + @Test + void continuationReleaseIsSameAsCancel() throws Exception { + AgentSpan span = tracer.buildSpan("test", "test").start(); + AgentScope scope = tracer.activateSpan(span); + AgentScope.Continuation continuation = tracer.captureActiveSpan(); + scope.close(); + span.finish(); + + assertTrue(writer.isEmpty()); // trace held by continuation + + continuation.release(); // delegates to cancel() + writer.waitForTraces(1); + assertFalse(writer.isEmpty()); + } + + @Test + void captureContextWithoutSpanUsesNoopTraceCollector() { + ContextKey key = ContextKey.named("test-key"); + Context ctx = Context.root().with(key, "value"); + assertDoesNotThrow( + () -> { + // NoopAgentTraceCollector handles capture/release without throwing + try (ContextScope scope = ctx.attach()) { + Context.current().capture().release(); + } + }); + } + private boolean spanFinished(AgentSpan span) { return span instanceof DDSpan && ((DDSpan) span).isFinished(); } diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentScope.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentScope.java index ba94d72c218..3f37f88db63 100644 --- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentScope.java +++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentScope.java @@ -1,6 +1,7 @@ package datadog.trace.bootstrap.instrumentation.api; import datadog.context.Context; +import datadog.context.ContextContinuation; import datadog.context.ContextScope; import datadog.trace.context.TraceScope; import java.io.Closeable; @@ -16,7 +17,7 @@ default Context context() { @Override void close(); - interface Continuation extends TraceScope.Continuation { + interface Continuation extends TraceScope.Continuation, ContextContinuation { @Override Continuation hold(); @@ -26,9 +27,19 @@ interface Continuation extends TraceScope.Continuation { /** Provide access to the captured span */ AgentSpan span(); - /** Provide access to the captured context */ + @Override default Context context() { return span(); } + + @Override + default ContextScope resume() { + return activate(); + } + + @Override + default void release() { + cancel(); + } } } diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/NoopSpan.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/NoopSpan.java index 91041164855..a5f1ce0d788 100644 --- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/NoopSpan.java +++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/NoopSpan.java @@ -1,5 +1,6 @@ package datadog.trace.bootstrap.instrumentation.api; +import datadog.context.SelfScopedContext; import datadog.trace.api.DDSpanId; import datadog.trace.api.DDTraceId; import datadog.trace.api.TagMap; @@ -8,7 +9,7 @@ import datadog.trace.api.gateway.RequestContext; import datadog.trace.api.sampling.PrioritySampling; -class NoopSpan extends ImmutableSpan implements AgentSpan { +class NoopSpan extends ImmutableSpan implements AgentSpan, SelfScopedContext { static final NoopSpan INSTANCE = new NoopSpan(); NoopSpan() {} From b62286406326b2e6e0ac31877d6aa44fdf40c865 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Gonz=C3=A1lez=20Garc=C3=ADa?= Date: Thu, 25 Jun 2026 11:19:53 +0200 Subject: [PATCH 046/139] fix: report correct block outcome tag in rasp.rule.match metric (#11723) fix: report correct block outcome tag in rasp.rule.match metric rasp.rule.match was always reporting block:N/A because raspRuleMatch() was called before the action loop; flow.isBlocking() is only valid after setAction() runs inside the loop. - Move raspRuleMatch() call to after the action loop (setRaspMatched stays in place) - Add boolean blocked param; double counter array for per-outcome tracking - Update prepareMetrics() to drain both blocked/non-blocked slots per RuleType - Add block: tag to both variant and non-variant RaspRuleMatch branches - Guard flow.setAction(rba) against null return from createBlockRequestAction/createRedirectRequestAction Merge branch 'master' into rasp-rule-match-fix Co-authored-by: devflow.devflow-routing-intake --- .../com/datadog/appsec/ddwaf/WAFModule.java | 12 ++- .../api/telemetry/WafMetricCollector.java | 35 ++++++--- .../telemetry/WafMetricCollectorTest.groovy | 73 ++++++++++++++++++- 3 files changed, 103 insertions(+), 17 deletions(-) diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/ddwaf/WAFModule.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/ddwaf/WAFModule.java index 00295e0a64c..a7aac0a6f98 100644 --- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/ddwaf/WAFModule.java +++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/ddwaf/WAFModule.java @@ -360,7 +360,6 @@ public void onDataAvailable( if (gwCtx.isRasp) { reqCtx.setRaspMatched(true); - WafMetricCollector.get().raspRuleMatch(gwCtx.raspRuleType); } String securityResponseId = null; @@ -375,13 +374,17 @@ public void onDataAvailable( securityResponseId = (String) actionInfo.parameters.get("security_response_id"); Flow.Action.RequestBlockingAction rba = createBlockRequestAction(actionInfo, reqCtx, gwCtx.isRasp, securityResponseId); - flow.setAction(rba); + if (rba != null) { + flow.setAction(rba); + } } else if ("redirect_request".equals(actionInfo.type)) { // Extract security_response_id from action parameters for use in triggers securityResponseId = (String) actionInfo.parameters.get("security_response_id"); Flow.Action.RequestBlockingAction rba = createRedirectRequestAction(actionInfo, reqCtx, gwCtx.isRasp, securityResponseId); - flow.setAction(rba); + if (rba != null) { + flow.setAction(rba); + } } else if ("generate_stack".equals(actionInfo.type)) { if (Config.get().isAppSecStackTraceEnabled()) { String stackId = (String) actionInfo.parameters.get("stack_id"); @@ -417,6 +420,9 @@ public void onDataAvailable( } } } + if (gwCtx.isRasp) { + WafMetricCollector.get().raspRuleMatch(gwCtx.raspRuleType, flow.isBlocking()); + } Collection events = buildEvents(resultWithData, securityResponseId); boolean isThrottled = reqCtx.isThrottled(rateLimiter); diff --git a/internal-api/src/main/java/datadog/trace/api/telemetry/WafMetricCollector.java b/internal-api/src/main/java/datadog/trace/api/telemetry/WafMetricCollector.java index 5d6914a4b1e..96797ebae6f 100644 --- a/internal-api/src/main/java/datadog/trace/api/telemetry/WafMetricCollector.java +++ b/internal-api/src/main/java/datadog/trace/api/telemetry/WafMetricCollector.java @@ -44,7 +44,7 @@ private WafMetricCollector() { private static final AtomicLongArray raspRuleSkippedCounter = new AtomicLongArray(RuleType.getNumValues()); private static final AtomicLongArray raspRuleMatchCounter = - new AtomicLongArray(RuleType.getNumValues()); + new AtomicLongArray(RuleType.getNumValues() * 2); private static final AtomicLongArray raspTimeoutCounter = new AtomicLongArray(RuleType.getNumValues()); private static final AtomicLongArray raspErrorCodeCounter = @@ -154,8 +154,8 @@ public void raspRuleSkipped(final RuleType ruleType) { raspRuleSkippedCounter.incrementAndGet(ruleType.ordinal()); } - public void raspRuleMatch(final RuleType ruleType) { - raspRuleMatchCounter.incrementAndGet(ruleType.ordinal()); + public void raspRuleMatch(final RuleType ruleType, final boolean blocked) { + raspRuleMatchCounter.incrementAndGet(ruleType.ordinal() * 2 + (blocked ? 1 : 0)); } public void raspTimeout(final RuleType ruleType) { @@ -272,12 +272,20 @@ public void prepareMetrics() { } } - // RASP rule match per rule type + // RASP rule match per rule type: two slots per RuleType: ordinal*2 (non-blocked), + // ordinal*2+1 (blocked) for (RuleType ruleType : RuleType.values()) { - long counter = raspRuleMatchCounter.getAndSet(ruleType.ordinal(), 0); - if (counter > 0) { + long blockedCount = raspRuleMatchCounter.getAndSet(ruleType.ordinal() * 2 + 1, 0); + if (blockedCount > 0) { if (!rawMetricsQueue.offer( - new RaspRuleMatch(counter, ruleType, WafMetricCollector.wafVersion))) { + new RaspRuleMatch(blockedCount, ruleType, WafMetricCollector.wafVersion, true))) { + return; + } + } + long nonBlockedCount = raspRuleMatchCounter.getAndSet(ruleType.ordinal() * 2, 0); + if (nonBlockedCount > 0) { + if (!rawMetricsQueue.offer( + new RaspRuleMatch(nonBlockedCount, ruleType, WafMetricCollector.wafVersion, false))) { return; } } @@ -552,7 +560,11 @@ public AfterRequestRaspRuleSkipped(final long counter, final RuleType ruleType) } public static class RaspRuleMatch extends WafMetric { - public RaspRuleMatch(final long counter, final RuleType ruleType, final String wafVersion) { + public RaspRuleMatch( + final long counter, + final RuleType ruleType, + final String wafVersion, + final boolean blocked) { super( "rasp.rule.match", counter, @@ -561,9 +573,12 @@ public RaspRuleMatch(final long counter, final RuleType ruleType, final String w "rule_type:" + ruleType.type, "rule_variant:" + ruleType.variant, "waf_version:" + wafVersion, - "event_rules_version:" + rulesVersion + "event_rules_version:" + rulesVersion, + "block:" + blocked } - : new String[] {"rule_type:" + ruleType.type, "waf_version:" + wafVersion}); + : new String[] { + "rule_type:" + ruleType.type, "waf_version:" + wafVersion, "block:" + blocked + }); } } diff --git a/internal-api/src/test/groovy/datadog/trace/api/telemetry/WafMetricCollectorTest.groovy b/internal-api/src/test/groovy/datadog/trace/api/telemetry/WafMetricCollectorTest.groovy index 0ee8ed04e6e..5f5663d1e3b 100644 --- a/internal-api/src/test/groovy/datadog/trace/api/telemetry/WafMetricCollectorTest.groovy +++ b/internal-api/src/test/groovy/datadog/trace/api/telemetry/WafMetricCollectorTest.groovy @@ -37,7 +37,7 @@ class WafMetricCollectorTest extends DDSpecification { WafMetricCollector.get().wafUpdates('rules.3', false) WafMetricCollector.get().raspRuleEval(RuleType.SQL_INJECTION) WafMetricCollector.get().raspRuleEval(RuleType.SQL_INJECTION) - WafMetricCollector.get().raspRuleMatch(RuleType.SQL_INJECTION) + WafMetricCollector.get().raspRuleMatch(RuleType.SQL_INJECTION, false) WafMetricCollector.get().raspRuleEval(RuleType.SQL_INJECTION) WafMetricCollector.get().raspTimeout(RuleType.SQL_INJECTION) WafMetricCollector.get().raspErrorCode(RuleType.SHELL_INJECTION, DD_WAF_RUN_INTERNAL_ERROR) @@ -85,7 +85,7 @@ class WafMetricCollectorTest extends DDSpecification { raspRuleMatch.value == 1 raspRuleMatch.namespace == 'appsec' raspRuleMatch.metricName == 'rasp.rule.match' - raspRuleMatch.tags.toSet() == ['rule_type:sql_injection', 'waf_version:waf_ver1'].toSet() + raspRuleMatch.tags.toSet() == ['rule_type:sql_injection', 'waf_version:waf_ver1', 'block:false'].toSet() def raspTimeout = (WafMetricCollector.RaspTimeout) metrics[5] raspTimeout.type == 'count' @@ -317,7 +317,7 @@ class WafMetricCollectorTest extends DDSpecification { WafMetricCollector.get().wafInit('waf_ver1', 'rules.1', true) WafMetricCollector.get().raspRuleEval(ruleType) WafMetricCollector.get().raspRuleEval(ruleType) - WafMetricCollector.get().raspRuleMatch(ruleType) + WafMetricCollector.get().raspRuleMatch(ruleType, false) WafMetricCollector.get().raspRuleEval(ruleType) WafMetricCollector.get().raspTimeout(ruleType) WafMetricCollector.get().raspErrorCode(ruleType, DD_WAF_RUN_INTERNAL_ERROR) @@ -349,7 +349,8 @@ class WafMetricCollectorTest extends DDSpecification { 'rule_type:command_injection', 'rule_variant:' + ruleType.variant, 'waf_version:waf_ver1', - 'event_rules_version:rules.1' + 'event_rules_version:rules.1', + 'block:false' ].toSet() def raspTimeout = (WafMetricCollector.RaspTimeout) metrics[3] @@ -585,6 +586,70 @@ class WafMetricCollectorTest extends DDSpecification { type << [MESSAGES, CONTENT] } + void 'test rasp rule match block tag'() { + given: + final collector = WafMetricCollector.get() + collector.wafInit('waf_ver1', 'rules.1', true) + + when: + collector.raspRuleMatch(ruleType, blocked) + + then: + collector.prepareMetrics() + final metrics = collector.drain() + final matchMetrics = metrics.findAll { it.metricName == 'rasp.rule.match' } + + matchMetrics.size() == 1 + final metric = matchMetrics[0] + metric.type == 'count' + metric.value == 1 + metric.namespace == 'appsec' + final expectedTags = ruleType.variant != null + ? [ + 'rule_type:' + ruleType.type, + 'rule_variant:' + ruleType.variant, + 'waf_version:waf_ver1', + 'event_rules_version:rules.1', + 'block:' + blocked + ].toSet() + : ['rule_type:' + ruleType.type, 'waf_version:waf_ver1', 'block:' + blocked].toSet() + metric.tags.toSet() == expectedTags + + where: + ruleType | blocked + RuleType.SQL_INJECTION | true + RuleType.SQL_INJECTION | false + RuleType.LFI | true + RuleType.LFI | false + RuleType.SSRF_REQUEST | true + RuleType.SSRF_REQUEST | false + RuleType.SSRF_RESPONSE | true + RuleType.SSRF_RESPONSE | false + RuleType.SHELL_INJECTION | true + RuleType.SHELL_INJECTION | false + RuleType.COMMAND_INJECTION | true + RuleType.COMMAND_INJECTION | false + } + + void 'test rasp rule match drains blocked and non-blocked as separate metrics'() { + given: + final collector = WafMetricCollector.get() + collector.wafInit('waf_ver1', 'rules.1', true) + + when: + collector.raspRuleMatch(RuleType.SQL_INJECTION, true) + collector.raspRuleMatch(RuleType.SQL_INJECTION, false) + + then: + collector.prepareMetrics() + final metrics = collector.drain() + final matchMetrics = metrics.findAll { it.metricName == 'rasp.rule.match' } + + matchMetrics.size() == 2 + matchMetrics.find { it.tags.contains('block:true') }?.value == 1 + matchMetrics.find { it.tags.contains('block:false') }?.value == 1 + } + /** * Helper method to generate all combinations of n boolean values. */ From cebb1b80540448ebd4d285f8fd288a4d243d39f5 Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Thu, 25 Jun 2026 13:53:15 +0200 Subject: [PATCH 047/139] Avoid final field modification in Weaver instrumentation (#11728) fix: avoid final field modification in Weaver instrumentation Update dd-java-agent/instrumentation/weaver-0.9/src/main/java/datadog/trace/instrumentation/weaver/WeaverInstrumentation.java Co-authored-by: Brice Dutheil Update dd-java-agent/instrumentation/weaver-0.9/src/main/java/datadog/trace/instrumentation/weaver/WeaverInstrumentation.java Co-authored-by: Brice Dutheil Co-authored-by: daniel.mohedano --- .../weaver/WeaverInstrumentation.java | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/dd-java-agent/instrumentation/weaver-0.9/src/main/java/datadog/trace/instrumentation/weaver/WeaverInstrumentation.java b/dd-java-agent/instrumentation/weaver-0.9/src/main/java/datadog/trace/instrumentation/weaver/WeaverInstrumentation.java index fe8e60e4fd2..be033fb009a 100644 --- a/dd-java-agent/instrumentation/weaver-0.9/src/main/java/datadog/trace/instrumentation/weaver/WeaverInstrumentation.java +++ b/dd-java-agent/instrumentation/weaver-0.9/src/main/java/datadog/trace/instrumentation/weaver/WeaverInstrumentation.java @@ -1,12 +1,12 @@ package datadog.trace.instrumentation.weaver; +import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.isConstructor; +import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import com.google.auto.service.AutoService; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; -import de.thetaphi.forbiddenapis.SuppressForbidden; -import java.lang.reflect.Field; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.LinkedBlockingQueue; import net.bytebuddy.asm.Advice; @@ -38,34 +38,34 @@ public String[] helperClassNames() { @Override public void methodAdvice(MethodTransformer transformer) { + // disneystreaming/weaver-test (0.8.4+) uses a ConcurrentLinkedQueue transformer.applyAdvice( - isConstructor(), WeaverInstrumentation.class.getName() + "$SbtTaskCreationAdvice"); + isConstructor().and(takesArgument(5, named("java.util.concurrent.ConcurrentLinkedQueue"))), + WeaverInstrumentation.class.getName() + "$ConcurrentLinkedQueueAdvice"); + // typelevel/weaver-test (0.9+) uses a LinkedBlockingQueue + transformer.applyAdvice( + isConstructor().and(takesArgument(5, named("java.util.concurrent.LinkedBlockingQueue"))), + WeaverInstrumentation.class.getName() + "$LinkedBlockingQueueAdvice"); + } + + public static class ConcurrentLinkedQueueAdvice { + @Advice.OnMethodEnter(suppress = Throwable.class) + public static void wrapQueue( + @Advice.Argument(0) TaskDef taskDef, + @Advice.Argument(value = 5, readOnly = false) ConcurrentLinkedQueue queue) { + if (!(queue instanceof TaskDefAwareConcurrentLinkedQueueProxy)) { + queue = new TaskDefAwareConcurrentLinkedQueueProxy<>(taskDef, queue); + } + } } - public static class SbtTaskCreationAdvice { - // TODO: JEP 500 - avoid mutating final fields - @SuppressForbidden - @Advice.OnMethodExit(suppress = Throwable.class) - public static void onTaskCreation( - @Advice.This Object sbtTask, @Advice.FieldValue("taskDef") TaskDef taskDef) { - try { - Field queueField = sbtTask.getClass().getDeclaredField("queue"); - queueField.setAccessible(true); - Object queue = queueField.get(sbtTask); - if (queue instanceof ConcurrentLinkedQueue) { - // disney's implementation (0.8.4+) uses a ConcurrentLinkedQueue for the field - queueField.set( - sbtTask, - new TaskDefAwareConcurrentLinkedQueueProxy( - taskDef, (ConcurrentLinkedQueue) queue)); - } else if (queue instanceof LinkedBlockingQueue) { - // typelevel's implementation (0.9+) uses a LinkedBlockingQueue for the field - queueField.set( - sbtTask, - new TaskDefAwareLinkedBlockingQueueProxy( - taskDef, (LinkedBlockingQueue) queue)); - } - } catch (Exception ignored) { + public static class LinkedBlockingQueueAdvice { + @Advice.OnMethodEnter(suppress = Throwable.class) + public static void wrapQueue( + @Advice.Argument(0) TaskDef taskDef, + @Advice.Argument(value = 5, readOnly = false) LinkedBlockingQueue queue) { + if (!(queue instanceof TaskDefAwareLinkedBlockingQueueProxy)) { + queue = new TaskDefAwareLinkedBlockingQueueProxy<>(taskDef, queue); } } } From 4e31214eb03689128eba0b4d4e4870591c2a40e3 Mon Sep 17 00:00:00 2001 From: Brice Dutheil Date: Thu, 25 Jun 2026 14:20:58 +0200 Subject: [PATCH 048/139] chore: Move golden file and hard jar numbers to metadata (#11740) chore: Move golden file and hard jar numbers to metadata Co-authored-by: brice.dutheil --- dd-java-agent/build.gradle | 68 +++++--- dd-java-agent/expected-integrations.txt | 208 ---------------------- docs/add_new_instrumentation.md | 12 +- metadata/agent-jar-checks.properties | 220 ++++++++++++++++++++++++ 4 files changed, 267 insertions(+), 241 deletions(-) delete mode 100644 dd-java-agent/expected-integrations.txt create mode 100644 metadata/agent-jar-checks.properties diff --git a/dd-java-agent/build.gradle b/dd-java-agent/build.gradle index 13214983663..4710bd5bc98 100644 --- a/dd-java-agent/build.gradle +++ b/dd-java-agent/build.gradle @@ -475,24 +475,30 @@ tasks.withType(Test).configureEach { dependsOn "shadowJar" } +def agentJarChecksProps = rootProject.file('metadata/agent-jar-checks.properties') + tasks.register('verifyAgentJarContents') { group = LifecycleBasePlugin.VERIFICATION_GROUP description = 'Verify the agent jar contains required entries and meets structural invariants' def jarProvider = tasks.named('shadowJar', ShadowJar).flatMap { it.archiveFile } inputs.file(jarProvider) + inputs.file(agentJarChecksProps) inputs.property('productPrefixes', includedProductPrefixes) outputs.file(project.layout.buildDirectory.file("tmp/${it.name}/.verified")) doLast { + def props = new Properties() + agentJarChecksProps.withInputStream { props.load(it) } + File jarFile = jarProvider.get().asFile List failures = [] Map entries = [:] - // Jar size ceiling — raise only when the growth is intentional - def sizeCeiling = 33L * 1024 * 1024 - if (jarFile.length() > sizeCeiling) { - failures << "Jar size ${jarFile.length()} B exceeds ceiling ${sizeCeiling} B (33 MiB)" + // Jar size budget — raise only when the growth is intentional + def sizeBudget = Long.parseLong(props['jar.size.budget']) + if (jarFile.length() > sizeBudget) { + failures.add("Jar size ${jarFile.length()} B exceeds budget ${sizeBudget} B") } // Inspect jar content @@ -524,15 +530,15 @@ tasks.register('verifyAgentJarContents') { 'META-INF/maven/com.datadoghq/dd-java-agent/pom.properties', ].each { required -> if (!entries.containsKey(required)) { - failures << "Missing required entry: ${required}" + failures.add("Missing required entry: ${required}") } } - // Sanity check on the minimum number of classes; update as needed. Set to about 98% of that number. + // Sanity check on the minimum number of classes; see metadata/agent-jar-checks.properties. def classCount = entries.keySet().count { it.endsWith('.class') || it.endsWith('.classdata') } - def classFloor = 17_000 // a bit more than 98% of 17,279 at time of writing + def classFloor = Integer.parseInt(props['classes.minimum.guard']) if (classCount < classFloor) { - failures << "Class count ${classCount} is below floor ${classFloor}" + failures.add("Class count ${classCount} is below floor ${classFloor}") } // Each registered product must contribute at least one .classdata entry. @@ -543,13 +549,13 @@ tasks.register('verifyAgentJarContents') { .toSet() includedProductPrefixes.get().each { dir -> if (!classdataPrefixes.contains(dir)) { - failures << "Product '${dir}' has no .classdata entries in the assembled jar" + failures.add("Product '${dir}' has no .classdata entries in the assembled jar") } } // All *.index files in the jar must be non-empty entries.findAll { name, size -> name.endsWith('.index') && size == 0 }.each { name, _ -> - failures << "Empty index file: ${name}" + failures.add("Empty index file: ${name}") } // Packages that must not appear anywhere in the jar after relocation. @@ -561,7 +567,7 @@ tasks.register('verifyAgentJarContents') { } if (!leaked.empty) { def sample = leaked.take(3).toString() - failures << "Unrelocated package '${pkg}': ${sample}${leaked.size() > 3 ? ' ...' : ''}" + failures.add("Unrelocated package '${pkg}': ${sample}${leaked.size() > 3 ? ' ...' : ''}") } } @@ -577,15 +583,13 @@ tasks.register('verifyAgentJarContents') { } } -def integrationsGoldenFile = project.file('expected-integrations.txt') - tasks.register('verifyAgentJarIntegrations', JavaExec) { group = LifecycleBasePlugin.VERIFICATION_GROUP - description = 'Verify the agent jar lists exactly the integrations in expected-integrations.txt' + description = 'Verify the agent jar lists exactly the integrations in metadata/agent-jar-checks.properties' def jarProvider = tasks.named('shadowJar', ShadowJar).flatMap { it.archiveFile } inputs.file(jarProvider) - inputs.file(integrationsGoldenFile) + inputs.file(agentJarChecksProps) outputs.file(project.layout.buildDirectory.file("tmp/${it.name}/.verified")) // Run the assembled agent jar directly — this exercises dd-java-agent.index, @@ -609,19 +613,15 @@ tasks.register('verifyAgentJarIntegrations', JavaExec) { "(likely a module load failure; see InstrumenterIndex.buildModule):\n${stderr}") } - if (!integrationsGoldenFile.exists()) { - throw new GradleException( - "${integrationsGoldenFile.name} not found. " + - "Run './gradlew :dd-java-agent:updateAgentJarIntegrationsGoldenFile' to create it.") - } - + def props = new Properties() + agentJarChecksProps.withInputStream { props.load(it) } def actual = capturedOutput.toString().readLines().findAll { !it.isBlank() }.toSorted() - def expected = integrationsGoldenFile.readLines().findAll { !it.isBlank() }.toSorted() + def expected = props.getProperty('expected.integrations').split(',').collect { it.trim() }.toSorted() def added = actual - expected def removed = expected - actual if (added || removed) { - def msg = new StringBuilder("Integration list differs from ${integrationsGoldenFile.name}.") + def msg = new StringBuilder('Integration list differs from metadata/agent-jar-checks.properties.') msg.append(" Run './gradlew :dd-java-agent:updateAgentJarIntegrationsGoldenFile' to update it.\n") added.each { msg.append(" + ${it}\n") } removed.each { msg.append(" - ${it}\n") } @@ -634,10 +634,11 @@ tasks.register('verifyAgentJarIntegrations', JavaExec) { } } -// Manual run after adding/removing integrations to update expected-integrations.txt, then add with the new integration. +// Manual run after adding/removing integrations; rewrites the expected.integrations block in +// metadata/agent-jar-checks.properties while preserving all other properties and comments. tasks.register('updateAgentJarIntegrationsGoldenFile', JavaExec) { group = LifecycleBasePlugin.VERIFICATION_GROUP - description = 'Regenerate expected-integrations.txt from the current agent jar' + description = 'Regenerate expected.integrations in metadata/agent-jar-checks.properties from the current agent jar' def jarProvider = tasks.named('shadowJar', ShadowJar).flatMap { it.archiveFile } inputs.file(jarProvider) @@ -651,8 +652,21 @@ tasks.register('updateAgentJarIntegrationsGoldenFile', JavaExec) { doLast { def integrations = capturedOutput.toString().readLines().findAll { !it.isBlank() }.toSorted() - integrationsGoldenFile.text = integrations.join('\n') + '\n' - logger.lifecycle("Updated ${integrationsGoldenFile.name} with ${integrations.size()} integrations") + + def entryLines = integrations.withIndex().collect { name, i -> + def prefix = (i == 0) ? 'expected.integrations = ' : ' ' + def suffix = (i < integrations.size() - 1) ? ',\\' : '' + "${prefix}${name}${suffix}" + } + + // Replace everything between the BEGIN/END markers (inclusive) with the fresh value. + def BEGIN = '# BEGIN expected.integrations' + def END = '# END expected.integrations' + def allLines = agentJarChecksProps.readLines() + def before = allLines.subList(0, allLines.findIndexOf { it.startsWith(BEGIN) }) + def after = allLines.subList(allLines.findIndexOf { it.startsWith(END) } + 1, allLines.size()) + agentJarChecksProps.text = (before + [BEGIN] + entryLines + [END] + after).join('\n') + '\n' + logger.lifecycle("Updated metadata/agent-jar-checks.properties with ${integrations.size()} integrations") } } diff --git a/dd-java-agent/expected-integrations.txt b/dd-java-agent/expected-integrations.txt deleted file mode 100644 index dc0d8bd7e7b..00000000000 --- a/dd-java-agent/expected-integrations.txt +++ /dev/null @@ -1,208 +0,0 @@ -IastInstrumentation -aerospike -akka-http -akka-http2 -akka_actor_mailbox -akka_actor_receive -akka_actor_send -akka_concurrent -allocatedirect -amqp -apache-httpclient -armeria-grpc-client -armeria-grpc-server -armeria-jetty -avro -aws-lambda -aws-sdk -axis2 -axway-api -azure-functions -caffeine -cassandra -ci-visibility -cics -classloading -commons-fileupload -commons-http-client -confluent-schema-registry -couchbase -cucumber -cxf -datanucleus -defineclass -dropwizard -dynamodb -elasticsearch -emr-aws-sdk -eventbridge -ffm-native-tracing -finatra -freemarker -gax -glassfish -google-http-client -google-pubsub -gradle -graphql-java -grizzly -grizzly-client -grizzly-filterchain -grpc -gson -guava -hazelcast -hazelcast_legacy -hibernate -httpasyncclient -httpasyncclient5 -httpclient -httpclient5 -httpcore -httpcore-5 -httpurlconnection -hystrix -ignite -inputStream -jackson -jackson-core -jacoco -jakarta-jms -jakarta-mail -jakarta-rs -jakarta-websocket -jakarta-ws -java-http-client -java-lang -java-lang-appsec -java-lang-management -java-module -java-net -java_completablefuture -java_concurrent -java_timer -javax-mail -javax-websocket -jax-rs -jax-ws -jboss-logmanager -jdbc -jdbc-datasource -jedis -jersey -jetty -jetty-client -jetty-concurrent -jms -jni -jsp -jwt -kafka -kotlin_coroutine -lettuce -liberty -log4j -logback -maven -micronaut -mmap -mongo -mule -native-image -netty -netty-concurrent -netty-promise -not-not-trace -ognl -okhttp -openai-java -opensearch -opentelemetry-annotations -opentelemetry-beta -opentelemetry-logs -opentelemetry-metrics -opentelemetry.experimental -opentracing -org-json -pekko-http -pekko-http2 -pekko_actor_mailbox -pekko_actor_receive -pekko_actor_send -play -play-ws -protobuf -quartz -ratpack -ratpack-request-body -reactive-streams -reactor-core -reactor-netty -rediscala -redisson -renaissance -resilience4j -resilience4j-reactor -resteasy -restlet-http -rmi -rxjava -s3 -scala_concurrent -servicetalk -servlet -servlet-filter -servlet-request-body -servlet-service -sfn -shutdown -slick -snakeyaml -sns -socket -sofarpc -spark -spark-executor -spark-exit -spark-launcher -spark-openlineage -sparkjava -spray-http -spring-async -spring-beans -spring-boot -spring-boot-span-origin -spring-cloud-zuul -spring-core -spring-data -spring-jms -spring-messaging -spring-rabbit -spring-scheduling -spring-security -spring-web -spring-web-code-origin -spring-webflux -spring-ws -spymemcached -sqs -sslsocket -synapse3-client -synapse3-server -testng -throwables -thymeleaf -tibco -tinylog -tomcat -trace -twilio-sdk -undertow -urlconnection -valkey -velocity -vertx -wallclock -websphere-jmx -wildfly -zio.experimental diff --git a/docs/add_new_instrumentation.md b/docs/add_new_instrumentation.md index 35343a56baa..27a851dd198 100644 --- a/docs/add_new_instrumentation.md +++ b/docs/add_new_instrumentation.md @@ -451,18 +451,18 @@ There are four verification strategies, three of which are mandatory. ### Agent jar integrations golden file -The agent jar check task `checkAgentJarIntegrations` verifies that the set of integrations -listed in `dd-java-agent/expected-integrations.txt` exactly matches the integrations -shipped in the built agent jar. This catches accidental additions or removals. +The agent jar check task `verifyAgentJarIntegrations` verifies that the set of integrations +listed under the `expected.integrations` key in `metadata/agent-jar-checks.properties` +exactly matches the integrations shipped in the built agent jar. This catches accidental additions or removals. -When you add or remove an integration, update the golden file: +When you add or remove an integration, update the properties file: ```shell ./gradlew :dd-java-agent:updateAgentJarIntegrationsGoldenFile ``` -Then commit `dd-java-agent/expected-integrations.txt` alongside your instrumentation changes. -The `check` task runs `checkAgentJarIntegrations` automatically, so CI will fail if the file +Then commit `metadata/agent-jar-checks.properties` alongside your instrumentation changes. +The `check` task runs `verifyAgentJarIntegrations` automatically, so CI will fail if the file is out of date. All integrations must include sufficient test coverage. This HTTP client integration will include diff --git a/metadata/agent-jar-checks.properties b/metadata/agent-jar-checks.properties new file mode 100644 index 00000000000..fd04d637e35 --- /dev/null +++ b/metadata/agent-jar-checks.properties @@ -0,0 +1,220 @@ +# Agent jar structural invariants — edit intentionally, commit with the change that justified it. + +# Max agent jar size in bytes. Raise only when the size growth is intentional (33 MiB = 34603008). +jar.size.budget = 34603008 + +# Minimum combined class + classdata count in the assembled agent jar. +# Set to ~98% of the actual count at the time of the last intentional change. +# At time of writing: guard 17000 / actual 17279 +classes.minimum.guard = 17000 + +# BEGIN expected.integrations -- Regenerated by: ./gradlew :dd-java-agent:updateAgentJarIntegrationsGoldenFile +expected.integrations = IastInstrumentation,\ + aerospike,\ + akka-http,\ + akka-http2,\ + akka_actor_mailbox,\ + akka_actor_receive,\ + akka_actor_send,\ + akka_concurrent,\ + allocatedirect,\ + amqp,\ + apache-httpclient,\ + armeria-grpc-client,\ + armeria-grpc-server,\ + armeria-jetty,\ + avro,\ + aws-lambda,\ + aws-sdk,\ + axis2,\ + axway-api,\ + azure-functions,\ + caffeine,\ + cassandra,\ + ci-visibility,\ + cics,\ + classloading,\ + commons-fileupload,\ + commons-http-client,\ + confluent-schema-registry,\ + couchbase,\ + cucumber,\ + cxf,\ + datanucleus,\ + defineclass,\ + dropwizard,\ + dynamodb,\ + elasticsearch,\ + emr-aws-sdk,\ + eventbridge,\ + ffm-native-tracing,\ + finatra,\ + freemarker,\ + gax,\ + glassfish,\ + google-http-client,\ + google-pubsub,\ + gradle,\ + graphql-java,\ + grizzly,\ + grizzly-client,\ + grizzly-filterchain,\ + grpc,\ + gson,\ + guava,\ + hazelcast,\ + hazelcast_legacy,\ + hibernate,\ + httpasyncclient,\ + httpasyncclient5,\ + httpclient,\ + httpclient5,\ + httpcore,\ + httpcore-5,\ + httpurlconnection,\ + hystrix,\ + ignite,\ + inputStream,\ + jackson,\ + jackson-core,\ + jacoco,\ + jakarta-jms,\ + jakarta-mail,\ + jakarta-rs,\ + jakarta-websocket,\ + jakarta-ws,\ + java-http-client,\ + java-lang,\ + java-lang-appsec,\ + java-lang-management,\ + java-module,\ + java-net,\ + java_completablefuture,\ + java_concurrent,\ + java_timer,\ + javax-mail,\ + javax-websocket,\ + jax-rs,\ + jax-ws,\ + jboss-logmanager,\ + jdbc,\ + jdbc-datasource,\ + jedis,\ + jersey,\ + jetty,\ + jetty-client,\ + jetty-concurrent,\ + jms,\ + jni,\ + jsp,\ + jwt,\ + kafka,\ + kotlin_coroutine,\ + lettuce,\ + liberty,\ + log4j,\ + logback,\ + maven,\ + micronaut,\ + mmap,\ + mongo,\ + mule,\ + native-image,\ + netty,\ + netty-concurrent,\ + netty-promise,\ + not-not-trace,\ + ognl,\ + okhttp,\ + openai-java,\ + opensearch,\ + opentelemetry-annotations,\ + opentelemetry-beta,\ + opentelemetry-logs,\ + opentelemetry-metrics,\ + opentelemetry.experimental,\ + opentracing,\ + org-json,\ + pekko-http,\ + pekko-http2,\ + pekko_actor_mailbox,\ + pekko_actor_receive,\ + pekko_actor_send,\ + play,\ + play-ws,\ + protobuf,\ + quartz,\ + ratpack,\ + ratpack-request-body,\ + reactive-streams,\ + reactor-core,\ + reactor-netty,\ + rediscala,\ + redisson,\ + renaissance,\ + resilience4j,\ + resilience4j-reactor,\ + resteasy,\ + restlet-http,\ + rmi,\ + rxjava,\ + s3,\ + scala_concurrent,\ + servicetalk,\ + servlet,\ + servlet-filter,\ + servlet-request-body,\ + servlet-service,\ + sfn,\ + shutdown,\ + slick,\ + snakeyaml,\ + sns,\ + socket,\ + sofarpc,\ + spark,\ + spark-executor,\ + spark-exit,\ + spark-launcher,\ + spark-openlineage,\ + sparkjava,\ + spray-http,\ + spring-async,\ + spring-beans,\ + spring-boot,\ + spring-boot-span-origin,\ + spring-cloud-zuul,\ + spring-core,\ + spring-data,\ + spring-jms,\ + spring-messaging,\ + spring-rabbit,\ + spring-scheduling,\ + spring-security,\ + spring-web,\ + spring-web-code-origin,\ + spring-webflux,\ + spring-ws,\ + spymemcached,\ + sqs,\ + sslsocket,\ + synapse3-client,\ + synapse3-server,\ + testng,\ + throwables,\ + thymeleaf,\ + tibco,\ + tinylog,\ + tomcat,\ + trace,\ + twilio-sdk,\ + undertow,\ + urlconnection,\ + valkey,\ + velocity,\ + vertx,\ + wallclock,\ + websphere-jmx,\ + wildfly,\ + zio.experimental +# END expected.integrations From d40d797e4723b7cc4536c84e6812dbab3a4d32b1 Mon Sep 17 00:00:00 2001 From: Bruce Bujon Date: Fri, 26 Jun 2026 13:48:00 +0200 Subject: [PATCH 049/139] Improve Java testing experience with eventually / within and parent span index reference (#11739) feat(test-utils): Add PollingConditions test utility for async assertions feat(test-utils): Add childOfIndex matcher for span parent assertions fix(test-utils): Update span assertion error messages feat(test-utils): Add PollingConditions test utility for async assertions feat(test-utils): Add validation in PollingConditions Co-authored-by: bruce.bujon --- .../agent/test/assertions/SpanMatcher.java | 47 +++-- .../agent/test/assertions/TraceMatcher.java | 7 +- utils/test-utils/build.gradle.kts | 22 +++ .../trace/test/util/PollingConditions.java | 141 +++++++++++++++ .../test/util/PollingConditionsTest.java | 166 ++++++++++++++++++ 5 files changed, 367 insertions(+), 16 deletions(-) create mode 100644 utils/test-utils/src/main/java/datadog/trace/test/util/PollingConditions.java create mode 100644 utils/test-utils/src/test/java/datadog/trace/test/util/PollingConditionsTest.java diff --git a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/SpanMatcher.java b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/SpanMatcher.java index d913cd78752..22aacb5d0df 100644 --- a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/SpanMatcher.java +++ b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/SpanMatcher.java @@ -53,6 +53,7 @@ public final class SpanMatcher { private Matcher traceIdMatcher; private Matcher idMatcher; private Matcher parentIdMatcher; + private int parentSpanIndex; private Matcher serviceNameMatcher; private Matcher operationNameMatcher; private Matcher resourceNameMatcher; @@ -65,6 +66,7 @@ public final class SpanMatcher { private static final Matcher CHILD_OF_PREVIOUS_MATCHER = is(0L); private SpanMatcher() { + this.parentSpanIndex = -1; this.serviceNameMatcher = validates(s -> s != null && !s.isEmpty()); this.typeMatcher = isNull(); this.errorMatcher = isFalse(); @@ -120,6 +122,7 @@ public SpanMatcher root() { */ public SpanMatcher childOf(long parentId) { this.parentIdMatcher = is(parentId); + this.parentSpanIndex = -1; return this; } @@ -130,6 +133,19 @@ public SpanMatcher childOf(long parentId) { */ public SpanMatcher childOfPrevious() { this.parentIdMatcher = CHILD_OF_PREVIOUS_MATCHER; + this.parentSpanIndex = -1; + return this; + } + + /** + * Checks the span is a direct child of the span at the specified index in the trace. + * + * @param parentSpanIndex The index of the parent span in the trace. + * @return The current {@link SpanMatcher} instance with the child-of constraint applied. + */ + public SpanMatcher childOfIndex(int parentSpanIndex) { + this.parentIdMatcher = null; + this.parentSpanIndex = parentSpanIndex; return this; } @@ -301,21 +317,30 @@ public SpanMatcher links(SpanLinkMatcher... matchers) { return this; } - void assertSpan(DDSpan span, DDSpan previousSpan) { + void assertSpan(List trace, int spanIndex) { + DDSpan span = trace.get(spanIndex); + // Apply parent span index + if (this.parentSpanIndex >= 0) { + this.parentIdMatcher = is(trace.get(this.parentSpanIndex).getSpanId()); + } // Apply parent id matcher from the previous span - if (this.parentIdMatcher == CHILD_OF_PREVIOUS_MATCHER) { + else if (this.parentIdMatcher == CHILD_OF_PREVIOUS_MATCHER) { + if (spanIndex == 0) { + throw new IllegalStateException("Cannot use childOfPrevious() matcher on the first span"); + } + DDSpan previousSpan = trace.get(spanIndex - 1); this.parentIdMatcher = is(previousSpan.getSpanId()); } // Assert span values - assertValue(this.traceIdMatcher, span.getTraceId(), "Expected trace identifier"); - assertValue(this.idMatcher, span.getSpanId(), "Expected identifier"); - assertValue(this.parentIdMatcher, span.getParentId(), "Expected parent identifier"); - assertValue(this.serviceNameMatcher, span.getServiceName(), "Expected service name"); - assertValue(this.operationNameMatcher, span.getOperationName(), "Expected operation name"); - assertValue(this.resourceNameMatcher, span.getResourceName(), "Expected resource name"); - assertValue(this.durationMatcher, ofNanos(span.getDurationNano()), "Expected duration"); - assertValue(this.typeMatcher, span.getSpanType(), "Expected span type"); - assertValue(this.errorMatcher, span.isError(), "Expected error status"); + assertValue(this.traceIdMatcher, span.getTraceId(), "Unexpected trace identifier"); + assertValue(this.idMatcher, span.getSpanId(), "Unexpected identifier"); + assertValue(this.parentIdMatcher, span.getParentId(), "Unexpected parent identifier"); + assertValue(this.serviceNameMatcher, span.getServiceName(), "Unexpected service name"); + assertValue(this.operationNameMatcher, span.getOperationName(), "Unexpected operation name"); + assertValue(this.resourceNameMatcher, span.getResourceName(), "Unexpected resource name"); + assertValue(this.durationMatcher, ofNanos(span.getDurationNano()), "Unexpected duration"); + assertValue(this.typeMatcher, span.getSpanType(), "Unexpected span type"); + assertValue(this.errorMatcher, span.isError(), "Unexpected error status"); assertSpanTags(span.getTags()); assertSpanLinks(spanLinks(span)); } diff --git a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/TraceMatcher.java b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/TraceMatcher.java index 4187bcd3823..2eabd07a58d 100644 --- a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/TraceMatcher.java +++ b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/TraceMatcher.java @@ -68,11 +68,8 @@ void assertTrace(List trace, int traceIndex) { if (this.options.sorter != null) { trace.sort(this.options.sorter); } - DDSpan previousSpan = null; - for (int i = 0; i < spanCount; i++) { - DDSpan span = trace.get(i); - this.matchers[i].assertSpan(span, previousSpan); - previousSpan = span; + for (int spanIndex = 0; spanIndex < spanCount; spanIndex++) { + this.matchers[spanIndex].assertSpan(trace, spanIndex); } } diff --git a/utils/test-utils/build.gradle.kts b/utils/test-utils/build.gradle.kts index 4481b0cbbba..5c29628ef4d 100644 --- a/utils/test-utils/build.gradle.kts +++ b/utils/test-utils/build.gradle.kts @@ -4,6 +4,27 @@ plugins { apply(from = "$rootDir/gradle/java.gradle") +extra["excludedClassesCoverage"] = listOf( + "datadog.trace.test.logging.*", + "external.util.stacktrace.*", + "datadog.trace.test.util.AnyStackRunner*", + "datadog.trace.test.util.AssertionsUtils", + "datadog.trace.test.util.CircularBuffer", + "datadog.trace.test.util.CleanConfigStateExtension", + "datadog.trace.test.util.DDJavaSpecification", + "datadog.trace.test.util.ForkedTestUtils", + "datadog.trace.test.util.GCUtils", + "datadog.trace.test.util.ThreadUtils*", + "datadog.trace.test.util.ConfigInstrumentationFailedListener", + "datadog.trace.test.util.ConfigTransformSpockExtension*", + "datadog.trace.test.util.ControllableEnvironmentVariables*", + "datadog.trace.test.util.DDSpecification*", + "datadog.trace.test.util.Flaky*", + "datadog.trace.test.util.FlakySpockExtension*", + "datadog.trace.test.util.MultipartRequestParser*", + "datadog.trace.test.util.NonRetryable", +) + dependencies { api(libs.bytebuddy) api(libs.bytebuddyagent) @@ -14,6 +35,7 @@ dependencies { api(project(":utils:junit-utils")) api(group = "commons-fileupload", name = "commons-fileupload", version = "1.5") + compileOnly(project(":components:annotations")) compileOnly(libs.junit.jupiter) compileOnly(libs.logback.core) compileOnly(libs.logback.classic) diff --git a/utils/test-utils/src/main/java/datadog/trace/test/util/PollingConditions.java b/utils/test-utils/src/main/java/datadog/trace/test/util/PollingConditions.java new file mode 100644 index 00000000000..654bcc758b7 --- /dev/null +++ b/utils/test-utils/src/main/java/datadog/trace/test/util/PollingConditions.java @@ -0,0 +1,141 @@ +package datadog.trace.test.util; + +import datadog.trace.api.internal.VisibleForTesting; +import datadog.trace.test.util.ThreadUtils.ThrowingRunnable; + +/** + * A small Java port of Spock's {@code spock.util.concurrent.PollingConditions}. It repeatedly + * evaluates a block of assertions until they pass or a timeout elapses. + * + *

The condition block is a {@link ThrowingRunnable}, so it may throw checked exceptions. Any + * {@link Throwable} it throws is treated as "not satisfied yet" and triggers another attempt. + * + *

Usage: + * + * 

{@code
+ * // timeout defaults to 1 second
+ * new PollingConditions().eventually(() -> assertTrue(done.get()));
+ *
+ * // timeout-only is the common case
+ * new PollingConditions(5).eventually(() -> assertEquals(2, requests.size()));
+ *
+ * // all knobs, chained
+ * new PollingConditions()
+ *     .timeout(15).initialDelay(1).delay(0.5).factor(1)
+ *     .eventually(() -> assertTrue(done.get()));
+ * }
+ */ +public class PollingConditions { + private double timeout = 1; // seconds + private double initialDelay = 0; // seconds + private double delay = 0.1; // seconds + private double factor = 1.0; // delay multiplier between attempts + + public PollingConditions() {} + + /** + * @param timeoutSeconds the timeout in seconds (the most common single setting). + * @throws IllegalArgumentException if {@code timeoutSeconds} is negative. + */ + public PollingConditions(double timeoutSeconds) { + this.timeout = requireNonNegative(timeoutSeconds, "timeout"); + } + + /** + * @param seconds how long to keep retrying before failing. Defaults to {@code 1}. + */ + public PollingConditions timeout(double seconds) { + this.timeout = requireNonNegative(seconds, "timeout"); + return this; + } + + /** + * @param seconds how long to wait before the very first attempt. Defaults to {@code 0}. + */ + public PollingConditions initialDelay(double seconds) { + this.initialDelay = requireNonNegative(seconds, "initialDelay"); + return this; + } + + /** + * @param seconds how long to wait between attempts. Defaults to {@code 0.1}. + */ + public PollingConditions delay(double seconds) { + this.delay = requireNonNegative(seconds, "delay"); + return this; + } + + /** + * @param factor multiplier applied to the delay after each attempt (exponential back-off). + * Defaults to {@code 1.0} (constant delay). + */ + public PollingConditions factor(double factor) { + this.factor = requireNonNegative(factor, "factor"); + return this; + } + + /** Retries {@code conditions} until it passes or the configured {@link #timeout} elapses. */ + public void eventually(ThrowingRunnable conditions) { + within(this.timeout, conditions); + } + + /** + * Retries {@code conditions} until it passes or {@code seconds} elapse, overriding the configured + * {@link #timeout} for this call. + */ + public void within(double seconds, ThrowingRunnable conditions) { + final long timeoutMillis = toMillis(requireNonNegative(seconds, "timeout")); + final long start = System.currentTimeMillis(); + if (this.initialDelay > 0) { + sleep(toMillis(this.initialDelay)); + } + long currDelay = toMillis(this.delay); + int attempts = 0; + long elapsed = 0; + Throwable lastFailure = null; + while (elapsed <= timeoutMillis) { + try { + attempts++; + conditions.run(); + return; + } catch (final Throwable e) { + elapsed = System.currentTimeMillis() - start; + lastFailure = e; + // Never sleep past the deadline. + final long sleepMillis = + Math.min(currDelay, start + timeoutMillis - System.currentTimeMillis()); + if (sleepMillis > 0) { + sleep(sleepMillis); + } + currDelay = (long) (currDelay * factor); + } + } + throw new AssertionError( + String.format( + "Condition not satisfied after %1.2f seconds and %d attempts", + elapsed / 1000d, attempts), + lastFailure); + } + + private static long toMillis(final double seconds) { + return Math.round(seconds * 1000); + } + + private static double requireNonNegative(double value, String name) { + if (value < 0) { + throw new IllegalArgumentException(name + " must be >= 0 but was " + value); + } + return value; + } + + // VisibleForTesting to allow test code to override it and avoid flaky timing-based assertions. + @VisibleForTesting + void sleep(final long millis) { + try { + Thread.sleep(millis); + } catch (final InterruptedException e) { + Thread.currentThread().interrupt(); + throw new AssertionError("Interrupted while waiting for condition", e); + } + } +} diff --git a/utils/test-utils/src/test/java/datadog/trace/test/util/PollingConditionsTest.java b/utils/test-utils/src/test/java/datadog/trace/test/util/PollingConditionsTest.java new file mode 100644 index 00000000000..64ea4c5fe7e --- /dev/null +++ b/utils/test-utils/src/test/java/datadog/trace/test/util/PollingConditionsTest.java @@ -0,0 +1,166 @@ +package datadog.trace.test.util; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.concurrent.atomic.AtomicInteger; +import org.junit.jupiter.api.Test; + +class PollingConditionsTest { + + @Test + void passesOnFirstAttempt() { + AtomicInteger attempts = new AtomicInteger(); + new PollingConditions().eventually(attempts::incrementAndGet); + assertEquals(1, attempts.get()); + } + + @Test + void succeedsAfterSeveralRetries() { + AtomicInteger attempts = new AtomicInteger(); + new PollingConditions(2) + .delay(0.01) + .eventually( + () -> { + if (attempts.incrementAndGet() < 5) { + fail("not yet"); + } + }); + assertEquals(5, attempts.get()); + } + + @Test + void timesOutWithFormattedMessageAndUnderlyingCause() { + AssertionError error = + assertThrows( + AssertionError.class, + () -> + new PollingConditions(0.1) + .delay(0.01) + .eventually(() -> assertEquals(1, 2, "still wrong"))); + + assertTrue(error.getMessage().startsWith("Condition not satisfied after"), error.getMessage()); + assertTrue(error.getMessage().contains("attempts"), error.getMessage()); + + Throwable cause = error.getCause(); + assertInstanceOf(AssertionError.class, cause); + assertTrue(cause.getMessage().contains("still wrong"), cause.getMessage()); + } + + @Test + void withinOverridesConfiguredTimeout() { + // The instance timeout is huge, but within() must use its own (tiny) timeout and fail fast. + long start = System.currentTimeMillis(); + assertThrows( + AssertionError.class, + () -> new PollingConditions(60).delay(0.01).within(0.1, () -> fail("never"))); + long elapsed = System.currentTimeMillis() - start; + assertTrue( + elapsed < 5_000, "within() should honor its own short timeout, took " + elapsed + "ms"); + } + + @Test + void retriesWhenConditionThrowsCheckedException() { + AtomicInteger attempts = new AtomicInteger(); + new PollingConditions(2) + .delay(0.01) + .eventually( + () -> { + if (attempts.incrementAndGet() < 3) { + throw new IOException("not ready"); + } + }); + assertEquals(3, attempts.get()); + } + + @Test + void factorMultipliesDelayBetweenAttempts() { + // Large timeout so the run ends by success (after 4 attempts), never by the deadline; the + // recording subclass captures the requested delays without actually sleeping, so this is + // deterministic rather than dependent on wall-clock scheduling. + RecordingPollingConditions conditions = new RecordingPollingConditions(100); + conditions.delay(0.02).factor(4); // 20ms base delay, multiplied by 4 after each attempt + + AtomicInteger attempts = new AtomicInteger(); + conditions.eventually( + () -> { + if (attempts.incrementAndGet() < 4) { + fail("not yet"); + } + }); + + assertEquals(4, attempts.get()); + // Three failed attempts -> three delays, each 4x the previous. + assertEquals(Arrays.asList(20L, 80L, 320L), conditions.requestedSleeps); + } + + @Test + void appliesInitialDelayBeforeFirstAttempt() { + AtomicInteger attempts = new AtomicInteger(); + long start = System.currentTimeMillis(); + new PollingConditions() + .timeout(2) + .initialDelay(0.05) + .delay(0.01) + .factor(1) + .eventually(attempts::incrementAndGet); + long elapsed = System.currentTimeMillis() - start; + assertEquals(1, attempts.get()); + assertTrue(elapsed >= 40, "initial delay should have been applied, took " + elapsed + "ms"); + } + + @Test + void interruptedWhileWaitingFailsAndRestoresInterruptFlag() { + // Pre-interrupt so the first inter-attempt sleep throws InterruptedException immediately. + Thread.currentThread().interrupt(); + try { + AssertionError error = + assertThrows( + AssertionError.class, + () -> new PollingConditions(2).delay(0.05).eventually(() -> fail("retry"))); + assertEquals("Interrupted while waiting for condition", error.getMessage()); + assertTrue( + Thread.currentThread().isInterrupted(), "interrupt flag should have been restored"); + } finally { + // Clear the flag so it does not leak into other tests sharing this thread. + Thread.interrupted(); + } + } + + @Test + void rejectsNegativeOrNanConfiguration() { + // Check conditions parameters + assertThrows(IllegalArgumentException.class, () -> new PollingConditions(-1)); + assertThrows(IllegalArgumentException.class, () -> new PollingConditions().timeout(-1)); + assertThrows(IllegalArgumentException.class, () -> new PollingConditions().initialDelay(-1)); + assertThrows(IllegalArgumentException.class, () -> new PollingConditions().factor(-2)); + // Check delay and within + IllegalArgumentException error = + assertThrows(IllegalArgumentException.class, () -> new PollingConditions().delay(-0.5)); + assertTrue(error.getMessage().contains("delay"), error.getMessage()); + assertTrue(error.getMessage().contains("-0.5"), error.getMessage()); + assertThrows( + IllegalArgumentException.class, () -> new PollingConditions().within(-1, () -> {})); + } + + /** Captures the requested delays instead of sleeping, for deterministic back-off assertions. */ + private static final class RecordingPollingConditions extends PollingConditions { + final List requestedSleeps = new ArrayList<>(); + + RecordingPollingConditions(double timeoutSeconds) { + super(timeoutSeconds); + } + + @Override + void sleep(long millis) { + requestedSleeps.add(millis); + } + } +} From 323008a7be9b951d7a5c3127527a38580ae2b703 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Gonz=C3=A1lez=20Garc=C3=ADa?= Date: Fri, 26 Jun 2026 14:29:02 +0200 Subject: [PATCH 050/139] Migrate SCA Reachability to method-level symbol database (sca-reachability-symbols) (#11614) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit feat(sca): migrate SCA Reachability to method-level symbol database format Updates the Gradle plugin and runtime transformer to consume the new sca-reachability-symbols/jvm database format, which ships method-level symbols (class + method name) instead of class-level symbols. Key changes: - GhsaEnrichmentParser: new target string format "package:ClassName.method"; GHSA ID read from vulnerability.id; one entry per dependency_name - ScaEnrichmentsPlugin: updated API URL to sca-reachability-symbols/jvm - ScaReachabilityTransformer: removed class-level detection (reportedHits, PendingClass, pendingClassEvents, processPendingClassEvents); simplified two-phase design to direct pendingRetransformNames enqueue on first load - ScaSymbol: method is now always non-null; isClassLevel() removed - ScaReachabilityHit: removed CLASS_LEVEL_SYMBOL constant - sca_cves.json: regenerated with junrar, zserio-runtime, tomcat-embed-core - New tests: ScaRealDatabaseTest, ScaRealLibraryBytecodeTest - Smoke test: migrated from snakeyaml to junrar 7.5.5 (GHSA-hf5p-q87m-crj7) tag: no release note Merge branch 'master' into alejandro.gonzalez/sca-reachability-add-symbols fix(sca): handle JARs without pom.properties in version resolution DependencyResolver.guessFallbackNoPom() parses the version from the filename when pom.properties is absent (e.g. junrar-7.5.5.jar). The resulting Dependency has name="junrar" (no group ID), which the previous exact-match logic could not match against the "com.github.junrar:junrar" artifact name. Add ScaReachabilityTransformer.matchVersion() as a shared helper that first tries an exact name match, then falls back to an artifact-ID-only match (dep.name without ":") for deps produced by guessFallbackNoPom. findArtifactInUrl() is updated to use the same helper so both resolution paths benefit. For the smoke test (shadow JAR): add a synthetic pom.properties for junrar under src/main/resources/META-INF/maven so DependencyResolver can find the version when all JARs are merged into one flat file. nit(sca): inline single-line findArtifactInUrl wrapper findArtifactInUrl was a private one-liner used in exactly one place. Inline it into findArtifactVersionInClasspath to remove unnecessary indirection. fix(sca): guard against null dep.name in matchVersion fallback guessFallbackNoPom can return a Dependency with name=null for JARs whose filename does not match the artifact-version pattern. The artifact-ID fallback loop called dep.name.contains(":") without a null check, which would throw NPE in that edge case. nit(sca): spotlessApply fix(sca): pre-warm jarCache before retransformClasses to avoid deadlock JAR I/O (resolveDependencies -> DependencyResolver -> JarReader) was happening inside the ClassFileTransformer callback, i.e. while the JVM holds its internal retransform locks. Libraries like snakeyaml that trigger class loading during JAR resolution can deadlock because the JVM class-loading lock and the retransform lock are both held simultaneously. Fix: in performPendingRetransforms(), resolve each class's JAR into jarCache on the telemetry thread BEFORE calling retransformClasses(). When the transform callback fires, resolveDependencies() returns immediately from cache with no I/O. This restores the v1 (PR #11352) invariant: JAR I/O on the telemetry thread only, bytecode injection only inside the callback. Expose jarCache and resolveDependencies as @VisibleForTesting to support the regression test. fix(sca): use cache-only lookup in processClass to prevent JAR I/O under JVM retransform locks processClass() runs inside the retransform callback while the JVM holds its internal retransform locks. Calling resolveDependencies() from there can deadlock (snakeyaml triggers class loading during JAR resolution, hitting the JVM class-loading lock while the retransform lock is already held). resolveDependenciesFromCache() only reads jarCache — no I/O — and returns empty on a cache miss. performPendingRetransforms() pre-warms jarCache for every class before calling retransformClasses(), so the cache is always populated when the callback fires. A cache miss (pre-warm failed) sets hasUnresolvedMethodLevelSymbols and re-queues the class for the next heartbeat. revert(sca): remove local-only spring-web CVE entry from sca_cves.json fix(sca): prevent hit re-emission when DependencyService re-detects the same JAR DependencyService can report the same JAR (artifact:version) on consecutive heartbeats when multiple classloaders in the application load it independently. Step 2 called peekSnapshot unconditionally whenever snapshotByKey had no entry, so a re-detection triggered peekSnapshot and re-emitted the existing hit to the backend on every heartbeat — a stale duplicate of data already received. Fix: track whether a dep is being seen for the first time via the return value of knownDeps.put(). Only call peekSnapshot and emit metadata:[] on the first detection (previous == null). Re-detections with no pending CVE state (no entry in snapshotByKey) produce no emission. A real new CVE state change (snapshotByKey has an entry from Step 1) is still emitted regardless — the previous == null guard only suppresses the peekSnapshot / metadata:[] fallback paths. Merge branch 'master' into alejandro.gonzalez/sca-reachability-add-symbols fix(sca): pre-warm classpathArtifactCache before retransformClasses to close aggregator-artifact deadlock gap The previous pre-warm loop only populated jarCache for each class's own JAR. For aggregator artifacts (e.g., spring-boot-starter-web) whose watched classes live in a different JAR, resolveVersionForArtifact() falls through to findArtifactVersionInClasspath(), which calls resolveDependencies() for every java.class.path entry — fresh JAR I/O under JVM retransform locks — reproducing the snakeyaml-style deadlock. Fix: extend the pre-warm loop to also call resolveVersionForArtifact() for each entry of each class being retransformed. This populates classpathArtifactCache on the telemetry thread before retransformClasses() acquires JVM locks, so the callback finds the version cached and never performs JAR I/O under locks. Adds a regression test using ObjectMapper (in jackson-databind.jar) with an entry whose artifact is jackson-core (a different JAR on the test classpath). Merge branch 'master' into alejandro.gonzalez/sca-reachability-add-symbols Merge branch 'master' into alejandro.gonzalez/sca-reachability-add-symbols fix(sca): replace junrar:7.5.5 test dependency with minimal stubs Adds LocalFolderExtractor and FileHeader as test-only stubs under com.github.junrar to avoid shipping a test dependency with known CVEs. The tests only need the class/method signatures to exist on the classpath for ASM injection and reflection-based callback verification; the library's real implementation is not required. Addresses review comment from manuel-alvarez-alvarez on PR #11614. Merge branch 'master' into alejandro.gonzalez/sca-reachability-add-symbols Merge branch 'master' into alejandro.gonzalez/sca-reachability-add-symbols fix(sca): replace zserio-runtime and tomcat-embed-core test deps with minimal stubs style(sca): add braces to braceless if-continue guards for consistency Merge branch 'master' into alejandro.gonzalez/sca-reachability-add-symbols fix(sca): use resolved dep.name for registerCve to prevent registry key mismatch for no-pom JARs For JARs without pom.properties, DependencyResolver.guessFallbackNoPom produces an artifactId-only name (e.g. "junrar" instead of "com.github.junrar:junrar"). The transformer was calling registerCve with entry.artifact() — the full groupId:artifactId from the DB — creating a registry key that mismatched the key DependencyService would later report. Result: the periodic action emitted two separate telemetry entries for the same physical JAR: - "junrar" with metadata:[] (source/hash present, CVE absent — Step 2 lookup missed) - "com.github.junrar:junrar" with CVE data but no source/hash (Step 3, knownDeps miss) Fix: resolveArtifactDep() returns the matched Dependency object (not just the version string), and processClass uses dep.name for registerCve and MethodCallbackSpec. This keeps the registry key consistent with what DependencyService will report regardless of pom.properties presence. Implementation: - Add matchDep() returning Dependency (matchVersion delegates to it) - Change classpathArtifactCache to cache Dependency (preserves resolved name) - Add resolveArtifactDep() returning Dependency; resolveVersionForArtifact delegates to it - Add findArtifactInClasspath() returning Dependency; findArtifactVersionInClasspath delegates to it The smoke test's synthetic pom.properties masked this bug by making both routes agree on the full groupId:artifactId name. No smoke test changes needed — the unit tests cover the fix: - ScaReachabilityTransformerJava9Test: resolveArtifactDep returns artifactId-only name for no-pom - ScaReachabilityPeriodicActionTest: CVE and source/hash merged into single entry for no-pom dep fix(sca): distinguish physical copies in ScaReachabilityPeriodicAction re-detection guard Replace the `previous == null` check in Step 2 with `isNewPhysicalCopy(previous, dep)`, which compares source path and content hash to differentiate a re-detection of the same physical JAR file from two distinct physical copies sharing the same name@version key. The old guard over-suppressed in Tomcat multi-webapp scenarios: two webapps shipping the same artifact under different WEB-INF/lib paths would share a single registry entry, so the second webapp's copy would never emit source/hash metadata to the backend. The new predicate emits when previous is null (first detection), or when source or hash differs (new physical copy). Re-detection of the exact same file (same source, same hash) is still suppressed to avoid re-emitting stale hits. Two regression tests added: - sameSourceHashReDetected_doesNotReEmit: re-detection of the same file produces no emission - differentSourceHashSameKey_emitsBothPhysicalCopies: two paths/hashes for the same name@version both emit independently Co-authored-by: devflow.devflow-routing-intake --- .../gradle/plugin/sca/ScaEnrichmentsPlugin.kt | 17 +- .../gradle/sca/GhsaEnrichmentParser.kt | 98 ++--- .../gradle/sca/GhsaEnrichmentParserTest.kt | 170 ++++++-- .../sca/fixtures/GHSA-cross-package.json | 18 + .../sca/fixtures/GHSA-empty-symbols.json | 18 +- .../sca/fixtures/GHSA-mixed-languages.json | 52 ++- .../sca/fixtures/GHSA-multi-package.json | 65 ++-- .../sca/fixtures/GHSA-single-package.json | 40 +- dd-java-agent/appsec/build.gradle | 2 + .../datadog/appsec/sca/ScaCveDatabase.java | 24 +- .../appsec/sca/ScaReachabilitySystem.java | 17 +- .../sca/ScaReachabilityTransformer.java | 365 ++++++++---------- .../com/datadog/appsec/sca/ScaSymbol.java | 18 +- .../appsec/src/main/resources/sca_cves.json | 2 +- .../appsec/sca/ScaCveDatabaseTest.java | 127 +++--- .../sca/ScaReachabilityMethodLevelTest.java | 31 +- .../ScaReachabilityTransformerJava9Test.java | 188 ++++++++- .../appsec/sca/ScaRealDatabaseTest.java | 95 +++++ .../sca/ScaRealLibraryBytecodeTest.java | 221 +++++++++++ .../github/junrar/LocalFolderExtractor.java | 20 + .../com/github/junrar/rarfile/FileHeader.java | 4 + .../http11/filters/ChunkedInputFilter.java | 9 + .../test/java/zserio/runtime/array/Array.java | 8 + dd-smoke-tests/appsec/springboot/build.gradle | 3 + .../springboot/ScaReachabilityInit.java | 22 +- .../com.github.junrar/junrar/pom.properties | 3 + .../appsec/ScaReachabilitySmokeTest.groovy | 44 +-- .../api/telemetry/ScaReachabilityHit.java | 32 +- .../sca/ScaReachabilityPeriodicAction.java | 60 ++- .../ScaReachabilityPeriodicActionTest.java | 176 +++++++++ 30 files changed, 1353 insertions(+), 596 deletions(-) create mode 100644 buildSrc/src/test/resources/sca/fixtures/GHSA-cross-package.json create mode 100644 dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaRealDatabaseTest.java create mode 100644 dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaRealLibraryBytecodeTest.java create mode 100644 dd-java-agent/appsec/src/test/java/com/github/junrar/LocalFolderExtractor.java create mode 100644 dd-java-agent/appsec/src/test/java/com/github/junrar/rarfile/FileHeader.java create mode 100644 dd-java-agent/appsec/src/test/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java create mode 100644 dd-java-agent/appsec/src/test/java/zserio/runtime/array/Array.java create mode 100644 dd-smoke-tests/appsec/springboot/src/main/resources/META-INF/maven/com.github.junrar/junrar/pom.properties diff --git a/buildSrc/src/main/kotlin/datadog/gradle/plugin/sca/ScaEnrichmentsPlugin.kt b/buildSrc/src/main/kotlin/datadog/gradle/plugin/sca/ScaEnrichmentsPlugin.kt index ef46516e852..fc1a4252190 100644 --- a/buildSrc/src/main/kotlin/datadog/gradle/plugin/sca/ScaEnrichmentsPlugin.kt +++ b/buildSrc/src/main/kotlin/datadog/gradle/plugin/sca/ScaEnrichmentsPlugin.kt @@ -10,8 +10,8 @@ import org.gradle.api.Plugin import org.gradle.api.Project /** - * Registers the [generateScaCvesJson] task that downloads GHSA enrichments from - * `sca-reachability-database` and generates `sca_cves.json` bundled in the appsec JAR. + * Registers the [generateScaCvesJson] task that downloads GHSA symbol files from + * `sca-reachability-symbols` and generates `sca_cves.json` bundled in the appsec JAR. * * This is a **temporary** build-time approach. The symbol database will be delivered * via Remote Config in a future iteration, at which point this plugin and the committed @@ -25,7 +25,7 @@ class ScaEnrichmentsPlugin : Plugin { companion object { private const val SCA_ENRICHMENTS_API_DEFAULT = - "https://api.github.com/repos/DataDog/sca-reachability-database/contents/enrichments" + "https://api.github.com/repos/DataDog/sca-reachability-symbols/contents/jvm" } override fun apply(project: Project) { @@ -34,7 +34,7 @@ class ScaEnrichmentsPlugin : Plugin { val generateTask = project.tasks.register("generateScaCvesJson") { description = - "Downloads GHSA enrichments from sca-reachability-database and updates " + + "Downloads GHSA symbol files from sca-reachability-symbols and updates " + "src/main/resources/sca_cves.json. Run with -PrefreshSca to force a refresh. " + "Override the source URL with -PscaEnrichmentsUrl=. " + "sca_cves.json is committed to the repo so CI does not need network access." @@ -51,27 +51,26 @@ class ScaEnrichmentsPlugin : Plugin { val apiUrl = project.findProperty("scaEnrichmentsUrl")?.toString() ?: SCA_ENRICHMENTS_API_DEFAULT - logger.lifecycle("Fetching GHSA enrichment index from $apiUrl ...") + logger.lifecycle("Fetching GHSA symbol index from $apiUrl ...") @Suppress("UNCHECKED_CAST") val fileList = githubFetch(apiUrl, token) as List> val ghsaFiles = fileList.filter { it["name"]?.toString()?.endsWith(".json") == true && it["type"] == "file" } - logger.lifecycle("Found ${ghsaFiles.size} enrichment files") + logger.lifecycle("Found ${ghsaFiles.size} symbol files") val entries = mutableListOf() ghsaFiles.forEach { fileInfo -> - val ghsaId = fileInfo["name"]!!.toString().removeSuffix(".json") val rawContent = githubFetchRaw(fileInfo["download_url"]!!.toString(), token) - entries.addAll(GhsaEnrichmentParser.parse(ghsaId, rawContent)) + entries.addAll(GhsaEnrichmentParser.parse(rawContent)) } outputFile.writeText(JsonOutput.toJson(mapOf("version" to 1, "entries" to entries))) logger.lifecycle( "sca_cves.json: ${entries.size} entries from ${ghsaFiles.size} GHSA files") logger.lifecycle( - "Remember to commit src/main/resources/sca_cves.json after updating the database.") + "Remember to commit src/main/resources/sca_cves.json after updating the symbols.") } } diff --git a/buildSrc/src/main/kotlin/datadog/gradle/sca/GhsaEnrichmentParser.kt b/buildSrc/src/main/kotlin/datadog/gradle/sca/GhsaEnrichmentParser.kt index c5d0f20d702..1af8f891d74 100644 --- a/buildSrc/src/main/kotlin/datadog/gradle/sca/GhsaEnrichmentParser.kt +++ b/buildSrc/src/main/kotlin/datadog/gradle/sca/GhsaEnrichmentParser.kt @@ -4,78 +4,90 @@ import com.fasterxml.jackson.databind.JsonNode import com.fasterxml.jackson.databind.ObjectMapper /** - * Parses GHSA enrichment JSON files from the sca-reachability-database into the internal + * Parses GHSA symbol JSON files from the sca-reachability-symbols repository into the internal * sca_cves.json format consumed by SCA Reachability at runtime. * * Key transformations: - * - Filters entries to JVM language only - * - Expands multi-package GHSA entries into N records (one per Maven artifact), because - * each artifact may have different version ranges for the same set of class symbols + * - Filters entries to Maven ecosystem only (lang == "maven") + * - Each array entry maps 1:1 to one sca_cves.json record (one dependency_name per entry) + * - Parses target strings "package:ClassName.method" using lastIndexOf to split at the colon + * and lastIndexOf on the class+method part to split class from method * - Converts class FQNs to JVM internal format (slashes) so the ClassFileTransformer - * can do O(1) map lookups without per-class string conversion - * - Sets method=null for all symbols — field exists for forward compatibility when the - * database adds method-level symbols in the future (see APPSEC-62260) + * can do O(1) map lookups without per-class string conversion at runtime */ object GhsaEnrichmentParser { private val mapper = ObjectMapper() /** - * Parses a single GHSA enrichment file. + * Parses a single GHSA symbols file. * - * @param ghsaId the GHSA identifier (e.g. "GHSA-645p-88qh-w398"), used as vuln_id - * @param jsonContent the raw JSON content of the enrichment file + * @param jsonContent the raw JSON content of the symbols file * @return list of sca_cves.json entry maps, one per affected Maven artifact */ - fun parse(ghsaId: String, jsonContent: String): List> { + fun parse(jsonContent: String): List> { val root = mapper.readTree(jsonContent) - require(root.isArray) { "GHSA enrichment file $ghsaId must be a JSON array, got ${root.nodeType}" } + require(root.isArray) { "GHSA enrichment file must be a JSON array, got ${root.nodeType}" } val entries = mutableListOf>() for (entry in root) { - if (entry.path("language").asText() != "jvm") continue + if (entry.path("lang").asText() != "maven") continue - val symbols = extractSymbols(entry) - if (symbols.isEmpty()) continue + val ghsaId = + entry.path("vulnerability").path("id").asText().takeIf { it.isNotEmpty() } ?: continue + val artifact = entry.path("dependency_name").asText().takeIf { it.isNotEmpty() } ?: continue + val versionRanges = entry.path("package_versions").map { it.asText() } - for (pkg in entry.path("package")) { - if (pkg.path("ecosystem").asText() != "maven") continue - val artifact = pkg.path("name").asText().takeIf { it.isNotEmpty() } ?: continue - val versionRanges = pkg.path("version_range").map { it.asText() } + val symbols = extractTargets(entry) + if (symbols.isEmpty()) continue - entries += mapOf( - "vuln_id" to ghsaId, - "artifact" to artifact, - "version_ranges" to versionRanges, - "symbols" to symbols, - ) - } + entries += + mapOf( + "vuln_id" to ghsaId, + "artifact" to artifact, + "version_ranges" to versionRanges, + "symbols" to symbols, + ) } return entries } - private fun extractSymbols(entry: JsonNode): List> { + /** + * Parses the targets array from a GHSA entry. + * + * Each target string has the format "package:ClassName.method". Parsing uses + * lastIndexOf(':') to split package from class+method, then lastIndexOf('.') on the + * class+method part to split class name from method name. Malformed targets (missing ':' + * or missing '.' after ':') are silently skipped. + * + * Targets within one entry may come from different packages; no assumption is made that + * all targets share a common package prefix. + * + * TODO(APPSEC-62260): if the database adds inner-class targets (e.g. "pkg:Outer.Inner.method"), + * the current replace('.', '/') will produce pkg/Outer/Inner instead of the correct + * pkg/Outer$Inner. Update when the database team defines the inner-class format. + */ + private fun extractTargets(entry: JsonNode): List> { val symbols = mutableListOf>() - val imports = entry.path("ecosystem_specific").path("imports") - if (imports.isMissingNode || !imports.isArray) return symbols + val targets = entry.path("targets") + if (targets.isMissingNode || !targets.isArray) return symbols - for (importGroup in imports) { - for (symbol in importGroup.path("symbols")) { - if (symbol.path("type").asText() != "class") continue - val pkg = symbol.path("value").asText().takeIf { it.isNotEmpty() } ?: continue - val name = symbol.path("name").asText().takeIf { it.isNotEmpty() } ?: continue + for (target in targets) { + val t = target.asText().takeIf { it.isNotEmpty() } ?: continue + val colonIdx = t.lastIndexOf(':') + if (colonIdx < 0) continue + val pkg = t.substring(0, colonIdx) + val classAndMethod = t.substring(colonIdx + 1) + val dotIdx = classAndMethod.lastIndexOf('.') + if (dotIdx < 0) continue + val simpleClass = classAndMethod.substring(0, dotIdx) + val method = classAndMethod.substring(dotIdx + 1) + if (pkg.isEmpty() || simpleClass.isEmpty() || method.isEmpty()) continue - // JVM internal format (slashes) — avoids per-class conversion in the - // ClassFileTransformer hot path at runtime. - // TODO(APPSEC-62260): verify inner-class format when database adds method-level symbols. - // If GHSA uses dot notation for inner classes (e.g. name="Outer.Inner"), the replace below - // produces com/example/Outer/Inner instead of the correct com/example/Outer$Inner. - // When the database team defines the format, update this to handle the $ separator. - val internalName = "$pkg.$name".replace('.', '/') - symbols += mapOf("class" to internalName, "method" to null) - } + val internalName = "$pkg.$simpleClass".replace('.', '/') + symbols += mapOf("class" to internalName, "method" to method) } return symbols diff --git a/buildSrc/src/test/kotlin/datadog/gradle/sca/GhsaEnrichmentParserTest.kt b/buildSrc/src/test/kotlin/datadog/gradle/sca/GhsaEnrichmentParserTest.kt index 7f850b325e5..79ff7255556 100644 --- a/buildSrc/src/test/kotlin/datadog/gradle/sca/GhsaEnrichmentParserTest.kt +++ b/buildSrc/src/test/kotlin/datadog/gradle/sca/GhsaEnrichmentParserTest.kt @@ -7,14 +7,14 @@ import org.junit.jupiter.api.Test class GhsaEnrichmentParserTest { private fun fixture(name: String): String = - GhsaEnrichmentParserTest::class.java - .getResourceAsStream("/sca/fixtures/$name")!! - .bufferedReader() - .readText() + GhsaEnrichmentParserTest::class.java + .getResourceAsStream("/sca/fixtures/$name")!! + .bufferedReader() + .readText() @Test fun `single package entry produces one record`() { - val entries = GhsaEnrichmentParser.parse("GHSA-single-package", fixture("GHSA-single-package.json")) + val entries = GhsaEnrichmentParser.parse(fixture("GHSA-single-package.json")) assertThat(entries).hasSize(1) val entry = entries[0] @@ -23,95 +23,181 @@ class GhsaEnrichmentParserTest { assertThat(entry["version_ranges"]).isEqualTo(listOf("< 2.6.7.3", ">= 2.7.0, < 2.7.9.5")) } + @Test + fun `ghsa id is read from vulnerability id field in json`() { + val entries = GhsaEnrichmentParser.parse(fixture("GHSA-single-package.json")) + + assertThat(entries[0]["vuln_id"]).isEqualTo("GHSA-single-package") + } + @Test fun `class names are converted to JVM internal format with slashes`() { - val entries = GhsaEnrichmentParser.parse("GHSA-single-package", fixture("GHSA-single-package.json")) + val entries = GhsaEnrichmentParser.parse(fixture("GHSA-single-package.json")) @Suppress("UNCHECKED_CAST") val symbols = entries[0]["symbols"] as List> assertThat(symbols).hasSize(2) - assertThat(symbols.map { it["class"] }).containsExactly( - "com/fasterxml/jackson/databind/ObjectMapper", - "com/fasterxml/jackson/databind/ObjectReader", - ) + assertThat(symbols.map { it["class"] }) + .containsExactly( + "com/fasterxml/jackson/databind/ObjectMapper", + "com/fasterxml/jackson/databind/ObjectReader", + ) } @Test - fun `method field is always null for class-level symbols`() { - val entries = GhsaEnrichmentParser.parse("GHSA-single-package", fixture("GHSA-single-package.json")) + fun `method field is always non-null`() { + val entries = GhsaEnrichmentParser.parse(fixture("GHSA-single-package.json")) @Suppress("UNCHECKED_CAST") val symbols = entries[0]["symbols"] as List> - assertThat(symbols).allSatisfy { symbol -> - assertThat(symbol["method"]).isNull() - } + assertThat(symbols).allSatisfy { symbol -> assertThat(symbol["method"]).isNotNull() } } @Test - fun `multi-package entry expands to one record per artifact`() { - val entries = GhsaEnrichmentParser.parse("GHSA-multi-package", fixture("GHSA-multi-package.json")) + fun `method name is extracted from target string`() { + val entries = GhsaEnrichmentParser.parse(fixture("GHSA-single-package.json")) + + @Suppress("UNCHECKED_CAST") + val symbols = entries[0]["symbols"] as List> + assertThat(symbols.map { it["method"] }).containsExactly("readValue", "readValue") + } + + @Test + fun `multi-package entry produces one record per artifact`() { + val entries = GhsaEnrichmentParser.parse(fixture("GHSA-multi-package.json")) assertThat(entries).hasSize(2) - assertThat(entries.map { it["artifact"] }).containsExactlyInAnyOrder( - "org.springframework.boot:spring-boot-starter-web", - "org.springframework:spring-webmvc", - ) + assertThat(entries.map { it["artifact"] }) + .containsExactlyInAnyOrder( + "org.springframework.boot:spring-boot-starter-web", + "org.springframework:spring-webmvc", + ) } @Test fun `multi-package entries each have their own version ranges`() { - val entries = GhsaEnrichmentParser.parse("GHSA-multi-package", fixture("GHSA-multi-package.json")) + val entries = GhsaEnrichmentParser.parse(fixture("GHSA-multi-package.json")) - val webEntry = entries.first { it["artifact"] == "org.springframework.boot:spring-boot-starter-web" } + val webEntry = + entries.first { it["artifact"] == "org.springframework.boot:spring-boot-starter-web" } assertThat(webEntry["version_ranges"]).isEqualTo(listOf("< 2.5.12", ">= 2.6.0, < 2.6.6")) val mvcEntry = entries.first { it["artifact"] == "org.springframework:spring-webmvc" } - assertThat(mvcEntry["version_ranges"]).isEqualTo(listOf(">= 5.3.0, < 5.3.18", "< 5.2.20.RELEASE")) + assertThat(mvcEntry["version_ranges"]) + .isEqualTo(listOf(">= 5.3.0, < 5.3.18", "< 5.2.20.RELEASE")) } @Test - fun `multi-package entries share the same symbols`() { - val entries = GhsaEnrichmentParser.parse("GHSA-multi-package", fixture("GHSA-multi-package.json")) + fun `multi-package entries can share the same symbols`() { + // In the new format each artifact entry is independent and may have its own targets. + // This fixture has two entries with identical targets; verifying that each parses them correctly. + val entries = GhsaEnrichmentParser.parse(fixture("GHSA-multi-package.json")) @Suppress("UNCHECKED_CAST") val symbols0 = entries[0]["symbols"] as List> @Suppress("UNCHECKED_CAST") val symbols1 = entries[1]["symbols"] as List> - assertThat(symbols0.map { it["class"] }).containsExactlyInAnyOrder( - "org/springframework/stereotype/Controller", - "org/springframework/web/bind/annotation/RestController", - ) + assertThat(symbols0.map { it["class"] }) + .containsExactlyInAnyOrder( + "org/springframework/stereotype/Controller", + "org/springframework/web/bind/annotation/RestController", + ) assertThat(symbols0.map { it["class"] }).isEqualTo(symbols1.map { it["class"] }) } @Test - fun `non-jvm language entries are ignored`() { - val entries = GhsaEnrichmentParser.parse("GHSA-mixed-languages", fixture("GHSA-mixed-languages.json")) + fun `targets from different packages within one entry produce independent symbol entries`() { + // Models GHSA-cwq5-8pvq-j65j (Zserio): a single entry has targets from zserio.runtime.array + // and zserio.runtime.io (two different packages under the same artifact). + val entries = GhsaEnrichmentParser.parse(fixture("GHSA-cross-package.json")) + + assertThat(entries).hasSize(1) + assertThat(entries[0]["artifact"]).isEqualTo("io.github.ndsev:zserio-runtime") + + @Suppress("UNCHECKED_CAST") + val symbols = entries[0]["symbols"] as List> + assertThat(symbols).hasSize(2) + assertThat(symbols.map { it["class"] }) + .containsExactlyInAnyOrder( + "zserio/runtime/array/Array", + "zserio/runtime/io/ByteArrayBitStreamReader", + ) + assertThat(symbols.map { it["method"] }).containsExactlyInAnyOrder("read", "readBitBuffer") + } + + @Test + fun `non-maven language entries are ignored`() { + val entries = GhsaEnrichmentParser.parse(fixture("GHSA-mixed-languages.json")) assertThat(entries).hasSize(1) assertThat(entries[0]["artifact"]).isEqualTo("com.thoughtworks.xstream:xstream") } @Test - fun `entries with no symbols produce no output`() { - val entries = GhsaEnrichmentParser.parse("GHSA-empty-symbols", fixture("GHSA-empty-symbols.json")) + fun `entries with empty targets produce no output`() { + val entries = GhsaEnrichmentParser.parse(fixture("GHSA-empty-symbols.json")) assertThat(entries).isEmpty() } @Test - fun `ghsa id is used as vuln_id without modification`() { - val ghsaId = "GHSA-645p-88qh-w398" - val entries = GhsaEnrichmentParser.parse(ghsaId, fixture("GHSA-single-package.json")) + fun `targets without colon separator are silently skipped`() { + val json = + """[{ + "targets": ["noColonHere", "valid.pkg:Class.method"], + "lang": "maven", + "dependency_name": "com.example:lib", + "package_versions": ["< 1.0.0"], + "vulnerability": {"id": "GHSA-malformed-1", "severity": "LOW", "description": ""} + }]""" + val entries = GhsaEnrichmentParser.parse(json) + + assertThat(entries).hasSize(1) + @Suppress("UNCHECKED_CAST") + val symbols = entries[0]["symbols"] as List> + assertThat(symbols).hasSize(1) + assertThat(symbols[0]["class"]).isEqualTo("valid/pkg/Class") + assertThat(symbols[0]["method"]).isEqualTo("method") + } + + @Test + fun `targets without dot after colon are silently skipped`() { + val json = + """[{ + "targets": ["pkg:ClassWithNoMethod", "pkg:Class.method"], + "lang": "maven", + "dependency_name": "com.example:lib", + "package_versions": ["< 1.0.0"], + "vulnerability": {"id": "GHSA-malformed-2", "severity": "LOW", "description": ""} + }]""" + val entries = GhsaEnrichmentParser.parse(json) - assertThat(entries[0]["vuln_id"]).isEqualTo(ghsaId) + assertThat(entries).hasSize(1) + @Suppress("UNCHECKED_CAST") + val symbols = entries[0]["symbols"] as List> + assertThat(symbols).hasSize(1) + assertThat(symbols[0]["method"]).isEqualTo("method") + } + + @Test + fun `entry with all malformed targets produces no output`() { + val json = + """[{ + "targets": ["noColon", "alsoNoColon"], + "lang": "maven", + "dependency_name": "com.example:lib", + "package_versions": ["< 1.0.0"], + "vulnerability": {"id": "GHSA-all-malformed", "severity": "LOW", "description": ""} + }]""" + val entries = GhsaEnrichmentParser.parse(json) + + assertThat(entries).isEmpty() } @Test fun `non-json-array input throws IllegalArgumentException`() { - assertThatThrownBy { - GhsaEnrichmentParser.parse("GHSA-bad", """{"language": "jvm"}""") - }.isInstanceOf(IllegalArgumentException::class.java) - .hasMessageContaining("must be a JSON array") + assertThatThrownBy { GhsaEnrichmentParser.parse("""{"lang": "maven"}""") } + .isInstanceOf(IllegalArgumentException::class.java) + .hasMessageContaining("must be a JSON array") } } diff --git a/buildSrc/src/test/resources/sca/fixtures/GHSA-cross-package.json b/buildSrc/src/test/resources/sca/fixtures/GHSA-cross-package.json new file mode 100644 index 00000000000..c824f22b3cc --- /dev/null +++ b/buildSrc/src/test/resources/sca/fixtures/GHSA-cross-package.json @@ -0,0 +1,18 @@ +[ + { + "targets": [ + "zserio.runtime.array:Array.read", + "zserio.runtime.io:ByteArrayBitStreamReader.readBitBuffer" + ], + "lang": "maven", + "dependency_name": "io.github.ndsev:zserio-runtime", + "package_versions": [ + "< 2.18.1" + ], + "vulnerability": { + "id": "GHSA-cross-package", + "severity": "HIGH", + "description": "Entry with targets from different packages within the same artifact" + } + } +] diff --git a/buildSrc/src/test/resources/sca/fixtures/GHSA-empty-symbols.json b/buildSrc/src/test/resources/sca/fixtures/GHSA-empty-symbols.json index e856f6d2f9c..b4bba16c93e 100644 --- a/buildSrc/src/test/resources/sca/fixtures/GHSA-empty-symbols.json +++ b/buildSrc/src/test/resources/sca/fixtures/GHSA-empty-symbols.json @@ -1,15 +1,15 @@ [ { - "language": "jvm", - "package": [ - { - "ecosystem": "maven", - "name": "org.example:some-lib", - "version_range": ["< 1.0.0"] - } + "targets": [], + "lang": "maven", + "dependency_name": "org.example:some-lib", + "package_versions": [ + "< 1.0.0" ], - "ecosystem_specific": { - "imports": [] + "vulnerability": { + "id": "GHSA-empty-symbols", + "severity": "LOW", + "description": "Entry with empty targets — should produce no output" } } ] diff --git a/buildSrc/src/test/resources/sca/fixtures/GHSA-mixed-languages.json b/buildSrc/src/test/resources/sca/fixtures/GHSA-mixed-languages.json index 5f85a1295a1..a065e497e43 100644 --- a/buildSrc/src/test/resources/sca/fixtures/GHSA-mixed-languages.json +++ b/buildSrc/src/test/resources/sca/fixtures/GHSA-mixed-languages.json @@ -1,40 +1,32 @@ [ { - "language": "python", - "package": [ - { - "ecosystem": "pypi", - "name": "requests", - "version_range": ["< 2.28.0"] - } + "targets": [ + "requests.api:get.get" ], - "ecosystem_specific": { - "imports": [ - { - "symbols": [ - {"type": "function", "value": "requests", "name": "get"} - ] - } - ] + "lang": "python", + "dependency_name": "requests", + "package_versions": [ + "< 2.28.0" + ], + "vulnerability": { + "id": "GHSA-mixed-languages", + "severity": "LOW", + "description": "Python entry — should be ignored by the Maven filter" } }, { - "language": "jvm", - "package": [ - { - "ecosystem": "maven", - "name": "com.thoughtworks.xstream:xstream", - "version_range": ["< 1.4.16"] - } + "targets": [ + "com.thoughtworks.xstream:XStream.fromXML" + ], + "lang": "maven", + "dependency_name": "com.thoughtworks.xstream:xstream", + "package_versions": [ + "< 1.4.16" ], - "ecosystem_specific": { - "imports": [ - { - "symbols": [ - {"type": "class", "value": "com.thoughtworks.xstream", "name": "XStream"} - ] - } - ] + "vulnerability": { + "id": "GHSA-mixed-languages", + "severity": "HIGH", + "description": "JVM Maven entry — should be parsed" } } ] diff --git a/buildSrc/src/test/resources/sca/fixtures/GHSA-multi-package.json b/buildSrc/src/test/resources/sca/fixtures/GHSA-multi-package.json index 133a7e1ccf2..7d681a3d63c 100644 --- a/buildSrc/src/test/resources/sca/fixtures/GHSA-multi-package.json +++ b/buildSrc/src/test/resources/sca/fixtures/GHSA-multi-package.json @@ -1,41 +1,36 @@ [ { - "language": "jvm", - "package": [ - { - "ecosystem": "maven", - "name": "org.springframework.boot:spring-boot-starter-web", - "version_range": [ - "< 2.5.12", - ">= 2.6.0, < 2.6.6" - ] - }, - { - "ecosystem": "maven", - "name": "org.springframework:spring-webmvc", - "version_range": [ - ">= 5.3.0, < 5.3.18", - "< 5.2.20.RELEASE" - ] - } + "targets": [ + "org.springframework.stereotype:Controller.handleRequest", + "org.springframework.web.bind.annotation:RestController.handleRequest" ], - "ecosystem_specific": { - "imports": [ - { - "symbols": [ - { - "type": "class", - "value": "org.springframework.stereotype", - "name": "Controller" - }, - { - "type": "class", - "value": "org.springframework.web.bind.annotation", - "name": "RestController" - } - ] - } - ] + "lang": "maven", + "dependency_name": "org.springframework.boot:spring-boot-starter-web", + "package_versions": [ + "< 2.5.12", + ">= 2.6.0, < 2.6.6" + ], + "vulnerability": { + "id": "GHSA-multi-package", + "severity": "HIGH", + "description": "Test fixture for multi-artifact GHSA entry (two separate array items)" + } + }, + { + "targets": [ + "org.springframework.stereotype:Controller.handleRequest", + "org.springframework.web.bind.annotation:RestController.handleRequest" + ], + "lang": "maven", + "dependency_name": "org.springframework:spring-webmvc", + "package_versions": [ + ">= 5.3.0, < 5.3.18", + "< 5.2.20.RELEASE" + ], + "vulnerability": { + "id": "GHSA-multi-package", + "severity": "HIGH", + "description": "Test fixture for multi-artifact GHSA entry (two separate array items)" } } ] diff --git a/buildSrc/src/test/resources/sca/fixtures/GHSA-single-package.json b/buildSrc/src/test/resources/sca/fixtures/GHSA-single-package.json index 3f9c2ea01aa..3e1e13af95e 100644 --- a/buildSrc/src/test/resources/sca/fixtures/GHSA-single-package.json +++ b/buildSrc/src/test/resources/sca/fixtures/GHSA-single-package.json @@ -1,33 +1,19 @@ [ { - "language": "jvm", - "package": [ - { - "ecosystem": "maven", - "name": "com.fasterxml.jackson.core:jackson-databind", - "version_range": [ - "< 2.6.7.3", - ">= 2.7.0, < 2.7.9.5" - ] - } + "targets": [ + "com.fasterxml.jackson.databind:ObjectMapper.readValue", + "com.fasterxml.jackson.databind:ObjectReader.readValue" ], - "ecosystem_specific": { - "imports": [ - { - "symbols": [ - { - "type": "class", - "value": "com.fasterxml.jackson.databind", - "name": "ObjectMapper" - }, - { - "type": "class", - "value": "com.fasterxml.jackson.databind", - "name": "ObjectReader" - } - ] - } - ] + "lang": "maven", + "dependency_name": "com.fasterxml.jackson.core:jackson-databind", + "package_versions": [ + "< 2.6.7.3", + ">= 2.7.0, < 2.7.9.5" + ], + "vulnerability": { + "id": "GHSA-single-package", + "severity": "HIGH", + "description": "Test fixture for single-package GHSA entry" } } ] diff --git a/dd-java-agent/appsec/build.gradle b/dd-java-agent/appsec/build.gradle index 09537076f52..10ea2882dc9 100644 --- a/dd-java-agent/appsec/build.gradle +++ b/dd-java-agent/appsec/build.gradle @@ -27,6 +27,8 @@ dependencies { testImplementation group: 'com.flipkart.zjsonpatch', name: 'zjsonpatch', version: '0.4.11' testImplementation libs.logback.classic testImplementation libs.jackson.databind + + testImplementation libs.bundles.mockito } diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/sca/ScaCveDatabase.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/sca/ScaCveDatabase.java index 9a3b7a022d2..2c0446e888d 100644 --- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/sca/ScaCveDatabase.java +++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/sca/ScaCveDatabase.java @@ -78,7 +78,9 @@ static ScaCveDatabase parse(Reader reader) throws IOException { for (EntryJson e : root.entries) { ScaEntry entry = toScaEntry(e); - if (entry == null) continue; + if (entry == null) { + continue; + } entryCount++; // Index once per unique class name: an entry with multiple symbols for the same class // (e.g. Yaml.load + Yaml.loadAll) must appear only once in the list, otherwise @@ -102,21 +104,15 @@ private static ScaEntry toScaEntry(EntryJson e) { log.debug("SCA Reachability: skipping malformed entry: {}", e); return null; } - // When a class appears with both class-level (method=null) and method-level symbols in the - // same entry, the class-level entry is redundant: the method-level callbacks are more precise - // and will report the hit when the specific method is called. Drop the class-level symbol to - // avoid the first-hit-wins semantics of hitRef filling up with the class-level callsite and - // silently discarding the more specific method callsite. - Set classesWithMethodLevel = new HashSet<>(); - for (SymbolJson s : e.symbols) { - if (s.className != null && s.method != null) { - classesWithMethodLevel.add(s.className); - } - } List symbols = new ArrayList<>(e.symbols.size()); for (SymbolJson s : e.symbols) { - if (s.className == null) continue; - if (s.method == null && classesWithMethodLevel.contains(s.className)) continue; + if (s.className == null) { + continue; + } + if (s.method == null) { + log.debug("SCA Reachability: skipping symbol with null method in entry {}", e.vulnId); + continue; + } symbols.add(new ScaSymbol(s.className, s.method)); } if (symbols.isEmpty()) return null; diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/sca/ScaReachabilitySystem.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/sca/ScaReachabilitySystem.java index 3f794ae18a2..28a7fe176e6 100644 --- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/sca/ScaReachabilitySystem.java +++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/sca/ScaReachabilitySystem.java @@ -74,23 +74,18 @@ public static void start(Instrumentation instrumentation) { ScaReachabilityTransformer transformer = new ScaReachabilityTransformer(database, instrumentation); - // canRetransform=true is required so that future method-level symbols (when added to the - // database) can trigger retransformation of already-loaded classes via retransformClasses(). - // For current class-level symbols, retransformation is not used - see - // checkAlreadyLoadedClasses. + // canRetransform=true is required so that already-loaded classes can be retransformed to inject + // method-level callbacks when they were loaded before the agent started. instrumentation.addTransformer(transformer, true); transformer.checkAlreadyLoadedClasses(); log.debug("SCA Reachability: startup scan complete"); - // processPendingClassEvents drains the first-load queue (JAR resolution + hit reporting); - // performPendingRetransforms then injects method-level callbacks for any classes it queued. - // Order matters: process events first so retransforms happen in the same heartbeat. + // performPendingRetransforms injects method-level callbacks into classes whose names were + // added to pendingRetransformNames by transform() on first load or by processClass() when + // version resolution previously failed and needs a retry. ScaReachabilityDependencyRegistry.INSTANCE.setPeriodicWorkCallback( - () -> { - transformer.processPendingClassEvents(); - transformer.performPendingRetransforms(); - }); + transformer::performPendingRetransforms); } /** diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/sca/ScaReachabilityTransformer.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/sca/ScaReachabilityTransformer.java index 0316303e56a..1e21cecad46 100644 --- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/sca/ScaReachabilityTransformer.java +++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/sca/ScaReachabilityTransformer.java @@ -5,7 +5,6 @@ import datadog.telemetry.dependency.DependencyResolver; import datadog.trace.api.internal.VisibleForTesting; import datadog.trace.api.telemetry.ScaReachabilityDependencyRegistry; -import datadog.trace.api.telemetry.ScaReachabilityHit; import datadog.trace.util.Strings; import java.io.File; import java.lang.instrument.ClassFileTransformer; @@ -35,12 +34,11 @@ * *
    *
  • Two-phase processing: on first class load ({@code classBeingRedefined == null}), - * {@link #transform} only enqueues the event and returns {@code null} — no JAR I/O on the - * class-loading thread. {@link #processPendingClassEvents} runs on the telemetry thread each - * heartbeat and performs all heavyweight work (JAR reads, version resolution, hit reporting). - * Method-level bytecode injection is deferred further to {@link #performPendingRetransforms}, - * which calls {@link Instrumentation#retransformClasses} and fires {@link #transform} again - * with {@code classBeingRedefined != null}. + * {@link #transform} adds the class name to {@link #pendingRetransformNames} and returns + * {@code null} — no JAR I/O on the class-loading thread. {@link #performPendingRetransforms} + * runs on the telemetry thread each heartbeat, calls {@link + * Instrumentation#retransformClasses}, and fires {@link #transform} again with {@code + * classBeingRedefined != null} to inject method-level callbacks. *
  • Never throws: any error in {@link #transform} is caught silently to avoid breaking * class loading. *
  • Concurrent: all shared state uses concurrent collections — {@link #transform} is @@ -48,9 +46,8 @@ *
  • Version cache: each JAR is read at most once; non-empty results are cached in {@link * #jarCache}. *
  • Single occurrence: each (vulnId, artifact, symbolName) tuple is reported at most - * once per RFC requirement. Class-level dedup lives in {@link #reportedHits}; method-level - * dedup lives in {@code ScaReachabilityCallback.reported} (bootstrap-side, persists across - * retransforms). + * once per RFC requirement. Dedup lives in {@code ScaReachabilityCallback.reported} + * (bootstrap-side, persists across retransforms). *
*/ public final class ScaReachabilityTransformer implements ClassFileTransformer { @@ -65,19 +62,19 @@ public final class ScaReachabilityTransformer implements ClassFileTransformer { * Cache: JAR URI → resolved dependencies. URI is used instead of URL to avoid DNS lookups in * equals/hashCode (DMI_COLLECTION_OF_URLS). Only non-empty results are cached to allow retries. */ - private final ConcurrentHashMap> jarCache = new ConcurrentHashMap<>(); + @VisibleForTesting + final ConcurrentHashMap> jarCache = new ConcurrentHashMap<>(); /** - * Cache: artifact name → classpath-resolved version. Used when the class's own JAR does not - * contain the vulnerable artifact (e.g., Spring Boot starters whose watched classes live in - * transitive dependency JARs). Only non-null results are cached; null means "not yet found" and - * will be retried on the next periodic retransform. + * Cache: artifact name → classpath-resolved {@link Dependency}. Stores the full dependency (name + * + version) so that the resolved {@code dep.name} — which may be an artifactId-only name like + * {@code "junrar"} for JARs without pom.properties — is propagated to {@code registerCve} and + * kept consistent with the name that {@link datadog.telemetry.dependency.DependencyService} will + * report. Only non-null results are cached; null means "not yet found" and will be retried on the + * next periodic retransform. */ - private final ConcurrentHashMap classpathArtifactCache = - new ConcurrentHashMap<>(); - - /** Deduplication set: "vulnId|artifact|symbol" tuples already reported. */ - private final Set reportedHits = ConcurrentHashMap.newKeySet(); + @VisibleForTesting + final ConcurrentHashMap classpathArtifactCache = new ConcurrentHashMap<>(); /** * Classes whose bytecode needs (re)transformation for method-level symbol injection: @@ -95,23 +92,6 @@ public final class ScaReachabilityTransformer implements ClassFileTransformer { /** Class names (internal format) queued for deferred retransformation by name lookup. */ @VisibleForTesting final Set pendingRetransformNames = ConcurrentHashMap.newKeySet(); - /** - * Queue of classes detected on first load but not yet processed. Populated by {@link #transform} - * (class-loading thread); drained by {@link #processPendingClassEvents} (telemetry thread). - */ - @VisibleForTesting - final ConcurrentLinkedQueue pendingClassEvents = new ConcurrentLinkedQueue<>(); - - static final class PendingClass { - final String className; - final URL jarUrl; - - PendingClass(String className, URL jarUrl) { - this.className = className; - this.jarUrl = jarUrl; - } - } - public ScaReachabilityTransformer(ScaCveDatabase database, Instrumentation instrumentation) { this.database = database; this.instrumentation = instrumentation; @@ -155,11 +135,9 @@ public byte[] transform( } if (classBeingRedefined == null) { - // First load: enqueue for deferred processing on the telemetry thread so that JAR I/O + // First load: schedule a retransform for the next telemetry heartbeat so that JAR I/O // (DependencyResolver.resolve) does not run on the class-loading thread. - // processPendingClassEvents() will handle resolution, reporting, and scheduling - // retransformation for method-level symbols on the next telemetry heartbeat. - pendingClassEvents.add(new PendingClass(className, location)); + pendingRetransformNames.add(className); return null; } @@ -177,15 +155,15 @@ public byte[] transform( * Injects method-level callbacks into the bytecode of a class being retransformed. * *

Called only on retransformation ({@code classBeingRedefined != null}), triggered by {@link - * #performPendingRetransforms} for classes that have method-level symbols. Class-level hits were - * already reported by {@link #reportClassLevelHits} during {@link #processPendingClassEvents}. + * #performPendingRetransforms}. * - *

Returns modified bytecode if method-level callbacks were injected, or {@code null} if only - * class-level symbols were present (no bytecode change needed). + *

Returns modified bytecode if method-level callbacks were injected, or {@code null} if + * version resolution failed (no bytecode change needed; will be retried on the next heartbeat). */ private byte[] processClass( String className, URL jarUrl, List entries, byte[] classfileBuffer) { - List classJarDeps = resolveDependencies(jarUrl); + // Cache-only: processClass() runs under JVM retransform locks; no fresh JAR I/O here. + List classJarDeps = resolveDependenciesFromCache(jarUrl); // Collect method-level callbacks to inject, keyed by method name Map> methodCallbacks = new HashMap<>(); @@ -194,36 +172,38 @@ private byte[] processClass( String dotClassName = null; for (ScaEntry entry : entries) { - // Resolve version: first check the class's own JAR, then fall back to a full classpath - // scan. The fallback handles cases where the vulnerable artifact is an aggregator/starter - // POM whose watched classes actually live in a transitive dependency JAR (e.g., - // spring-boot-starter-web watches @Controller, but @Controller is in spring-context.jar). - String version = resolveVersionForArtifact(entry.artifact(), classJarDeps); - if (version == null) { - // Version not yet resolvable - check lazily (only here) whether this entry has - // method-level symbols, to decide if a periodic retry should be scheduled. - // Doing this check only when version==null avoids the stream allocation on the - // common path where the version resolves successfully. - if (hasMethodLevelSymbolForEntry(entry, className)) { - hasUnresolvedMethodLevelSymbols = true; - } + // Resolve the dependency for this artifact: first check the class's own JAR, then fall back + // to a full classpath scan. The fallback handles aggregator/starter POM artifacts whose + // watched classes actually live in a transitive dependency JAR (e.g., spring-boot-starter-web + // watches @Controller, but @Controller is in spring-context.jar). + // + // We use the resolved dep's name (not entry.artifact()) for registerCve and + // MethodCallbackSpec + // to ensure that the registry key matches the name that DependencyService will later report. + // For JARs without pom.properties, DependencyResolver.guessFallbackNoPom produces an + // artifactId-only name (e.g. "junrar" instead of "com.github.junrar:junrar"). Using + // entry.artifact() as the registry key would cause a mismatch with DependencyService's name, + // causing the CVE telemetry event to lose its source/hash or appear under the wrong name. + Dependency resolvedDep = resolveArtifactDep(entry.artifact(), classJarDeps); + if (resolvedDep == null) { + hasUnresolvedMethodLevelSymbols = true; continue; } + String version = resolvedDep.version; + String depName = resolvedDep.name != null ? resolvedDep.name : entry.artifact(); if (!entry.isVersionVulnerable(version)) { continue; } - reportClassLevelHitIfPresent(entry, version, className); for (ScaSymbol symbol : entry.symbols()) { - if (!symbol.className().equals(className) || symbol.isClassLevel()) { + if (!symbol.className().equals(className)) { continue; } // Register the CVE now (at class load time) with reached=[] so the next heartbeat // signals the backend that SCA is monitoring this CVE. The callsite will be added // later when the method is actually called (via ScaReachabilityCallback). - ScaReachabilityDependencyRegistry.INSTANCE.registerCve( - entry.artifact(), version, entry.vulnId()); + ScaReachabilityDependencyRegistry.INSTANCE.registerCve(depName, version, entry.vulnId()); if (dotClassName == null) { dotClassName = Strings.getClassName(className); } @@ -231,7 +211,7 @@ private byte[] processClass( .computeIfAbsent(symbol.method(), k -> new ArrayList<>()) .add( new MethodCallbackSpec( - entry.vulnId(), entry.artifact(), version, dotClassName, symbol.method())); + entry.vulnId(), depName, version, dotClassName, symbol.method())); } } @@ -281,55 +261,10 @@ public void checkAlreadyLoadedClasses() { // JDK/bootstrap class (no code source): skip - false positive, see class Javadoc. continue; } - try { - reportClassLevelHits(internalName, location, entries); - // If any entry for this class has method-level symbols, the class needs retransformation - // so the bytecode callback can be injected. We can't modify bytecode here (we're just - // scanning) - retransformation is deferred to performPendingRetransforms(). - if (hasMethodLevelSymbolForClass(entries, internalName)) { - pendingRetransform.add(clazz); - } - } catch (Exception e) { - // Never abort the scan - a failure on one class must not skip the remaining ones. - log.debug("SCA Reachability: error scanning already-loaded class {}", internalName, e); - } - } - } - - /** - * Processes classes enqueued by {@link #transform} on first load. - * - *

Runs on the telemetry thread (heartbeat) so that JAR I/O does not block class loading. For - * each pending class: - * - *

    - *
  1. Resolves the JAR dependencies via {@link DependencyResolver} (I/O, cached after first - * read per JAR). - *
  2. Reports class-level hits immediately. - *
  3. Schedules retransformation for method-level symbols by adding to {@link - * #pendingRetransformNames}; {@link #performPendingRetransforms} handles the actual {@link - * Instrumentation#retransformClasses} call on the same heartbeat. - *
- * - *

Must be called before {@link #performPendingRetransforms} so that classes queued - * here are retransformed in the same heartbeat. - */ - public void processPendingClassEvents() { - PendingClass event; - while ((event = pendingClassEvents.poll()) != null) { - final String className = event.className; - List entries = database.entriesForClass(className); - if (entries == null) { - continue; - } - try { - reportClassLevelHits(className, event.jarUrl, entries); - if (hasMethodLevelSymbolForClass(entries, className)) { - pendingRetransformNames.add(className); - } - } catch (Exception e) { - log.debug("SCA Reachability: error processing deferred class {}", className, e); - } + // All symbols are method-level: always schedule retransformation so the bytecode + // callback can be injected. We can't modify bytecode during the startup scan; deferred + // to performPendingRetransforms(). + pendingRetransform.add(clazz); } } @@ -337,15 +272,13 @@ public void processPendingClassEvents() { * Retransforms classes scheduled for method-level bytecode injection: * *

    - *
  1. Classes detected on first load and queued by {@link #processPendingClassEvents}. + *
  2. Classes detected on first load ({@link #transform} adds them to {@link + * #pendingRetransformNames}). *
  3. Classes already loaded before the transformer was registered ({@link * #checkAlreadyLoadedClasses}). *
  4. Classes whose JAR version could not be resolved (will be retried). *
* - *

Must be called after {@link #processPendingClassEvents} so that classes queued in - * the same heartbeat are retransformed immediately. - * *

Called by {@code ScaReachabilityPeriodicAction} on each telemetry heartbeat via the {@code * periodicWorkCallback} registered in {@link ScaReachabilityDependencyRegistry}. */ @@ -388,6 +321,38 @@ public void performPendingRetransforms() { return; } + // Pre-warm caches before retransformClasses() acquires JVM locks — no JAR I/O inside the + // callback. + // Two paths in processClass() can trigger fresh JAR I/O under locks: + // 1. resolveDependenciesFromCache() — safe only if jarCache is already populated. + // 2. resolveArtifactDep() → findArtifactInClasspath() for aggregator artifacts (e.g., + // spring-boot-starter-web) whose pom.properties is not in the class's own JAR. + // Without pre-warming classpathArtifactCache, this scans all java.class.path JARs via + // resolveDependencies() under JVM locks, reintroducing the snakeyaml deadlock. + for (Class c : toRetransform) { + ProtectionDomain pd = c.getProtectionDomain(); + if (pd == null) { + continue; + } + CodeSource cs = pd.getCodeSource(); + if (cs == null) { + continue; + } + URL loc = cs.getLocation(); + if (loc == null) { + continue; + } + resolveDependencies(loc); + String internalName = c.getName().replace('.', '/'); + List dbEntries = database.entriesForClass(internalName); + if (dbEntries != null) { + List classJarDeps = resolveDependenciesFromCache(loc); + for (ScaEntry entry : dbEntries) { + resolveVersionForArtifact(entry.artifact(), classJarDeps); + } + } + } + try { instrumentation.retransformClasses(toRetransform.toArray(new Class[0])); log.debug( @@ -404,84 +369,85 @@ public void performPendingRetransforms() { // Internal matching logic // --------------------------------------------------------------------------- - private void reportClassLevelHits(String internalClassName, URL jarUrl, List entries) { - List classJarDeps = resolveDependencies(jarUrl); - for (ScaEntry entry : entries) { - String version = resolveVersionForArtifact(entry.artifact(), classJarDeps); - if (version == null || !entry.isVersionVulnerable(version)) { - continue; - } - reportClassLevelHitIfPresent(entry, version, internalClassName); + /** + * Resolves the {@link Dependency} for {@code artifactName} (groupId:artifactId format), returning + * the matched dependency object — which may have an artifactId-only {@code name} for JARs without + * {@code pom.properties}. Returns {@code null} if the artifact cannot be found. + * + *

Use this method (not {@link #resolveVersionForArtifact}) whenever the resolved dependency + * name needs to be propagated (e.g., for {@code registerCve} and {@code MethodCallbackSpec}), so + * that registry keys stay consistent with the names that {@link + * datadog.telemetry.dependency.DependencyService} will report. + */ + @VisibleForTesting + Dependency resolveArtifactDep(String artifactName, List classJarDeps) { + Dependency dep = matchDep(artifactName, classJarDeps); + if (dep != null) { + return dep; } - } - - private static boolean hasMethodLevelSymbolForClass(List entries, String className) { - for (ScaEntry entry : entries) { - if (hasMethodLevelSymbolForEntry(entry, className)) { - return true; - } + // Classpath fallback: check cache first, then scan. + Dependency cached = classpathArtifactCache.get(artifactName); + if (cached != null) { + return cached; } - return false; - } - - private static boolean hasMethodLevelSymbolForEntry(ScaEntry entry, String className) { - for (ScaSymbol symbol : entry.symbols()) { - if (symbol.className().equals(className) && !symbol.isClassLevel()) { - return true; - } + dep = findArtifactInClasspath(artifactName); + if (dep != null) { + classpathArtifactCache.put(artifactName, dep); // only cache hits; misses are retried } - return false; + return dep; } - /** - * Reports a class-level reachability hit for the first class-level symbol in {@code entry} that - * matches {@code internalClassName}. No-op if no matching class-level symbol exists. - */ - private void reportClassLevelHitIfPresent( - ScaEntry entry, String version, String internalClassName) { - for (ScaSymbol symbol : entry.symbols()) { - if (symbol.className().equals(internalClassName) && symbol.isClassLevel()) { - reportHit(entry, version, internalClassName, ScaReachabilityHit.CLASS_LEVEL_SYMBOL, 1); - return; // one hit per entry is sufficient - } - } + @VisibleForTesting + String resolveVersionForArtifact(String artifactName, List classJarDeps) { + Dependency dep = resolveArtifactDep(artifactName, classJarDeps); + return dep != null ? dep.version : null; } /** - * Resolves the version of {@code artifactName} using a two-step strategy: - * - *

    - *
  1. Check the dependencies resolved from the class's own JAR ({@code classJarDeps}). This - * covers the common case where the class and its artifact live in the same JAR. - *
  2. If not found, fall back to a full classpath scan via {@link - * #findArtifactVersionInClasspath}. This handles aggregator/starter POM artifacts (e.g., - * {@code spring-boot-starter-web}) whose watched classes live in transitive dependency JARs - * rather than in the starter JAR itself. Results of successful scans are cached. - *
+ * Matches {@code artifactName} (groupId:artifactId format) against a list of dependencies, + * returning the matched {@link Dependency} object (not just the version). * - * @return the resolved version string, or {@code null} if the artifact cannot be found + *

First tries an exact name match. If that fails, falls back to matching by artifact ID only. + * The fallback handles JARs without {@code pom.properties}: {@code Dependency.guessFallbackNoPom} + * can only extract the artifact ID from the filename (no group ID), producing names like {@code + * "junrar"} for {@code com.github.junrar:junrar}. The returned dependency's {@code name} reflects + * what {@link datadog.telemetry.dependency.DependencyService} will report for that JAR. */ @VisibleForTesting - String resolveVersionForArtifact(String artifactName, List classJarDeps) { - for (Dependency dep : classJarDeps) { + static Dependency matchDep(String artifactName, List deps) { + for (Dependency dep : deps) { if (artifactName.equals(dep.name)) { - return dep.version; + return dep; } } - // Classpath fallback: check cache first, then scan. - String cached = classpathArtifactCache.get(artifactName); - if (cached != null) { - return cached; + int colonIdx = artifactName.lastIndexOf(':'); + if (colonIdx < 0) { + return null; } - String version = findArtifactVersionInClasspath(artifactName); - if (version != null) { - classpathArtifactCache.put(artifactName, version); // only cache hits; misses are retried + String artifactId = artifactName.substring(colonIdx + 1); + for (Dependency dep : deps) { + if (dep.name != null + && !dep.name.contains(":") + && artifactId.equals(dep.name) + && dep.version != null) { + return dep; + } } - return version; + return null; } + /** + * Matches {@code artifactName} against a list of dependencies, returning the resolved version + * string. Delegates to {@link #matchDep} — use that method when the full dependency object is + * needed. + */ @VisibleForTesting - String findArtifactVersionInClasspath(String artifactName) { + static String matchVersion(String artifactName, List deps) { + Dependency dep = matchDep(artifactName, deps); + return dep != null ? dep.version : null; + } + + private Dependency findArtifactInClasspath(String artifactName) { // Use URI (not URL) to avoid DNS lookups in equals/hashCode (DMI_COLLECTION_OF_URLS) Set scanned = new HashSet<>(); @@ -499,9 +465,9 @@ String findArtifactVersionInClasspath(String artifactName) { try { URI uri = new File(entry).toURI(); if (scanned.add(uri)) { - String version = findArtifactInUrl(artifactName, uri.toURL()); - if (version != null) { - return version; + Dependency dep = matchDep(artifactName, resolveDependencies(uri.toURL())); + if (dep != null) { + return dep; } } } catch (Exception e) { @@ -511,38 +477,25 @@ String findArtifactVersionInClasspath(String artifactName) { return null; } - private String findArtifactInUrl(String artifactName, URL url) { - for (Dependency dep : resolveDependencies(url)) { - if (artifactName.equals(dep.name) && dep.version != null) { - return dep.version; - } - } - return null; + @VisibleForTesting + String findArtifactVersionInClasspath(String artifactName) { + Dependency dep = findArtifactInClasspath(artifactName); + return dep != null ? dep.version : null; } - private void reportHit( - ScaEntry entry, String version, String internalClassName, String symbolName, int line) { - // Include version: two artifact versions loaded in separate classloaders must produce - // independent class-level hits. - String dedupKey = entry.vulnId() + "|" + entry.artifact() + "|" + version + "|" + symbolName; - if (!reportedHits.add(dedupKey)) { - return; + private List resolveDependenciesFromCache(URL url) { + try { + List cached = jarCache.get(url.toURI()); + return cached != null ? cached : Collections.emptyList(); + } catch (Exception e) { + // URISyntaxException from url.toURI() — should not happen for JAR URLs from protection domain + log.debug("SCA Reachability: could not read jarCache for {}", url, e); + return Collections.emptyList(); } - String dotClassName = Strings.getClassName(internalClassName); - log.debug( - "SCA Reachability: {} reached in {}:{} via {}#{}", - entry.vulnId(), - entry.artifact(), - version, - dotClassName, - symbolName); - // Register with callsite in the stateful registry. For class-level, dotClassName and - // symbolName ("") are used as the callsite - there is no separate "caller" frame. - ScaReachabilityDependencyRegistry.INSTANCE.recordHit( - entry.artifact(), version, entry.vulnId(), dotClassName, symbolName, line); } - private List resolveDependencies(URL url) { + @VisibleForTesting + List resolveDependencies(URL url) { try { URI uri = url.toURI(); List cached = jarCache.get(uri); diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/sca/ScaSymbol.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/sca/ScaSymbol.java index 537a208ae6b..e2185125118 100644 --- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/sca/ScaSymbol.java +++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/sca/ScaSymbol.java @@ -1,14 +1,12 @@ package com.datadog.appsec.sca; -import javax.annotation.Nullable; - -/** A single symbol from sca_cves.json: a class (and optionally a method) to watch for. */ +/** A single method-level symbol from sca_cves.json: a class and method to watch for. */ public final class ScaSymbol { private final String className; // JVM internal format: "com/foo/Bar" - @Nullable private final String method; // null = class-level; non-null = future method-level + private final String method; - public ScaSymbol(String className, @Nullable String method) { + public ScaSymbol(String className, String method) { this.className = className; this.method = method; } @@ -18,16 +16,8 @@ public String className() { return className; } - /** - * Method name for method-level tracking, or null for class-level. Currently always null since the - * database only has class-level symbols. - */ - @Nullable + /** Method name for method-level tracking, e.g. {@code "readValue"}. */ public String method() { return method; } - - public boolean isClassLevel() { - return method == null; - } } diff --git a/dd-java-agent/appsec/src/main/resources/sca_cves.json b/dd-java-agent/appsec/src/main/resources/sca_cves.json index 60d9777c507..c15f59bc822 100644 --- a/dd-java-agent/appsec/src/main/resources/sca_cves.json +++ b/dd-java-agent/appsec/src/main/resources/sca_cves.json @@ -1 +1 @@ -{"version":1,"entries":[{"vuln_id":"GHSA-24rp-q3w6-vc56","artifact":"org.postgresql:postgresql","version_ranges":[">= 42.2.0, < 42.2.28",">= 42.3.0, < 42.3.9",">= 42.4.0, < 42.4.4",">= 42.5.0, < 42.5.5",">= 42.6.0, < 42.6.1",">= 42.7.0, < 42.7.2"],"symbols":[{"class":"org/postgresql/ds/PGSimpleDataSource","method":null},{"class":"org/postgresql/ds/PGPoolingDataSource","method":null},{"class":"org/postgresql/ds/PGConnectionPoolDataSource","method":null}]},{"vuln_id":"GHSA-2p3x-qw9c-25hh","artifact":"com.thoughtworks.xstream:xstream","version_ranges":["< 1.4.16"],"symbols":[{"class":"com/thoughtworks/xstream/XStream","method":"fromXML"}]},{"vuln_id":"GHSA-2q8x-2p7f-574v","artifact":"com.thoughtworks.xstream:xstream","version_ranges":["< 1.4.18"],"symbols":[{"class":"com/thoughtworks/xstream/XStream","method":"fromXML"}]},{"vuln_id":"GHSA-36p3-wjmg-h94x","artifact":"org.springframework.boot:spring-boot-starter-web","version_ranges":["< 2.5.12",">= 2.6.0, < 2.6.6"],"symbols":[{"class":"org/springframework/stereotype/Controller","method":null},{"class":"org/springframework/web/bind/annotation/RestController","method":null},{"class":"org/springframework/web/bind/annotation/RequestMapping","method":null},{"class":"org/springframework/web/bind/annotation/PostMapping","method":null},{"class":"org/springframework/web/bind/annotation/PutMapping","method":null},{"class":"org/springframework/web/bind/annotation/PatchMapping","method":null},{"class":"org/springframework/web/bind/annotation/ModelAttribute","method":null},{"class":"org/springframework/validation/DataBinder","method":null},{"class":"org/springframework/web/bind/WebDataBinder","method":null},{"class":"org/springframework/web/bind/annotation/InitBinder","method":null},{"class":"org/springframework/web/bind/annotation/ControllerAdvice","method":null}]},{"vuln_id":"GHSA-36p3-wjmg-h94x","artifact":"org.springframework.boot:spring-boot-starter-webflux","version_ranges":["< 2.5.12",">= 2.6.0, < 2.6.6"],"symbols":[{"class":"org/springframework/stereotype/Controller","method":null},{"class":"org/springframework/web/bind/annotation/RestController","method":null},{"class":"org/springframework/web/bind/annotation/RequestMapping","method":null},{"class":"org/springframework/web/bind/annotation/PostMapping","method":null},{"class":"org/springframework/web/bind/annotation/PutMapping","method":null},{"class":"org/springframework/web/bind/annotation/PatchMapping","method":null},{"class":"org/springframework/web/bind/annotation/ModelAttribute","method":null},{"class":"org/springframework/validation/DataBinder","method":null},{"class":"org/springframework/web/bind/WebDataBinder","method":null},{"class":"org/springframework/web/bind/annotation/InitBinder","method":null},{"class":"org/springframework/web/bind/annotation/ControllerAdvice","method":null}]},{"vuln_id":"GHSA-36p3-wjmg-h94x","artifact":"org.springframework:spring-beans","version_ranges":[">= 5.3.0, < 5.3.18","< 5.2.20.RELEASE"],"symbols":[{"class":"org/springframework/stereotype/Controller","method":null},{"class":"org/springframework/web/bind/annotation/RestController","method":null},{"class":"org/springframework/web/bind/annotation/RequestMapping","method":null},{"class":"org/springframework/web/bind/annotation/PostMapping","method":null},{"class":"org/springframework/web/bind/annotation/PutMapping","method":null},{"class":"org/springframework/web/bind/annotation/PatchMapping","method":null},{"class":"org/springframework/web/bind/annotation/ModelAttribute","method":null},{"class":"org/springframework/validation/DataBinder","method":null},{"class":"org/springframework/web/bind/WebDataBinder","method":null},{"class":"org/springframework/web/bind/annotation/InitBinder","method":null},{"class":"org/springframework/web/bind/annotation/ControllerAdvice","method":null}]},{"vuln_id":"GHSA-36p3-wjmg-h94x","artifact":"org.springframework:spring-webflux","version_ranges":[">= 5.3.0, < 5.3.18","< 5.2.20.RELEASE"],"symbols":[{"class":"org/springframework/stereotype/Controller","method":null},{"class":"org/springframework/web/bind/annotation/RestController","method":null},{"class":"org/springframework/web/bind/annotation/RequestMapping","method":null},{"class":"org/springframework/web/bind/annotation/PostMapping","method":null},{"class":"org/springframework/web/bind/annotation/PutMapping","method":null},{"class":"org/springframework/web/bind/annotation/PatchMapping","method":null},{"class":"org/springframework/web/bind/annotation/ModelAttribute","method":null},{"class":"org/springframework/validation/DataBinder","method":null},{"class":"org/springframework/web/bind/WebDataBinder","method":null},{"class":"org/springframework/web/bind/annotation/InitBinder","method":null},{"class":"org/springframework/web/bind/annotation/ControllerAdvice","method":null}]},{"vuln_id":"GHSA-36p3-wjmg-h94x","artifact":"org.springframework:spring-webmvc","version_ranges":[">= 5.3.0, < 5.3.18","< 5.2.20.RELEASE"],"symbols":[{"class":"org/springframework/stereotype/Controller","method":null},{"class":"org/springframework/web/bind/annotation/RestController","method":null},{"class":"org/springframework/web/bind/annotation/RequestMapping","method":null},{"class":"org/springframework/web/bind/annotation/PostMapping","method":null},{"class":"org/springframework/web/bind/annotation/PutMapping","method":null},{"class":"org/springframework/web/bind/annotation/PatchMapping","method":null},{"class":"org/springframework/web/bind/annotation/ModelAttribute","method":null},{"class":"org/springframework/validation/DataBinder","method":null},{"class":"org/springframework/web/bind/WebDataBinder","method":null},{"class":"org/springframework/web/bind/annotation/InitBinder","method":null},{"class":"org/springframework/web/bind/annotation/ControllerAdvice","method":null}]},{"vuln_id":"GHSA-3ccq-5vw3-2p6x","artifact":"com.thoughtworks.xstream:xstream","version_ranges":["< 1.4.18"],"symbols":[{"class":"com/thoughtworks/xstream/XStream","method":"fromXML"}]},{"vuln_id":"GHSA-3gm7-v7vw-866c","artifact":"org.apache.solr:solr-core","version_ranges":["< 8.2.0"],"symbols":[{"class":"org/apache/solr/handler/dataimport/DataImporter","method":null},{"class":"org/apache/solr/handler/dataimport/DataImportHandler","method":null}]},{"vuln_id":"GHSA-4cch-wxpw-8p28","artifact":"com.thoughtworks.xstream:xstream","version_ranges":["< 1.4.15"],"symbols":[{"class":"com/thoughtworks/xstream/XStream","method":"fromXML"}]},{"vuln_id":"GHSA-4gq5-ch57-c2mg","artifact":"com.fasterxml.jackson.core:jackson-databind","version_ranges":["< 2.7.9.5",">= 2.8.0, < 2.8.11.3",">= 2.9.0, < 2.9.7"],"symbols":[{"class":"com/fasterxml/jackson/databind/ObjectMapper","method":null},{"class":"com/fasterxml/jackson/databind/ObjectMapper","method":"readValue"},{"class":"com/fasterxml/jackson/databind/ObjectMapper","method":"readValues"},{"class":"com/fasterxml/jackson/databind/ObjectReader","method":null},{"class":"com/fasterxml/jackson/databind/ObjectReader","method":"readValue"},{"class":"com/fasterxml/jackson/databind/ObjectReader","method":"readValues"}]},{"vuln_id":"GHSA-4jrv-ppp4-jm57","artifact":"com.google.code.gson:gson","version_ranges":["< 2.8.9"],"symbols":[{"class":"com/google/gson/Gson","method":null},{"class":"com/google/gson/GsonBuilder","method":null}]},{"vuln_id":"GHSA-4w82-r329-3q67","artifact":"com.fasterxml.jackson.core:jackson-databind","version_ranges":["< 2.6.7.4",">= 2.7.0, < 2.7.9.7",">= 2.8.0, < 2.8.11.5",">= 2.9.0, < 2.9.10.3"],"symbols":[{"class":"com/fasterxml/jackson/databind/ObjectMapper","method":null},{"class":"com/fasterxml/jackson/databind/ObjectMapper","method":"readValue"},{"class":"com/fasterxml/jackson/databind/ObjectMapper","method":"readValues"},{"class":"com/fasterxml/jackson/databind/ObjectReader","method":null},{"class":"com/fasterxml/jackson/databind/ObjectReader","method":"readValue"},{"class":"com/fasterxml/jackson/databind/ObjectReader","method":"readValues"}]},{"vuln_id":"GHSA-4wrc-f8pq-fpqp","artifact":"org.springframework:spring-web","version_ranges":["< 6.0.0"],"symbols":[{"class":"org/springframework/remoting/rmi/CodebaseAwareObjectInputStream","method":null},{"class":"org/springframework/remoting/rmi/JndiRmiClientInterceptor","method":null},{"class":"org/springframework/remoting/rmi/JndiRmiProxyFactoryBean","method":null},{"class":"org/springframework/remoting/rmi/JndiRmiServiceExporter","method":null},{"class":"org/springframework/remoting/rmi/RemoteInvocationSerializingExporter","method":null},{"class":"org/springframework/remoting/rmi/RmiBasedExporter","method":null},{"class":"org/springframework/remoting/rmi/RmiClientInterceptor","method":null},{"class":"org/springframework/remoting/rmi/RmiClientInterceptorUtils","method":null},{"class":"org/springframework/remoting/rmi/RmiInvocationHandler","method":null},{"class":"org/springframework/remoting/rmi/RmiInvocationWrapper","method":null},{"class":"org/springframework/remoting/rmi/RmiProxyFactoryBean","method":null},{"class":"org/springframework/remoting/rmi/RmiRegistryFactoryBean","method":null},{"class":"org/springframework/remoting/rmi/RmiServiceExporter","method":null},{"class":"org/springframework/jms/remoting/JmsInvokerClientInterceptor","method":null},{"class":"org/springframework/jms/remoting/JmsInvokerProxyFactoryBean","method":null},{"class":"org/springframework/jms/remoting/JmsInvokerServiceExporter","method":null},{"class":"org/springframework/remoting/caucho/HessianClientInterceptor","method":null},{"class":"org/springframework/remoting/caucho/HessianExporter","method":null},{"class":"org/springframework/remoting/caucho/HessianProxyFactoryBean","method":null},{"class":"org/springframework/remoting/caucho/HessianServiceExporter","method":null},{"class":"org/springframework/remoting/httpinvoker/AbstractHttpInvokerRequestExecutor","method":null},{"class":"org/springframework/remoting/httpinvoker/HttpComponentsHttpInvokerRequestExecutor","method":null},{"class":"org/springframework/remoting/httpinvoker/HttpInvokerClientConfiguration","method":null},{"class":"org/springframework/remoting/httpinvoker/HttpInvokerClientInterceptor","method":null},{"class":"org/springframework/remoting/httpinvoker/HttpInvokerProxyFactoryBean","method":null},{"class":"org/springframework/remoting/httpinvoker/HttpInvokerRequestExecutor","method":null},{"class":"org/springframework/remoting/httpinvoker/HttpInvokerServiceExporter","method":null},{"class":"org/springframework/remoting/httpinvoker/SimpleHttpInvokerRequestExecutor","method":null},{"class":"org/springframework/remoting/httpinvoker/SimpleHttpInvokerServiceExporter","method":null}]},{"vuln_id":"GHSA-645p-88qh-w398","artifact":"com.fasterxml.jackson.core:jackson-databind","version_ranges":["< 2.6.7.3",">= 2.7.0, < 2.7.9.5",">= 2.8.0, < 2.8.11.3",">= 2.9.0, < 2.9.7"],"symbols":[{"class":"com/fasterxml/jackson/databind/ObjectMapper","method":null},{"class":"com/fasterxml/jackson/databind/ObjectMapper","method":"readValue"},{"class":"com/fasterxml/jackson/databind/ObjectMapper","method":"readValues"},{"class":"com/fasterxml/jackson/databind/ObjectReader","method":null},{"class":"com/fasterxml/jackson/databind/ObjectReader","method":"readValue"},{"class":"com/fasterxml/jackson/databind/ObjectReader","method":"readValues"}]},{"vuln_id":"GHSA-64xx-cq4q-mf44","artifact":"com.thoughtworks.xstream:xstream","version_ranges":["< 1.4.18"],"symbols":[{"class":"com/thoughtworks/xstream/XStream","method":"fromXML"}]},{"vuln_id":"GHSA-6w62-hx7r-mw68","artifact":"com.thoughtworks.xstream:xstream","version_ranges":["< 1.4.18"],"symbols":[{"class":"com/thoughtworks/xstream/XStream","method":"fromXML"}]},{"vuln_id":"GHSA-7rjr-3q55-vv33","artifact":"org.apache.logging.log4j:log4j-core","version_ranges":[">= 2.13.0, < 2.16.0","< 2.12.2"],"symbols":[{"class":"org/apache/logging/log4j/Logger","method":null},{"class":"org/apache/logging/log4j/Logger","method":"info"},{"class":"org/apache/logging/log4j/Logger","method":"error"},{"class":"org/apache/logging/log4j/Logger","method":"warn"},{"class":"org/apache/logging/log4j/Logger","method":"debug"},{"class":"org/apache/logging/log4j/Logger","method":"trace"},{"class":"org/apache/logging/log4j/Logger","method":"fatal"},{"class":"org/apache/logging/log4j/Logger","method":"log"},{"class":"org/apache/logging/log4j/LogManager","method":null}]},{"vuln_id":"GHSA-8jrj-525p-826v","artifact":"com.thoughtworks.xstream:xstream","version_ranges":["< 1.4.18"],"symbols":[{"class":"com/thoughtworks/xstream/XStream","method":"fromXML"}]},{"vuln_id":"GHSA-9mxf-g3x6-wv74","artifact":"com.fasterxml.jackson.core:jackson-databind","version_ranges":["< 2.9.7",">= 2.8.0, < 2.8.11.3",">= 2.7.0, < 2.7.9.5"],"symbols":[{"class":"com/fasterxml/jackson/databind/ObjectMapper","method":null},{"class":"com/fasterxml/jackson/databind/ObjectMapper","method":"readValue"},{"class":"com/fasterxml/jackson/databind/ObjectMapper","method":"readValues"},{"class":"com/fasterxml/jackson/databind/ObjectReader","method":null},{"class":"com/fasterxml/jackson/databind/ObjectReader","method":"readValue"},{"class":"com/fasterxml/jackson/databind/ObjectReader","method":"readValues"},{"class":"com/fasterxml/jackson/databind/annotation/JsonTypeInfo","method":null}]},{"vuln_id":"GHSA-c27h-mcmw-48hv","artifact":"org.codehaus.jackson:jackson-mapper-asl","version_ranges":["<= 1.9.13"],"symbols":[{"class":"org/codehaus/jackson/map/ObjectMapper","method":null},{"class":"org/codehaus/jackson/map/ObjectMapper","method":"readValue"},{"class":"org/codehaus/jackson/map/ObjectMapper","method":"readValues"}]},{"vuln_id":"GHSA-c9hw-wf7x-jp9j","artifact":"org.apache.tomcat.embed:tomcat-embed-core","version_ranges":[">= 9.0.0.M1, < 9.0.31",">= 8.5.0, < 8.5.51",">= 7.0.0, < 7.0.100"],"symbols":[{"class":"org/apache/coyote/ajp/AbstractAjpProtocol","method":null},{"class":"org/apache/coyote/ajp/AjpProcessor","method":null},{"class":"org/apache/coyote/ajp/AjpNioProtocol","method":null},{"class":"org/apache/coyote/ajp/AjpAprProtocol","method":null},{"class":"org/apache/coyote/ajp/AjpNio2Protocol","method":null},{"class":"org/apache/catalina/connector/Connector","method":null}]},{"vuln_id":"GHSA-cm59-pr5q-cw85","artifact":"org.springframework.boot:spring-boot","version_ranges":["<= 2.2.10.RELEASE"],"symbols":[{"class":"org/springframework/boot/SpringApplication","method":null}]},{"vuln_id":"GHSA-crg9-44h2-xw35","artifact":"org.apache.activemq:activemq-client","version_ranges":["< 5.15.16",">= 5.16.0, < 5.16.7",">= 5.17.0, < 5.17.6",">= 5.18.0, < 5.18.3"],"symbols":[{"class":"org/apache/activemq/ActiveMQConnectionFactory","method":null},{"class":"org/apache/activemq/ActiveMQSslConnectionFactory","method":null},{"class":"org/apache/activemq/ActiveMQXAConnectionFactory","method":null},{"class":"org/apache/activemq/ActiveMQXASslConnectionFactory","method":null},{"class":"org/apache/activemq/pool/PooledConnectionFactory","method":null},{"class":"org/apache/activemq/pool/XaPooledConnectionFactory","method":null},{"class":"org/apache/activemq/jms/pool/PooledConnectionFactory","method":null},{"class":"org/apache/activemq/jms/pool/XaPooledConnectionFactory","method":null},{"class":"org/apache/activemq/broker/BrokerService","method":null},{"class":"org/apache/activemq/broker/BrokerFactory","method":null},{"class":"org/apache/activemq/xbean/BrokerFactoryBean","method":null},{"class":"org/apache/activemq/xbean/XBeanBrokerService","method":null},{"class":"org/apache/activemq/spring/ActiveMQConnectionFactory","method":null},{"class":"org/apache/activemq/spring/ActiveMQXAConnectionFactory","method":null},{"class":"org/apache/activemq/pool/PooledConnectionFactoryBean","method":null},{"class":"org/apache/activemq/jndi/ActiveMQInitialContextFactory","method":null},{"class":"org/apache/activemq/jndi/ActiveMQSslInitialContextFactory","method":null},{"class":"org/apache/activemq/transport/tcp/TcpTransportFactory","method":null},{"class":"org/apache/activemq/transport/tcp/SslTransportFactory","method":null},{"class":"org/apache/activemq/transport/nio/NIOTransportFactory","method":null},{"class":"org/apache/activemq/transport/nio/NIOSSLTransportFactory","method":null}]},{"vuln_id":"GHSA-crg9-44h2-xw35","artifact":"org.apache.activemq:activemq-openwire-legacy","version_ranges":["< 5.15.16",">= 5.16.0, < 5.16.7",">= 5.17.0, < 5.17.6",">= 5.18.0, < 5.18.3"],"symbols":[{"class":"org/apache/activemq/ActiveMQConnectionFactory","method":null},{"class":"org/apache/activemq/ActiveMQSslConnectionFactory","method":null},{"class":"org/apache/activemq/ActiveMQXAConnectionFactory","method":null},{"class":"org/apache/activemq/ActiveMQXASslConnectionFactory","method":null},{"class":"org/apache/activemq/pool/PooledConnectionFactory","method":null},{"class":"org/apache/activemq/pool/XaPooledConnectionFactory","method":null},{"class":"org/apache/activemq/jms/pool/PooledConnectionFactory","method":null},{"class":"org/apache/activemq/jms/pool/XaPooledConnectionFactory","method":null},{"class":"org/apache/activemq/broker/BrokerService","method":null},{"class":"org/apache/activemq/broker/BrokerFactory","method":null},{"class":"org/apache/activemq/xbean/BrokerFactoryBean","method":null},{"class":"org/apache/activemq/xbean/XBeanBrokerService","method":null},{"class":"org/apache/activemq/spring/ActiveMQConnectionFactory","method":null},{"class":"org/apache/activemq/spring/ActiveMQXAConnectionFactory","method":null},{"class":"org/apache/activemq/pool/PooledConnectionFactoryBean","method":null},{"class":"org/apache/activemq/jndi/ActiveMQInitialContextFactory","method":null},{"class":"org/apache/activemq/jndi/ActiveMQSslInitialContextFactory","method":null},{"class":"org/apache/activemq/transport/tcp/TcpTransportFactory","method":null},{"class":"org/apache/activemq/transport/tcp/SslTransportFactory","method":null},{"class":"org/apache/activemq/transport/nio/NIOTransportFactory","method":null},{"class":"org/apache/activemq/transport/nio/NIOSSLTransportFactory","method":null}]},{"vuln_id":"GHSA-cxfm-5m4g-x7xp","artifact":"com.thoughtworks.xstream:xstream","version_ranges":["< 1.4.18"],"symbols":[{"class":"com/thoughtworks/xstream/XStream","method":"fromXML"}]},{"vuln_id":"GHSA-f3j5-rmmp-3fc5","artifact":"com.fasterxml.jackson.core:jackson-databind","version_ranges":["< 2.8.11.5",">= 2.9.0, < 2.9.10"],"symbols":[{"class":"com/fasterxml/jackson/databind/ObjectMapper","method":null},{"class":"com/fasterxml/jackson/databind/ObjectMapper","method":"readValue"},{"class":"com/fasterxml/jackson/databind/ObjectMapper","method":"readValues"},{"class":"com/fasterxml/jackson/databind/ObjectReader","method":null},{"class":"com/fasterxml/jackson/databind/ObjectReader","method":"readValue"},{"class":"com/fasterxml/jackson/databind/ObjectReader","method":"readValues"}]},{"vuln_id":"GHSA-g5h3-w546-pj7f","artifact":"org.springframework.boot:spring-boot-actuator-autoconfigure","version_ranges":[">= 3.0.0, < 3.0.6",">= 2.7.0, < 2.7.11",">= 2.6.0, < 2.6.15",">= 2.5.0, < 2.5.15"],"symbols":[{"class":"org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryActuatorAutoConfiguration","method":null},{"class":"org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundryActuatorAutoConfiguration","method":null},{"class":"org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryWebEndpointServletHandlerMapping","method":null},{"class":"org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/CloudFoundryWebFluxEndpointHandlerMapping","method":null}]},{"vuln_id":"GHSA-g5w6-mrj7-75h2","artifact":"com.thoughtworks.xstream:xstream","version_ranges":["< 1.4.18"],"symbols":[{"class":"com/thoughtworks/xstream/XStream","method":"fromXML"}]},{"vuln_id":"GHSA-h7v4-7xg3-hxcc","artifact":"com.thoughtworks.xstream:xstream","version_ranges":["< 1.4.18"],"symbols":[{"class":"com/thoughtworks/xstream/XStream","method":"fromXML"}]},{"vuln_id":"GHSA-hph2-m3g5-xxv4","artifact":"com.thoughtworks.xstream:xstream","version_ranges":["< 1.4.18"],"symbols":[{"class":"com/thoughtworks/xstream/XStream","method":"fromXML"}]},{"vuln_id":"GHSA-j9h8-phrw-h4fh","artifact":"com.thoughtworks.xstream:xstream","version_ranges":["< 1.4.18"],"symbols":[{"class":"com/thoughtworks/xstream/XStream","method":"fromXML"}]},{"vuln_id":"GHSA-jfh8-c2jp-5v3q","artifact":"org.apache.logging.log4j:log4j-core","version_ranges":[">= 2.13.0, < 2.15.0",">= 2.4, < 2.12.2",">= 2.0-beta9, < 2.3.1"],"symbols":[{"class":"org/apache/logging/log4j/Logger","method":null},{"class":"org/apache/logging/log4j/Logger","method":"info"},{"class":"org/apache/logging/log4j/Logger","method":"error"},{"class":"org/apache/logging/log4j/Logger","method":"warn"},{"class":"org/apache/logging/log4j/Logger","method":"debug"},{"class":"org/apache/logging/log4j/Logger","method":"trace"},{"class":"org/apache/logging/log4j/Logger","method":"fatal"},{"class":"org/apache/logging/log4j/Logger","method":"log"},{"class":"org/apache/logging/log4j/LogManager","method":null}]},{"vuln_id":"GHSA-jfh8-c2jp-5v3q","artifact":"com.guicedee.services:log4j-core","version_ranges":["<= 1.2.1.2-jre17"],"symbols":[{"class":"org/apache/logging/log4j/Logger","method":null},{"class":"org/apache/logging/log4j/Logger","method":"info"},{"class":"org/apache/logging/log4j/Logger","method":"error"},{"class":"org/apache/logging/log4j/Logger","method":"warn"},{"class":"org/apache/logging/log4j/Logger","method":"debug"},{"class":"org/apache/logging/log4j/Logger","method":"trace"},{"class":"org/apache/logging/log4j/Logger","method":"fatal"},{"class":"org/apache/logging/log4j/Logger","method":"log"},{"class":"org/apache/logging/log4j/LogManager","method":null}]},{"vuln_id":"GHSA-jfh8-c2jp-5v3q","artifact":"org.xbib.elasticsearch:log4j","version_ranges":["= 6.3.2.1"],"symbols":[{"class":"org/apache/logging/log4j/Logger","method":null},{"class":"org/apache/logging/log4j/Logger","method":"info"},{"class":"org/apache/logging/log4j/Logger","method":"error"},{"class":"org/apache/logging/log4j/Logger","method":"warn"},{"class":"org/apache/logging/log4j/Logger","method":"debug"},{"class":"org/apache/logging/log4j/Logger","method":"trace"},{"class":"org/apache/logging/log4j/Logger","method":"fatal"},{"class":"org/apache/logging/log4j/Logger","method":"log"},{"class":"org/apache/logging/log4j/LogManager","method":null}]},{"vuln_id":"GHSA-jfh8-c2jp-5v3q","artifact":"uk.co.nichesolutions.logging.log4j:log4j-core","version_ranges":["= 2.6.3-CUSTOM"],"symbols":[{"class":"org/apache/logging/log4j/Logger","method":null},{"class":"org/apache/logging/log4j/Logger","method":"info"},{"class":"org/apache/logging/log4j/Logger","method":"error"},{"class":"org/apache/logging/log4j/Logger","method":"warn"},{"class":"org/apache/logging/log4j/Logger","method":"debug"},{"class":"org/apache/logging/log4j/Logger","method":"trace"},{"class":"org/apache/logging/log4j/Logger","method":"fatal"},{"class":"org/apache/logging/log4j/Logger","method":"log"},{"class":"org/apache/logging/log4j/LogManager","method":null}]},{"vuln_id":"GHSA-mjmj-j48q-9wg2","artifact":"org.yaml:snakeyaml","version_ranges":["<= 1.33"],"symbols":[{"class":"org/yaml/snakeyaml/Yaml","method":"load"},{"class":"org/yaml/snakeyaml/Yaml","method":"loadAll"}]},{"vuln_id":"GHSA-mw36-7c6c-q4q2","artifact":"com.thoughtworks.xstream:xstream","version_ranges":["<= 1.4.13"],"symbols":[{"class":"com/thoughtworks/xstream/XStream","method":"fromXML"}]},{"vuln_id":"GHSA-p8pq-r894-fm8f","artifact":"com.thoughtworks.xstream:xstream","version_ranges":["< 1.4.18"],"symbols":[{"class":"com/thoughtworks/xstream/XStream","method":"fromXML"}]},{"vuln_id":"GHSA-qmqc-x3r4-6v39","artifact":"com.fasterxml.jackson.core:jackson-databind","version_ranges":["< 2.9.10"],"symbols":[{"class":"com/fasterxml/jackson/databind/ObjectMapper","method":null},{"class":"com/fasterxml/jackson/databind/ObjectMapper","method":"readValue"},{"class":"com/fasterxml/jackson/databind/ObjectMapper","method":"readValues"}]},{"vuln_id":"GHSA-qr7j-h6gg-jmgc","artifact":"com.fasterxml.jackson.core:jackson-databind","version_ranges":[">= 2.0.0, <= 2.7.9.3",">= 2.8.0, <= 2.8.11.1",">= 2.9.0, <= 2.9.5"],"symbols":[{"class":"com/fasterxml/jackson/databind/ObjectMapper","method":null},{"class":"com/fasterxml/jackson/databind/ObjectMapper","method":"readValue"},{"class":"com/fasterxml/jackson/databind/ObjectMapper","method":"readValues"},{"class":"com/fasterxml/jackson/databind/ObjectReader","method":null},{"class":"com/fasterxml/jackson/databind/ObjectReader","method":"readValue"},{"class":"com/fasterxml/jackson/databind/ObjectReader","method":"readValues"}]},{"vuln_id":"GHSA-qrx8-8545-4wg2","artifact":"com.thoughtworks.xstream:xstream","version_ranges":["< 1.4.18"],"symbols":[{"class":"com/thoughtworks/xstream/XStream","method":"fromXML"}]},{"vuln_id":"GHSA-r4x2-3cq5-hqvp","artifact":"org.apache.tomcat.embed:tomcat-embed-core","version_ranges":[">= 9.0.0.M1, < 9.0.9",">= 8.5.0, < 8.5.32",">= 8.0.0-RC1, < 8.0.53",">= 7.0.41, < 7.0.88"],"symbols":[{"class":"org/apache/catalina/filters/CorsFilter","method":null}]},{"vuln_id":"GHSA-rmr5-cpv2-vgjf","artifact":"com.thoughtworks.xstream:xstream","version_ranges":["< 1.4.19"],"symbols":[{"class":"com/thoughtworks/xstream/XStream","method":"fromXML"}]},{"vuln_id":"GHSA-vmfg-rjjm-rjrj","artifact":"ch.qos.logback:logback-classic","version_ranges":["< 1.2.0"],"symbols":[{"class":"ch/qos/logback/classic/net/SimpleSocketServer","method":null},{"class":"ch/qos/logback/classic/net/SocketReceiver","method":null},{"class":"ch/qos/logback/classic/net/server/ServerSocketReceiver","method":null},{"class":"ch/qos/logback/classic/net/server/SSLServerSocketReceiver","method":null},{"class":"ch/qos/logback/classic/net/SimpleSSLSocketServer","method":null},{"class":"ch/qos/logback/access/net/SimpleSocketServer","method":null}]},{"vuln_id":"GHSA-vmfg-rjjm-rjrj","artifact":"ch.qos.logback:logback-access","version_ranges":["< 1.2.0"],"symbols":[{"class":"ch/qos/logback/classic/net/SimpleSocketServer","method":null},{"class":"ch/qos/logback/classic/net/SocketReceiver","method":null},{"class":"ch/qos/logback/classic/net/server/ServerSocketReceiver","method":null},{"class":"ch/qos/logback/classic/net/server/SSLServerSocketReceiver","method":null},{"class":"ch/qos/logback/classic/net/SimpleSSLSocketServer","method":null},{"class":"ch/qos/logback/access/net/SimpleSocketServer","method":null}]},{"vuln_id":"GHSA-ww97-9w65-2crx","artifact":"org.apache.solr:solr-core","version_ranges":[">= 5.0.0, <= 5.5.5",">= 6.0.0, <= 6.6.6",">= 7.0.0, <= 7.7.2",">= 8.0.0, <= 8.3.1"],"symbols":[{"class":"org/apache/velocity/app/Velocity","method":null},{"class":"org/apache/velocity/VelocityContext","method":null},{"class":"org/apache/velocity/Template","method":null}]},{"vuln_id":"GHSA-xw4p-crpj-vjx2","artifact":"com.thoughtworks.xstream:xstream","version_ranges":["< 1.4.18"],"symbols":[{"class":"com/thoughtworks/xstream/XStream","method":"fromXML"}]}]} \ No newline at end of file +{"version":1,"entries":[{"vuln_id":"GHSA-2jrg-rf5x-568g","artifact":"org.springframework.security:spring-security-web","version_ranges":[">=7.0.0,<7.0.5"],"symbols":[{"class":"org/springframework/security/web/authentication/preauth/x509/SubjectX500PrincipalExtractor","method":"extractPrincipal"}]},{"vuln_id":"GHSA-563x-q5rq-57qp","artifact":"org.apache.tomcat.embed:tomcat-embed-core","version_ranges":[">=7.0.0,<9.0.116",">=10.1.0-M1,<10.1.52",">=11.0.0-M1,<11.0.20"],"symbols":[{"class":"org/apache/coyote/http11/filters/ChunkedInputFilter","method":"parseChunkHeader"},{"class":"org/apache/coyote/http11/filters/ChunkedInputFilter","method":"skipChunkHeader"}]},{"vuln_id":"GHSA-563x-q5rq-57qp","artifact":"org.apache.tomcat:tomcat-coyote","version_ranges":[">=7.0.0,<9.0.116",">=10.1.0-M1,<10.1.52",">=11.0.0-M1,<11.0.20"],"symbols":[{"class":"org/apache/coyote/http11/filters/ChunkedInputFilter","method":"parseChunkHeader"},{"class":"org/apache/coyote/http11/filters/ChunkedInputFilter","method":"skipChunkHeader"}]},{"vuln_id":"GHSA-69r9-qgr7-g2wj","artifact":"org.apache.tomcat:tomcat","version_ranges":[">=11.0.20,<11.0.21",">=10.1.53,<10.1.54",">=9.0.116,<9.0.117"],"symbols":[{"class":"org/apache/catalina/tribes/group/interceptors/EncryptInterceptor","method":"messageReceived"}]},{"vuln_id":"GHSA-69r9-qgr7-g2wj","artifact":"org.apache.tomcat:tomcat-tribes","version_ranges":[">=11.0.20,<11.0.21",">=10.1.53,<10.1.54",">=9.0.116,<9.0.117"],"symbols":[{"class":"org/apache/catalina/tribes/group/interceptors/EncryptInterceptor","method":"messageReceived"}]},{"vuln_id":"GHSA-8mc5-53m5-3qj2","artifact":"org.apache.tomcat.embed:tomcat-embed-core","version_ranges":[">=9.0.113,<9.0.116",">=10.1.50,<10.1.53",">=11.0.15,<11.0.20"],"symbols":[{"class":"org/apache/tomcat/util/net/AbstractEndpoint","method":"checkSni"}]},{"vuln_id":"GHSA-8mc5-53m5-3qj2","artifact":"org.apache.tomcat:tomcat","version_ranges":[">=9.0.113,<9.0.116",">=10.1.50,<10.1.53",">=11.0.15,<11.0.20"],"symbols":[{"class":"org/apache/tomcat/util/net/AbstractEndpoint","method":"checkSni"}]},{"vuln_id":"GHSA-8mc5-53m5-3qj2","artifact":"org.apache.tomcat:tomcat-coyote","version_ranges":[">=9.0.113,<9.0.116",">=10.1.50,<10.1.53",">=11.0.15,<11.0.20"],"symbols":[{"class":"org/apache/tomcat/util/net/AbstractEndpoint","method":"checkSni"}]},{"vuln_id":"GHSA-cpm7-cfpx-3hvp","artifact":"gov.nsa.emissary:emissary","version_ranges":[">=0,<8.39.0"],"symbols":[{"class":"emissary/server/mvc/EmissaryNav","method":"convert"}]},{"vuln_id":"GHSA-cwq5-8pvq-j65j","artifact":"io.github.ndsev:zserio-runtime","version_ranges":[">=0,<2.18.1"],"symbols":[{"class":"zserio/runtime/array/Array","method":"read"},{"class":"zserio/runtime/io/ByteArrayBitStreamReader","method":"readBitBuffer"},{"class":"zserio/runtime/io/ByteArrayBitStreamReader","method":"readBytes"},{"class":"zserio/runtime/io/ByteArrayBitStreamReader","method":"readString"}]},{"vuln_id":"GHSA-f2hx-5fx3-hmcv","artifact":"org.keycloak:keycloak-services","version_ranges":[">=0,<26.5.7"],"symbols":[{"class":"org/keycloak/authorization/protection/policy/UserManagedPermissionService","method":"checkRequest"}]},{"vuln_id":"GHSA-h468-7pvh-8vr8","artifact":"org.apache.tomcat:tomcat","version_ranges":[">=9.0.13,<9.0.116",">=10.1.50,<10.1.53",">=11.0.0-M1,<11.0.20"],"symbols":[{"class":"org/apache/catalina/tribes/group/interceptors/EncryptInterceptor","method":"createEncryptionManager"},{"class":"org/apache/catalina/tribes/group/interceptors/EncryptInterceptor","method":"messageReceived"}]},{"vuln_id":"GHSA-h468-7pvh-8vr8","artifact":"org.apache.tomcat:tomcat-tribes","version_ranges":[">=9.0.13,<9.0.116",">=10.1.50,<10.1.53",">=11.0.0-M1,<11.0.20"],"symbols":[{"class":"org/apache/catalina/tribes/group/interceptors/EncryptInterceptor","method":"createEncryptionManager"},{"class":"org/apache/catalina/tribes/group/interceptors/EncryptInterceptor","method":"messageReceived"}]},{"vuln_id":"GHSA-hf5p-q87m-crj7","artifact":"com.github.junrar:junrar","version_ranges":[">=0,<7.5.10"],"symbols":[{"class":"com/github/junrar/LocalFolderExtractor","method":"createDirectory"},{"class":"com/github/junrar/LocalFolderExtractor","method":"createFile"}]},{"vuln_id":"GHSA-x2wq-9x2f-fhj7","artifact":"org.springframework.security:spring-security-core","version_ranges":[">=6.5.0,<6.5.10",">=7.0.3,<7.0.5"],"symbols":[{"class":"org/springframework/security/authentication/ott/JdbcOneTimeTokenService","method":"consume"},{"class":"org/springframework/security/authentication/ott/JdbcOneTimeTokenService","method":"deleteOneTimeToken"}]}]} \ No newline at end of file diff --git a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaCveDatabaseTest.java b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaCveDatabaseTest.java index 937111241a9..0c02a3941e5 100644 --- a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaCveDatabaseTest.java +++ b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaCveDatabaseTest.java @@ -18,8 +18,8 @@ class ScaCveDatabaseTest { + "\"artifact\":\"com.example:lib\"," + "\"version_ranges\":[\"< 2.0.0\"]," + "\"symbols\":[" - + "{\"class\":\"com/example/Foo\",\"method\":null}," - + "{\"class\":\"com/example/Bar\",\"method\":null}" + + "{\"class\":\"com/example/Foo\",\"method\":\"dangerousOp\"}," + + "{\"class\":\"com/example/Bar\",\"method\":\"dangerousOp\"}" + "]}]}"; @Test @@ -61,9 +61,9 @@ void malformedEntryIsSkipped() throws Exception { String json = "{\"version\":1,\"entries\":[" + "{\"vuln_id\":null,\"artifact\":\"com.example:lib\"," - + "\"version_ranges\":[\"< 2.0.0\"],\"symbols\":[{\"class\":\"com/example/Foo\",\"method\":null}]}," + + "\"version_ranges\":[\"< 2.0.0\"],\"symbols\":[{\"class\":\"com/example/Foo\",\"method\":\"op\"}]}," + "{\"vuln_id\":\"GHSA-good-0000-0000\",\"artifact\":\"com.example:other\"," - + "\"version_ranges\":[\"< 1.0.0\"],\"symbols\":[{\"class\":\"com/example/Good\",\"method\":null}]}" + + "\"version_ranges\":[\"< 1.0.0\"],\"symbols\":[{\"class\":\"com/example/Good\",\"method\":\"op\"}]}" + "]}"; ScaCveDatabase db = ScaCveDatabase.parse(new StringReader(json)); @@ -72,14 +72,50 @@ void malformedEntryIsSkipped() throws Exception { assertNotNull(db.entriesForClass("com/example/Good")); } + @Test + void symbolWithNullMethodIsSkipped() throws Exception { + // A symbol with method=null is treated as malformed and skipped. + // If all symbols in an entry are null-method, the whole entry is dropped. + String json = + "{\"version\":1,\"entries\":[" + + "{\"vuln_id\":\"GHSA-null-method\",\"artifact\":\"com.example:lib\"," + + "\"version_ranges\":[\"< 1.0.0\"]," + + "\"symbols\":[{\"class\":\"com/example/Foo\",\"method\":null}]}" + + "]}"; + ScaCveDatabase db = ScaCveDatabase.parse(new StringReader(json)); + + assertTrue(db.isEmpty(), "Entry with all null-method symbols must be dropped"); + } + + @Test + void symbolWithNullMethodSkippedButValidSymbolsKept() throws Exception { + // When an entry has a mix of null-method and valid symbols, only the valid ones are kept. + String json = + "{\"version\":1,\"entries\":[" + + "{\"vuln_id\":\"GHSA-mixed-method\",\"artifact\":\"com.example:lib\"," + + "\"version_ranges\":[\"< 1.0.0\"]," + + "\"symbols\":[" + + "{\"class\":\"com/example/Foo\",\"method\":null}," + + "{\"class\":\"com/example/Foo\",\"method\":\"readValue\"}" + + "]}" + + "]}"; + ScaCveDatabase db = ScaCveDatabase.parse(new StringReader(json)); + + List entries = db.entriesForClass("com/example/Foo"); + assertNotNull(entries); + List symbols = entries.get(0).symbols(); + assertEquals(1, symbols.size(), "null-method symbol must be dropped; valid symbol kept"); + assertEquals("readValue", symbols.get(0).method()); + } + @Test void multipleEntriesForSameClass() throws Exception { String json = "{\"version\":1,\"entries\":[" + "{\"vuln_id\":\"GHSA-aaaa-0001-0001\",\"artifact\":\"com.example:lib\"," - + "\"version_ranges\":[\"< 2.0.0\"],\"symbols\":[{\"class\":\"com/example/Shared\",\"method\":null}]}," + + "\"version_ranges\":[\"< 2.0.0\"],\"symbols\":[{\"class\":\"com/example/Shared\",\"method\":\"op\"}]}," + "{\"vuln_id\":\"GHSA-bbbb-0002-0002\",\"artifact\":\"com.example:lib\"," - + "\"version_ranges\":[\"< 3.0.0\"],\"symbols\":[{\"class\":\"com/example/Shared\",\"method\":null}]}" + + "\"version_ranges\":[\"< 3.0.0\"],\"symbols\":[{\"class\":\"com/example/Shared\",\"method\":\"op\"}]}" + "]}"; ScaCveDatabase db = ScaCveDatabase.parse(new StringReader(json)); @@ -110,74 +146,6 @@ void entryWithMultipleSymbolsInSameClassIndexedOnce() throws Exception { assertEquals(2, entries.get(0).symbols().size(), "entry must retain all method symbols"); } - @Test - void classLevelSymbolDroppedWhenMethodLevelSymbolExistsForSameClass() throws Exception { - // When an entry has both a class-level symbol (method=null) and method-level symbols for the - // same class, the class-level entry is redundant and must be dropped at parse time. - // Keeping both would cause the first-hit-wins hitRef in the registry to record the class-level - // callsite, silently discarding the more specific method callsite. - String json = - "{\"version\":1,\"entries\":[" - + "{\"vuln_id\":\"GHSA-mixed-0000-0001\",\"artifact\":\"com.example:lib\"," - + "\"version_ranges\":[\"< 2.0.0\"],\"symbols\":[" - + "{\"class\":\"com/example/Foo\",\"method\":null}," - + "{\"class\":\"com/example/Foo\",\"method\":\"readValue\"}," - + "{\"class\":\"com/example/Foo\",\"method\":\"readValues\"}" - + "]}]}"; - - ScaCveDatabase db = ScaCveDatabase.parse(new StringReader(json)); - - List entries = db.entriesForClass("com/example/Foo"); - assertNotNull(entries); - assertEquals(1, entries.size()); - List symbols = entries.get(0).symbols(); - assertEquals( - 2, symbols.size(), "class-level symbol must be dropped when method-level symbols exist"); - assertTrue( - symbols.stream().allMatch(s -> !s.isClassLevel()), - "no class-level symbols should remain when method-level symbols are present"); - } - - @Test - void classLevelSymbolKeptWhenNoMethodLevelSymbolForSameClass() throws Exception { - // When different classes in the same entry have class-level and method-level symbols - // respectively, only the class-level symbol for the class that also has method-level symbols - // should be dropped. Unrelated classes are unaffected. - String json = - "{\"version\":1,\"entries\":[" - + "{\"vuln_id\":\"GHSA-mixed-0000-0002\",\"artifact\":\"com.example:lib\"," - + "\"version_ranges\":[\"< 2.0.0\"],\"symbols\":[" - + "{\"class\":\"com/example/ClassA\",\"method\":null}," - + "{\"class\":\"com/example/ClassB\",\"method\":null}," - + "{\"class\":\"com/example/ClassB\",\"method\":\"dangerousOp\"}" - + "]}]}"; - - ScaCveDatabase db = ScaCveDatabase.parse(new StringReader(json)); - - // ClassA has only a class-level symbol — must remain unchanged - List entriesA = db.entriesForClass("com/example/ClassA"); - assertNotNull(entriesA, "ClassA (class-level only) must still be indexed"); - long classLevelA = - entriesA.get(0).symbols().stream() - .filter(s -> s.className().equals("com/example/ClassA") && s.isClassLevel()) - .count(); - assertEquals(1, classLevelA, "ClassA class-level symbol must not be dropped"); - - // ClassB has both class-level and method-level: class-level must be dropped - List entriesB = db.entriesForClass("com/example/ClassB"); - assertNotNull(entriesB, "ClassB must still be indexed under its method-level symbol"); - long classLevelB = - entriesB.get(0).symbols().stream() - .filter(s -> s.className().equals("com/example/ClassB") && s.isClassLevel()) - .count(); - assertEquals(0, classLevelB, "class-level symbol for ClassB must be dropped"); - long methodLevelB = - entriesB.get(0).symbols().stream() - .filter(s -> s.className().equals("com/example/ClassB") && !s.isClassLevel()) - .count(); - assertEquals(1, methodLevelB, "method-level symbol for ClassB must be retained"); - } - @Test void loadFromClasspathSucceeds() { // Verifies the real sca_cves.json generated by generateScaCvesJson is valid and loadable @@ -188,12 +156,15 @@ void loadFromClasspathSucceeds() { } @Test - void jacksonDatabindObjectMapperIsIndexed() { - // Spot-check a known entry from the real database + void junrarLocalFolderExtractorIsIndexed() { + // Spot-check a known entry from the real database (com.github.junrar:junrar, GHSA-hf5p) ScaCveDatabase db = ScaCveDatabase.load(); - List entries = db.entriesForClass("com/fasterxml/jackson/databind/ObjectMapper"); - assertNotNull(entries, "jackson-databind ObjectMapper should be in the database"); + List entries = db.entriesForClass("com/github/junrar/LocalFolderExtractor"); + assertNotNull(entries, "junrar LocalFolderExtractor should be in the database"); assertFalse(entries.isEmpty()); + assertTrue( + entries.get(0).symbols().stream().allMatch(s -> s.method() != null), + "all symbols must be method-level"); } } diff --git a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaReachabilityMethodLevelTest.java b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaReachabilityMethodLevelTest.java index 22f5aa8d45d..7ee88fa8ffa 100644 --- a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaReachabilityMethodLevelTest.java +++ b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaReachabilityMethodLevelTest.java @@ -223,14 +223,14 @@ void inject_sameMethodNameInDifferentClassesProduceIndependentHits() throws Exce // --------------------------------------------------------------------------- @Test - void transform_firstLoad_enqueuesAndReturnsNull() throws Exception { + void transform_firstLoad_schedulesRetransformAndReturnsNull() throws Exception { String json = "{\"version\":1,\"entries\":[{" + "\"vuln_id\":\"GHSA-cls\",\"artifact\":\"com.example:lib\"," + "\"version_ranges\":[\"< 999.0.0\"]," + "\"symbols\":[{\"class\":\"" + TargetClass.class.getName().replace('.', '/') - + "\",\"method\":null}]" + + "\",\"method\":\"vulnerableMethod\"}]" + "}]}"; ScaCveDatabase classDb = ScaCveDatabase.parse(new StringReader(json)); ScaReachabilityTransformer t = new ScaReachabilityTransformer(classDb, null); @@ -243,17 +243,18 @@ void transform_firstLoad_enqueuesAndReturnsNull() throws Exception { TargetClass.class.getProtectionDomain(), bytecodeOf(TargetClass.class)); - assertNull(result, "First load must return null (processing deferred to periodic task)"); + assertNull(result, "First load must return null (JAR I/O deferred to periodic task)"); assertFalse( - t.pendingClassEvents.isEmpty(), - "First load must enqueue the class for deferred processing"); + t.pendingRetransformNames.isEmpty(), + "First load must add the class name to pendingRetransformNames for the next heartbeat"); } @Test - void transform_retransform_doesNotEnqueueAndProcessesInline() throws Exception { - // On retransform (classBeingRedefined != null), transform() must NOT enqueue to - // pendingClassEvents. It processes inline (via processClass(4-arg)); version resolution may - // fail in a unit-test context without a real JAR, but the structural invariant holds. + void transform_retransform_processesInlineAndDoesNotReSchedule() throws Exception { + // On retransform (classBeingRedefined != null), transform() calls processClass() inline. + // Version resolution fails in the unit-test context (no real JAR for com.example:lib), + // so processClass() re-queues in pendingRetransformNames for a retry, but the key invariant + // is that the retransform path reaches processClass() rather than the first-load fast-path. String json = "{\"version\":1,\"entries\":[{" + "\"vuln_id\":\"GHSA-mth\",\"artifact\":\"com.example:lib\"," @@ -265,6 +266,9 @@ void transform_retransform_doesNotEnqueueAndProcessesInline() throws Exception { ScaCveDatabase methodDb = ScaCveDatabase.parse(new StringReader(json)); ScaReachabilityTransformer t = new ScaReachabilityTransformer(methodDb, null); + // Start clean: no pending retransforms + assertTrue(t.pendingRetransformNames.isEmpty()); + t.transform( null, TargetClass.class.getName().replace('.', '/'), @@ -272,9 +276,12 @@ void transform_retransform_doesNotEnqueueAndProcessesInline() throws Exception { TargetClass.class.getProtectionDomain(), bytecodeOf(TargetClass.class)); - assertTrue( - t.pendingClassEvents.isEmpty(), - "Retransform path must not re-enqueue the class into pendingClassEvents"); + // Version resolution failed (no pom.properties for com.example:lib in test classpath), + // so processClass() re-queued the class for a retry on the next heartbeat. + // This confirms the retransform path reached processClass() rather than the first-load path. + assertFalse( + t.pendingRetransformNames.isEmpty(), + "processClass() must re-queue on version resolution failure for heartbeat retry"); } // --------------------------------------------------------------------------- diff --git a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaReachabilityTransformerJava9Test.java b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaReachabilityTransformerJava9Test.java index ce6f45b8a1a..57da31fc9ab 100644 --- a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaReachabilityTransformerJava9Test.java +++ b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaReachabilityTransformerJava9Test.java @@ -1,11 +1,19 @@ package com.datadog.appsec.sca; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; +import datadog.telemetry.dependency.Dependency; import java.io.StringReader; +import java.lang.instrument.Instrumentation; import java.net.URLClassLoader; +import java.util.Arrays; +import java.util.Collections; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledForJreRange; import org.junit.jupiter.api.condition.JRE; @@ -41,7 +49,7 @@ class ScaReachabilityTransformerJava9Test { + "\"vuln_id\":\"GHSA-test-jackson\"," + "\"artifact\":\"com.fasterxml.jackson.core:jackson-databind\"," + "\"version_ranges\":[\"< 999.0.0\"]," - + "\"symbols\":[{\"class\":\"com/fasterxml/jackson/databind/ObjectMapper\",\"method\":null}]" + + "\"symbols\":[{\"class\":\"com/fasterxml/jackson/databind/ObjectMapper\",\"method\":\"readValue\"}]" + "}]}"; @Test @@ -86,6 +94,184 @@ void findArtifactVersionInClasspath_returnsNullForUnknownArtifact() throws Excep assertNull(version, "Unknown artifacts must return null"); } + // --------------------------------------------------------------------------- + // matchVersion: artifact-ID-only fallback for JARs without pom.properties + // --------------------------------------------------------------------------- + + @Test + void matchVersion_exactMatchReturnsVersion() { + Dependency dep = new Dependency("com.github.junrar:junrar", "7.5.5", "junrar-7.5.5.jar", null); + assertEquals( + "7.5.5", + ScaReachabilityTransformer.matchVersion( + "com.github.junrar:junrar", Collections.singletonList(dep))); + } + + @Test + void matchVersion_artifactIdOnlyFallbackForNoPomJar() { + // Models guessFallbackNoPom result: no pom.properties in junrar-7.5.5.jar, + // so DependencyResolver extracts only the artifact ID from the filename. + Dependency dep = new Dependency("junrar", "7.5.5", "junrar-7.5.5.jar", null); + assertEquals( + "7.5.5", + ScaReachabilityTransformer.matchVersion( + "com.github.junrar:junrar", Collections.singletonList(dep)), + "artifact-ID fallback must match 'junrar' against 'com.github.junrar:junrar'"); + } + + @Test + void matchVersion_artifactIdFallbackDoesNotMatchWhenGroupIdPresent() { + // If dep.name already contains ':' (from pom.properties), artifact-ID fallback must not fire: + // "org.other:junrar" should NOT match "com.github.junrar:junrar". + Dependency dep = new Dependency("org.other:junrar", "1.0.0", "junrar-1.0.0.jar", null); + assertNull( + ScaReachabilityTransformer.matchVersion( + "com.github.junrar:junrar", Collections.singletonList(dep)), + "artifact-ID fallback must not fire when dep.name already has a group ID"); + } + + @Test + void matchVersion_emptyListReturnsNull() { + assertNull( + ScaReachabilityTransformer.matchVersion( + "com.github.junrar:junrar", Collections.emptyList())); + } + + @Test + void matchVersion_exactMatchTakesPrecedenceOverFallback() { + // Exact match must win even when an artifact-ID-only dep is also present. + Dependency exact = new Dependency("com.github.junrar:junrar", "7.5.5", "a.jar", null); + Dependency fallback = new Dependency("junrar", "1.0.0", "b.jar", null); + assertEquals( + "7.5.5", + ScaReachabilityTransformer.matchVersion( + "com.github.junrar:junrar", Arrays.asList(fallback, exact))); + } + + /** + * Regression test for the snakeyaml deadlock (APPSEC-62260 follow-up): + * + *

JAR resolution (I/O via {@code resolveDependencies}) must happen on the telemetry thread + * BEFORE {@code retransformClasses()} acquires JVM locks. If I/O runs inside the retransform + * callback, libraries that trigger class loading during JAR resolution (e.g. snakeyaml) can + * deadlock because the JVM class-loading lock and the retransform lock are both held. + * + *

With a mock {@code Instrumentation}, the retransform callback never fires, so {@code + * resolveDependencies} (and therefore {@code jarCache}) can only be populated by the pre-warming + * step that runs before {@code retransformClasses()}. The test asserts that {@code jarCache} is + * non-empty after the call, which is only possible if the pre-warm loop ran. + */ + @Test + void performPendingRetransforms_prewarms_jarCache_before_retransformClasses() throws Exception { + Instrumentation mockInstr = mock(Instrumentation.class); + when(mockInstr.isModifiableClass(any())).thenReturn(true); + when(mockInstr.getAllLoadedClasses()).thenReturn(new Class[0]); + + ScaCveDatabase db = ScaCveDatabase.parse(new StringReader(JACKSON_JSON)); + ScaReachabilityTransformer transformer = new ScaReachabilityTransformer(db, mockInstr); + + transformer.pendingRetransform.add(com.fasterxml.jackson.databind.ObjectMapper.class); + transformer.performPendingRetransforms(); + + assertFalse( + transformer.jarCache.isEmpty(), + "jarCache must be populated by the pre-warming step that runs before retransformClasses();" + + " with a mock Instrumentation the transform callback never fires, so an empty jarCache" + + " means the pre-warm loop was not executed"); + } + + /** + * Regression test for the aggregator-artifact deadlock gap (Codex P1 on PR #11614): + * + *

When the entry's artifact is not in the class's own JAR (aggregator/starter case, e.g., + * {@code spring-boot-starter-web} whose watched classes live in {@code spring-context.jar}), + * {@code resolveVersionForArtifact()} falls through to {@code findArtifactVersionInClasspath()}, + * which calls {@code resolveDependencies()} for every {@code java.class.path} entry — fresh JAR + * I/O that would deadlock if it ran inside the retransform callback. + * + *

The pre-warm step must also populate {@code classpathArtifactCache} before {@code + * retransformClasses()} acquires JVM locks. With a mock {@code Instrumentation} the callback + * never fires, so the only way {@code classpathArtifactCache} can be populated is via the + * pre-warm loop. {@code ObjectMapper} lives in {@code jackson-databind.jar}; the entry's artifact + * is {@code jackson-core} (a different JAR that is a transitive test dependency), so {@code + * matchVersion} fails on the class JAR and the classpath fallback must run during pre-warm. + */ + @Test + void performPendingRetransforms_prewarms_classpathArtifactCache_for_aggregator_artifacts() + throws Exception { + // Entry artifact is jackson-core, but ObjectMapper is in jackson-databind.jar. + // matchVersion() returns null on classJarDeps → triggers findArtifactVersionInClasspath(). + String crossJarJson = + "{\"version\":1,\"entries\":[{" + + "\"vuln_id\":\"GHSA-test-cross-jar\"," + + "\"artifact\":\"com.fasterxml.jackson.core:jackson-core\"," + + "\"version_ranges\":[\"< 999.0.0\"]," + + "\"symbols\":[{\"class\":\"com/fasterxml/jackson/databind/ObjectMapper\"," + + "\"method\":\"readValue\"}]}]}"; + + Instrumentation mockInstr = mock(Instrumentation.class); + when(mockInstr.isModifiableClass(any())).thenReturn(true); + when(mockInstr.getAllLoadedClasses()).thenReturn(new Class[0]); + + ScaCveDatabase db = ScaCveDatabase.parse(new StringReader(crossJarJson)); + ScaReachabilityTransformer transformer = new ScaReachabilityTransformer(db, mockInstr); + + transformer.pendingRetransform.add(com.fasterxml.jackson.databind.ObjectMapper.class); + transformer.performPendingRetransforms(); + + // jackson-core is on the test classpath (transitive dependency of jackson-databind). + // classpathArtifactCache must be populated during pre-warm — not by the callback (which never + // fires with a mock Instrumentation). An empty cache means findArtifactVersionInClasspath() + // would run under JVM retransform locks and risk the snakeyaml-style deadlock. + assertNotNull( + transformer.classpathArtifactCache.get("com.fasterxml.jackson.core:jackson-core"), + "classpathArtifactCache must be populated during pre-warm for aggregator artifacts; " + + "if empty, findArtifactVersionInClasspath() would run under JVM retransform locks"); + } + + @Test + void matchVersion_nullDepNameDoesNotThrow() { + // guessFallbackNoPom can produce Dependency(name=null, ...) for JARs with unrecognizable names. + Dependency nullName = new Dependency(null, "1.0", "foo.jar", null); + assertNull( + ScaReachabilityTransformer.matchVersion( + "com.example:foo", Collections.singletonList(nullName))); + } + + /** + * Regression test for the registry key mismatch bug (PR #11614). + * + *

For JARs without {@code pom.properties}, {@code DependencyResolver.guessFallbackNoPom} + * produces a dep with {@code name = "junrar"} (artifactId only, no groupId). {@code + * resolveArtifactDep} must return that dep object so that callers ({@code processClass}) can use + * {@code dep.name} — not {@code entry.artifact()} — when calling {@code registerCve} and building + * {@code MethodCallbackSpec}. Using {@code entry.artifact()} would create a registry key ({@code + * "com.github.junrar:junrar@7.5.5"}) that mismatches the key {@code DependencyService} will use + * ({@code "junrar@7.5.5"}), causing the CVE telemetry to lose source/hash or appear under the + * wrong name. + */ + @Test + void resolveArtifactDep_noPomJar_returnsArtifactIdOnlyName() throws Exception { + ScaCveDatabase db = ScaCveDatabase.parse(new StringReader(JACKSON_JSON)); + ScaReachabilityTransformer transformer = new ScaReachabilityTransformer(db, null); + + // Simulate guessFallbackNoPom: dep.name is artifactId only (no groupId). + Dependency noPomDep = + new Dependency("jackson-databind", "2.9.0", "jackson-databind-2.9.0.jar", null); + + Dependency resolved = + transformer.resolveArtifactDep( + "com.fasterxml.jackson.core:jackson-databind", Collections.singletonList(noPomDep)); + + assertNotNull(resolved, "should resolve via artifactId-only fallback"); + assertEquals( + "jackson-databind", + resolved.name, + "resolved dep.name must be the artifactId-only name from the jar, " + + "not entry.artifact() — so registerCve uses the same key as DependencyService"); + assertEquals("2.9.0", resolved.version); + } + /** * Validates that {@code findArtifactVersionInClasspath} works correctly when the context * classloader is {@code null} — which is the actual runtime condition on agent threads, because diff --git a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaRealDatabaseTest.java b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaRealDatabaseTest.java new file mode 100644 index 00000000000..68550972572 --- /dev/null +++ b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaRealDatabaseTest.java @@ -0,0 +1,95 @@ +package com.datadog.appsec.sca; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.List; +import org.junit.jupiter.api.Test; + +/** + * Integration tests that load the real {@code sca_cves.json} and verify the three library classes + * used to validate the new sca-reachability-symbols database format: + * + *

    + *
  • {@code com.github.junrar:junrar 7.5.5} - GHSA-hf5p-q87m-crj7 + *
  • {@code io.github.ndsev:zserio-runtime 2.16.1} - GHSA-cwq5-8pvq-j65j + *
  • {@code org.apache.tomcat.embed:tomcat-embed-core 9.0.115} - GHSA-563x-q5rq-57qp + *
+ */ +class ScaRealDatabaseTest { + + @Test + void junrarLocalFolderExtractorMethodsAreIndexed() { + ScaCveDatabase db = ScaCveDatabase.load(); + + List entries = db.entriesForClass("com/github/junrar/LocalFolderExtractor"); + assertNotNull(entries, "LocalFolderExtractor must be indexed (junrar GHSA-hf5p)"); + assertFalse(entries.isEmpty()); + assertTrue( + entries.stream() + .flatMap(e -> e.symbols().stream()) + .anyMatch(s -> "createDirectory".equals(s.method())), + "createDirectory must be a tracked method"); + assertTrue( + entries.stream() + .flatMap(e -> e.symbols().stream()) + .anyMatch(s -> "createFile".equals(s.method())), + "createFile must be a tracked method"); + } + + @Test + void zserioArrayReadIsIndexed() { + ScaCveDatabase db = ScaCveDatabase.load(); + + List entries = db.entriesForClass("zserio/runtime/array/Array"); + assertNotNull(entries, "zserio Array must be indexed (zserio-runtime GHSA-cwq5)"); + assertFalse(entries.isEmpty()); + assertTrue( + entries.stream() + .flatMap(e -> e.symbols().stream()) + .anyMatch(s -> "read".equals(s.method())), + "read must be a tracked method"); + } + + @Test + void tomcatChunkedInputFilterIsIndexed() { + ScaCveDatabase db = ScaCveDatabase.load(); + + List entries = + db.entriesForClass("org/apache/coyote/http11/filters/ChunkedInputFilter"); + assertNotNull(entries, "ChunkedInputFilter must be indexed (tomcat-embed-core GHSA-563x)"); + assertFalse(entries.isEmpty()); + assertTrue( + entries.stream() + .flatMap(e -> e.symbols().stream()) + .anyMatch(s -> "parseChunkHeader".equals(s.method())), + "parseChunkHeader must be a tracked method"); + } + + @Test + void allTrackedSymbolsForThreeLibrariesAreMethodLevel() { + ScaCveDatabase db = ScaCveDatabase.load(); + + String[] classes = { + "com/github/junrar/LocalFolderExtractor", + "zserio/runtime/array/Array", + "zserio/runtime/io/ByteArrayBitStreamReader", + "org/apache/coyote/http11/filters/ChunkedInputFilter", + }; + for (String className : classes) { + List entries = db.entriesForClass(className); + if (entries == null) continue; + for (ScaEntry entry : entries) { + for (ScaSymbol symbol : entry.symbols()) { + assertNotNull( + symbol.method(), + "All symbols must be method-level - found null method for " + + symbol.className() + + " in entry " + + entry.vulnId()); + } + } + } + } +} diff --git a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaRealLibraryBytecodeTest.java b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaRealLibraryBytecodeTest.java new file mode 100644 index 00000000000..3e568a3c370 --- /dev/null +++ b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaRealLibraryBytecodeTest.java @@ -0,0 +1,221 @@ +package com.datadog.appsec.sca; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import datadog.trace.api.telemetry.ScaReachabilityDependencyRegistry; +import datadog.trace.api.telemetry.ScaReachabilityDependencyRegistry.CveSnapshot; +import datadog.trace.api.telemetry.ScaReachabilityDependencyRegistry.DependencySnapshot; +import datadog.trace.api.telemetry.ScaReachabilityHit; +import datadog.trace.bootstrap.appsec.sca.ScaReachabilityCallback; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.InputStream; +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +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; + +/** + * End-to-end tests verifying that ASM bytecode injection works on real library classes from the + * three libraries added to validate the new database format. + * + *

Two complementary levels of coverage: + * + *

    + *
  1. Injection tests - load real bytecode, inject the callback, verify the bytecode grew + * (proving the named method exists in the class and the callback was inserted). + *
  2. Callback test - for junrar, where the constructor is accessible with reflection, + * also calls the instrumented method and verifies the callback fires even when the method + * body throws NPE due to a null argument. + *
+ */ +class ScaRealLibraryBytecodeTest { + + @BeforeEach + void setUp() { + ScaReachabilityDependencyRegistry.INSTANCE.resetForTesting(); + ScaReachabilityCallback.register( + (vulnId, artifact, version, dotClassName, methodName, line) -> + ScaReachabilityDependencyRegistry.INSTANCE.recordHit( + artifact, version, vulnId, dotClassName, methodName, line)); + } + + @AfterEach + void tearDown() { + ScaReachabilityDependencyRegistry.INSTANCE.resetForTesting(); + ScaReachabilityCallback.register(null); + } + + // --------------------------------------------------------------------------- + // Injection tests: ASM can process real library bytecode + // --------------------------------------------------------------------------- + + @Test + void junrar_createDirectory_injectionProducesBytecodeChange() throws Exception { + Class localFolderExtractor = Class.forName("com.github.junrar.LocalFolderExtractor"); + byte[] original = bytecodeOf(localFolderExtractor); + Map> callbacks = new HashMap<>(); + callbacks.put( + "createDirectory", + Collections.singletonList( + spec( + "GHSA-hf5p-q87m-crj7", + "com.github.junrar:junrar", + "7.5.5", + "com.github.junrar.LocalFolderExtractor", + "createDirectory"))); + + byte[] modified = ScaMethodCallbackInjector.inject(original, callbacks); + + assertNotNull(modified, "ASM injection must not return null on real junrar bytecode"); + assertTrue( + modified.length > original.length, + "injected bytecode must be larger than original; proves createDirectory exists" + + " and the callback was inserted"); + } + + @Test + void zserio_array_read_injectionProducesBytecodeChange() throws Exception { + byte[] original = bytecodeOf(zserio.runtime.array.Array.class); + Map> callbacks = new HashMap<>(); + callbacks.put( + "read", + Collections.singletonList( + spec( + "GHSA-cwq5-8pvq-j65j", + "io.github.ndsev:zserio-runtime", + "2.16.1", + "zserio.runtime.array.Array", + "read"))); + + byte[] modified = ScaMethodCallbackInjector.inject(original, callbacks); + + assertNotNull(modified); + assertTrue( + modified.length > original.length, + "injected bytecode must be larger than original; proves Array.read exists" + + " and the callback was inserted"); + } + + @Test + void tomcat_chunkedInputFilter_parseChunkHeader_injectionProducesBytecodeChange() + throws Exception { + byte[] original = bytecodeOf(org.apache.coyote.http11.filters.ChunkedInputFilter.class); + Map> callbacks = new HashMap<>(); + callbacks.put( + "parseChunkHeader", + Collections.singletonList( + spec( + "GHSA-563x-q5rq-57qp", + "org.apache.tomcat.embed:tomcat-embed-core", + "9.0.115", + "org.apache.coyote.http11.filters.ChunkedInputFilter", + "parseChunkHeader"))); + + byte[] modified = ScaMethodCallbackInjector.inject(original, callbacks); + + assertNotNull(modified); + assertTrue( + modified.length > original.length, + "injected bytecode must be larger; proves parseChunkHeader exists and was instrumented"); + } + + // --------------------------------------------------------------------------- + // Callback test: the injected callback fires on a real method call + // --------------------------------------------------------------------------- + + @Test + void junrar_createDirectory_callbackFiresWhenMethodCalled() throws Exception { + Class localFolderExtractor = Class.forName("com.github.junrar.LocalFolderExtractor"); + byte[] original = bytecodeOf(localFolderExtractor); + Map> callbacks = new HashMap<>(); + callbacks.put( + "createDirectory", + Collections.singletonList( + spec( + "GHSA-hf5p-q87m-crj7", + "com.github.junrar:junrar", + "7.5.5", + "com.github.junrar.LocalFolderExtractor", + "createDirectory"))); + + byte[] modified = ScaMethodCallbackInjector.inject(original, callbacks); + Class cls = loadModified(modified); + + // Constructor is package-private in junrar; setAccessible(true) bypasses visibility. + Constructor ctor = cls.getDeclaredConstructor(File.class); + ctor.setAccessible(true); + Object instance = ctor.newInstance(new File("/tmp")); + + // createDirectory(FileHeader) is package-private. Passing null triggers the injected callback + // at method entry before the body tries to access header fields (NPE expected after callback). + Class fileHeaderClass = Class.forName("com.github.junrar.rarfile.FileHeader"); + Method m = cls.getDeclaredMethod("createDirectory", fileHeaderClass); + m.setAccessible(true); + try { + m.invoke(instance, (Object) null); + } catch (InvocationTargetException ignored) { + // NPE from null FileHeader is expected; the callback already fired before it + } + + List hits = drainHits(); + assertEquals( + 1, hits.size(), "createDirectory callback must fire even when method body throws NPE"); + ScaReachabilityHit hit = hits.get(0); + assertEquals("GHSA-hf5p-q87m-crj7", hit.vulnId()); + assertEquals("com.github.junrar:junrar", hit.artifact()); + assertEquals("7.5.5", hit.version()); + } + + // --------------------------------------------------------------------------- + // Helpers (duplicated from ScaReachabilityMethodLevelTest to keep tests self-contained) + // --------------------------------------------------------------------------- + + private static List drainHits() { + List result = new ArrayList<>(); + for (DependencySnapshot dep : + ScaReachabilityDependencyRegistry.INSTANCE.drainPendingDependencies()) { + for (CveSnapshot cve : dep.cves) { + if (cve.hit != null) { + result.add(cve.hit); + } + } + } + return result; + } + + private static ScaMethodCallbackInjector.MethodCallbackSpec spec( + String vulnId, String artifact, String version, String dotClass, String method) { + return new ScaMethodCallbackInjector.MethodCallbackSpec( + vulnId, artifact, version, dotClass, method); + } + + private static byte[] bytecodeOf(Class clazz) throws Exception { + String path = clazz.getName().replace('.', '/') + ".class"; + try (InputStream is = clazz.getClassLoader().getResourceAsStream(path)) { + assertNotNull(is, "Cannot load bytecode for " + clazz.getName()); + ByteArrayOutputStream buf = new ByteArrayOutputStream(); + byte[] chunk = new byte[4096]; + int n; + while ((n = is.read(chunk)) != -1) buf.write(chunk, 0, n); + return buf.toByteArray(); + } + } + + private static Class loadModified(byte[] bytecode) { + return new ClassLoader(ScaRealLibraryBytecodeTest.class.getClassLoader()) { + Class define() { + return defineClass(null, bytecode, 0, bytecode.length); + } + }.define(); + } +} diff --git a/dd-java-agent/appsec/src/test/java/com/github/junrar/LocalFolderExtractor.java b/dd-java-agent/appsec/src/test/java/com/github/junrar/LocalFolderExtractor.java new file mode 100644 index 00000000000..c518e200a0e --- /dev/null +++ b/dd-java-agent/appsec/src/test/java/com/github/junrar/LocalFolderExtractor.java @@ -0,0 +1,20 @@ +package com.github.junrar; + +import com.github.junrar.rarfile.FileHeader; +import java.io.File; + +// Minimal stub replacing junrar:7.5.5 to avoid shipping a test dependency with known CVEs. +// Preserves the constructor and method signatures used by ScaRealLibraryBytecodeTest. +class LocalFolderExtractor { + + @SuppressWarnings("unused") + private final File destinationFolder; + + LocalFolderExtractor(File destinationFolder) { + this.destinationFolder = destinationFolder; + } + + void createDirectory(FileHeader header) { + // stub — the test verifies that the injected callback fires at method entry before this body + } +} diff --git a/dd-java-agent/appsec/src/test/java/com/github/junrar/rarfile/FileHeader.java b/dd-java-agent/appsec/src/test/java/com/github/junrar/rarfile/FileHeader.java new file mode 100644 index 00000000000..ecc3a2beb9c --- /dev/null +++ b/dd-java-agent/appsec/src/test/java/com/github/junrar/rarfile/FileHeader.java @@ -0,0 +1,4 @@ +package com.github.junrar.rarfile; + +// Minimal stub: used only as a parameter type in LocalFolderExtractor.createDirectory(FileHeader). +public class FileHeader {} diff --git a/dd-java-agent/appsec/src/test/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java b/dd-java-agent/appsec/src/test/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java new file mode 100644 index 00000000000..2431b913796 --- /dev/null +++ b/dd-java-agent/appsec/src/test/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java @@ -0,0 +1,9 @@ +package org.apache.coyote.http11.filters; + +// Minimal stub replacing tomcat-embed-core:9.0.115 to avoid shipping a test dependency with known +// CVEs. +// Preserves the method signature used by ScaRealLibraryBytecodeTest. +public class ChunkedInputFilter { + + public void parseChunkHeader() {} +} diff --git a/dd-java-agent/appsec/src/test/java/zserio/runtime/array/Array.java b/dd-java-agent/appsec/src/test/java/zserio/runtime/array/Array.java new file mode 100644 index 00000000000..25896960568 --- /dev/null +++ b/dd-java-agent/appsec/src/test/java/zserio/runtime/array/Array.java @@ -0,0 +1,8 @@ +package zserio.runtime.array; + +// Minimal stub replacing zserio-runtime:2.16.1 to avoid shipping a test dependency with known CVEs. +// Preserves the method signature used by ScaRealLibraryBytecodeTest. +public class Array { + + public void read() {} +} diff --git a/dd-smoke-tests/appsec/springboot/build.gradle b/dd-smoke-tests/appsec/springboot/build.gradle index 94c44259a45..80f67bf9cdc 100644 --- a/dd-smoke-tests/appsec/springboot/build.gradle +++ b/dd-smoke-tests/appsec/springboot/build.gradle @@ -25,6 +25,9 @@ dependencies { implementation group: 'io.opentracing', name: 'opentracing-api', version: '0.32.0' implementation group: 'io.opentracing', name: 'opentracing-util', version: '0.32.0' + // SCA reachability smoke test target: junrar 7.5.5 is vulnerable under GHSA-hf5p-q87m-crj7 + implementation group: 'com.github.junrar', name: 'junrar', version: '7.5.5' + // file upload implementation group: 'commons-fileupload', name: 'commons-fileupload', version: '1.5' diff --git a/dd-smoke-tests/appsec/springboot/src/main/java/datadog/smoketest/appsec/springboot/ScaReachabilityInit.java b/dd-smoke-tests/appsec/springboot/src/main/java/datadog/smoketest/appsec/springboot/ScaReachabilityInit.java index 1023e4d316c..c891cd83e2d 100644 --- a/dd-smoke-tests/appsec/springboot/src/main/java/datadog/smoketest/appsec/springboot/ScaReachabilityInit.java +++ b/dd-smoke-tests/appsec/springboot/src/main/java/datadog/smoketest/appsec/springboot/ScaReachabilityInit.java @@ -4,21 +4,25 @@ import org.springframework.stereotype.Component; /** - * Forces snakeyaml's Yaml class to load at application startup so that SCA Reachability can detect - * the dependency at boot time rather than waiting for the first request. + * Forces junrar's LocalFolderExtractor class to load at application startup so that SCA + * Reachability can detect the dependency at boot time rather than waiting for the first request. * - *

snakeyaml is on the classpath (used by Spring Boot's YAML support) but the smoke test app uses - * application.properties rather than application.yml, so Spring never triggers snakeyaml loading on - * its own. This component ensures the class is loaded during context initialization so the SCA - * transformer can register the CVE and the next telemetry heartbeat can report it. + *

The constructor of LocalFolderExtractor is package-private, so Class.forName is used to + * trigger the class load without instantiation. After the next telemetry heartbeat the SCA + * transformer retransforms the class and registers the CVE with reached:[]. No vulnerable method is + * called, so reached stays empty. */ @Component class ScaReachabilityInit { @PostConstruct void init() { - // Instantiating Yaml loads org.yaml.snakeyaml.Yaml without calling any vulnerable method, - // so the SCA transformer registers the CVE with reached:[] (class-level detection only). - new org.yaml.snakeyaml.Yaml(); + try { + // Loading the class triggers the SCA transformer, which schedules a retransform on the + // next heartbeat. The retransform injects method-level callbacks and registers the CVE + // with reached:[]. Neither createDirectory nor createFile is called here. + Class.forName("com.github.junrar.LocalFolderExtractor"); + } catch (ClassNotFoundException ignored) { + } } } diff --git a/dd-smoke-tests/appsec/springboot/src/main/resources/META-INF/maven/com.github.junrar/junrar/pom.properties b/dd-smoke-tests/appsec/springboot/src/main/resources/META-INF/maven/com.github.junrar/junrar/pom.properties new file mode 100644 index 00000000000..87706be1c27 --- /dev/null +++ b/dd-smoke-tests/appsec/springboot/src/main/resources/META-INF/maven/com.github.junrar/junrar/pom.properties @@ -0,0 +1,3 @@ +groupId=com.github.junrar +artifactId=junrar +version=7.5.5 diff --git a/dd-smoke-tests/appsec/springboot/src/test/groovy/datadog/smoketest/appsec/ScaReachabilitySmokeTest.groovy b/dd-smoke-tests/appsec/springboot/src/test/groovy/datadog/smoketest/appsec/ScaReachabilitySmokeTest.groovy index 5e0f0696446..8c3d733785d 100644 --- a/dd-smoke-tests/appsec/springboot/src/test/groovy/datadog/smoketest/appsec/ScaReachabilitySmokeTest.groovy +++ b/dd-smoke-tests/appsec/springboot/src/test/groovy/datadog/smoketest/appsec/ScaReachabilitySmokeTest.groovy @@ -12,14 +12,11 @@ import spock.lang.Shared * 1. At startup, vulnerable dependencies are reported with metadata: [{cve, reached:[]}] * (signals the backend that SCA is monitoring those CVEs). * - * The springboot smoke test app uses snakeyaml:1.29 (via Spring Boot 2.6.0), which falls - * in the vulnerable range "<= 1.33" for GHSA-mjmj-j48q-9wg2. ScaReachabilityInit instantiates - * org.yaml.snakeyaml.Yaml at startup (PostConstruct), triggering class-level CVE registration - * with reached:[]. The vulnerable methods (load, loadAll) are not called, so reached stays empty. - * - * Note: jackson-databind is also present but as version 2.13.0 (managed by Spring Boot BOM), - * which is outside the vulnerable ranges in sca_cves.json. snakeyaml is therefore the - * reliable test target. + * The springboot smoke test app includes junrar:7.5.5 (vulnerable under GHSA-hf5p-q87m-crj7, + * range >=0,<7.5.10). ScaReachabilityInit forces loading of LocalFolderExtractor at startup via + * Class.forName. The transformer enqueues it, retransforms on the first heartbeat, registers the + * CVE with reached:[], and injects callbacks for createDirectory and createFile. Neither method + * is called at startup, so reached stays empty. */ class ScaReachabilitySmokeTest extends AbstractAppSecServerSmokeTest { @@ -41,7 +38,7 @@ class ScaReachabilitySmokeTest extends AbstractAppSecServerSmokeTest { return processBuilder } - void 'SCA reachability reports vulnerable snakeyaml via telemetry'() { + void 'SCA reachability reports vulnerable junrar via telemetry'() { when: 'application starts and telemetry heartbeats arrive' waitForTelemetryFlat({ event -> if (event.get('request_type') != 'app-dependencies-loaded') { @@ -50,12 +47,12 @@ class ScaReachabilitySmokeTest extends AbstractAppSecServerSmokeTest { def deps = event.get('payload')?.get('dependencies') as List deps?.any { dep -> def d = dep as Map - d.get('name') == 'org.yaml:snakeyaml' && + d.get('name') == 'com.github.junrar:junrar' && (d.get('metadata') as List)?.any { (it as Map).get('type') == 'reachability' } } }) - then: 'snakeyaml 1.29 appears with SCA reachability metadata' + then: 'junrar 7.5.5 appears with SCA reachability metadata' // Collect all dependencies from all app-dependencies-loaded messages def allDependencies = [] telemetryFlatMessages.findAll { it.get('request_type') == 'app-dependencies-loaded' }.each { @@ -66,22 +63,23 @@ class ScaReachabilitySmokeTest extends AbstractAppSecServerSmokeTest { } } - // Find the snakeyaml entry that has SCA reachability metadata. - // ScaReachabilityInit instantiates Yaml at startup (PostConstruct), loading the class - // and triggering CVE registration with reached:[]. + // Find the junrar entry that has SCA reachability metadata. + // ScaReachabilityInit loads LocalFolderExtractor at startup; the transformer retransforms it + // on the first heartbeat and registers the CVE with reached:[]. Neither createDirectory nor + // createFile is called, so reached stays empty. - def snakeyamlDep = allDependencies.find { dep -> + def junrarDep = allDependencies.find { dep -> def d = dep as Map - d.get('name') == 'org.yaml:snakeyaml' && + d.get('name') == 'com.github.junrar:junrar' && (d.get('metadata') as List)?.any { (it as Map).get('type') == 'reachability' } } as Map - assert snakeyamlDep != null : - "snakeyaml must appear with SCA reachability metadata in app-dependencies-loaded" - assert snakeyamlDep.get('version') == '1.29' : "must be the vulnerable version 1.29" + assert junrarDep != null : + "junrar must appear with SCA reachability metadata in app-dependencies-loaded" + assert junrarDep.get('version') == '7.5.5' : "must be the vulnerable version 7.5.5" // Find the reachability metadata entry - def metadata = snakeyamlDep.get('metadata') as List + def metadata = junrarDep.get('metadata') as List def reachabilityEntry = metadata.find { entry -> (entry as Map).get('type') == 'reachability' } as Map @@ -98,10 +96,10 @@ class ScaReachabilitySmokeTest extends AbstractAppSecServerSmokeTest { "id must be a GHSA identifier, got: ${reachabilityPayload.get('id')}" assert reachabilityPayload.get('reached') instanceof List : "reached must be a list" - // snakeyaml has method-level symbols (load, loadAll). ScaReachabilityInit calls new Yaml() - // (constructor only) so load/loadAll are never triggered — reached must stay empty. + // junrar has method-level symbols (createDirectory, createFile). ScaReachabilityInit only + // loads the class - neither vulnerable method is called - so reached must stay empty. def reached = reachabilityPayload.get('reached') as List assert reached.isEmpty() : - "load/loadAll not called at startup — reached must be [] (class-level detection only)" + "createDirectory/createFile not called at startup — reached must be []" } } diff --git a/internal-api/src/main/java/datadog/trace/api/telemetry/ScaReachabilityHit.java b/internal-api/src/main/java/datadog/trace/api/telemetry/ScaReachabilityHit.java index 13164c39782..f0e1e5f477c 100644 --- a/internal-api/src/main/java/datadog/trace/api/telemetry/ScaReachabilityHit.java +++ b/internal-api/src/main/java/datadog/trace/api/telemetry/ScaReachabilityHit.java @@ -1,29 +1,20 @@ package datadog.trace.api.telemetry; /** - * A single SCA reachability detection: a vulnerable class from a known artifact was loaded at + * A single SCA reachability detection: a vulnerable method from a known artifact was called at * runtime. Produced by {@code ScaReachabilityTransformer} and consumed by {@code * ScaReachabilityPeriodicAction} to build the telemetry payload. */ public final class ScaReachabilityHit { - /** - * JVM internal name for the class initializer. Used as the {@code symbolName} for class-level - * hits where no specific method was targeted (detection fires at class load time). - */ - public static final String CLASS_LEVEL_SYMBOL = ""; - private final String vulnId; private final String artifact; private final String version; - // For class-level hits: the vulnerable library class (FQN, dot notation) - // For method-level hits: the APPLICATION class that called the vulnerable method (callsite) + // FQN of the APPLICATION class that called the vulnerable method (callsite, dot notation) private final String className; - // For class-level hits: CLASS_LEVEL_SYMBOL ("") - // For method-level hits: the APPLICATION method that called the vulnerable method (callsite) + // The APPLICATION method that called the vulnerable method (callsite) private final String symbolName; - // For class-level hits: 1 (placeholder — no callsite at class load time) - // For method-level hits: line number in the application code of the call + // Line number in the application code where the call was made private final int line; public ScaReachabilityHit( @@ -56,26 +47,19 @@ public String version() { } /** - * For class-level hits: FQN of the vulnerable library class (dot notation). For method-level - * hits: FQN of the APPLICATION class that called the vulnerable method (callsite), not the - * vulnerable class itself. + * FQN of the APPLICATION class that called the vulnerable method (callsite, dot notation). This + * is the caller frame, not the vulnerable class itself. */ public String className() { return className; } - /** - * For class-level hits: {@link #CLASS_LEVEL_SYMBOL} ({@code ""}). For method-level hits: - * the APPLICATION method that called the vulnerable method (callsite). - */ + /** The APPLICATION method that called the vulnerable method (callsite). */ public String symbolName() { return symbolName; } - /** - * For class-level hits: {@code 1} (placeholder — no specific callsite at class load time). For - * method-level hits: line number in the application code where the call was made. - */ + /** Line number in the application code where the call was made. */ public int line() { return line; } diff --git a/telemetry/src/main/java/datadog/telemetry/sca/ScaReachabilityPeriodicAction.java b/telemetry/src/main/java/datadog/telemetry/sca/ScaReachabilityPeriodicAction.java index c325108d875..b1dd6b416a9 100644 --- a/telemetry/src/main/java/datadog/telemetry/sca/ScaReachabilityPeriodicAction.java +++ b/telemetry/src/main/java/datadog/telemetry/sca/ScaReachabilityPeriodicAction.java @@ -14,6 +14,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; /** * Reports SCA Reachability state on each telemetry heartbeat, implementing the RFC stateful model. @@ -103,23 +104,26 @@ public void doIteration(TelemetryService telService) { if (dependencyService != null) { for (Dependency dep : dependencyService.drainDeterminedDependencies()) { String key = ScaReachabilityDependencyRegistry.depKey(dep.name, dep.version); - knownDeps.put(key, dep); + Dependency previous = knownDeps.put(key, dep); DependencySnapshot snapshot = snapshotByKey.remove(key); - if (snapshot == null) { - // CVE was drained in a prior heartbeat (pendingReport cleared) but DependencyService - // resolved this JAR only now. Peek at the current CVE state so we can enrich the - // emission instead of overwriting the backend's state with metadata:[]. + if (snapshot == null && isNewPhysicalCopy(previous, dep)) { + // First detection of this physical JAR: peek CVE state so we can enrich the emission + // instead of overwriting the backend's state with metadata:[]. Skip when the same + // physical copy is re-detected (same source/hash from a different classloader) — + // peekSnapshot would re-emit a stale hit already reported. snapshot = ScaReachabilityDependencyRegistry.INSTANCE.peekSnapshot(dep.name, dep.version); } if (snapshot != null) { - // New dep AND has CVE state - emit the full picture in one entry. telService.addDependency( new Dependency(dep.name, dep.version, dep.source, dep.hash, buildMetadata(snapshot))); - } else { - // New dep, no CVE state yet - metadata:[] signals "SCA is monitoring this dep". + } else if (isNewPhysicalCopy(previous, dep)) { + // First detection of this physical copy, no CVE state yet — metadata:[] signals "SCA is + // monitoring this dep". telService.addDependency( new Dependency(dep.name, dep.version, dep.source, dep.hash, Collections.emptyList())); } + // Re-detection of the same physical copy (same source/hash) with no state change: nothing + // to emit. The backend already received this dep. } } @@ -148,6 +152,46 @@ public void doIteration(TelemetryService telService) { } } + /** + * Decides whether {@code dep} represents a new physical copy of an artifact that the backend has + * not yet seen, as opposed to a re-detection of a JAR already reported. + * + *

A "new physical copy" is a distinct file on disk. Two copies share the same {@code + * name@version} key but differ in {@code source} (the path/URI the JAR was loaded from) and/or + * {@code hash} (the content digest). A "re-detection" is the exact same physical file surfacing + * again, carrying an identical {@code source} and {@code hash}. + * + *

Returns {@code true} when: + * + *

    + *
  • {@code previous == null} — first time we see this {@code name@version} key, or + *
  • {@code dep.source} differs from {@code previous.source}, or + *
  • {@code dep.hash} differs from {@code previous.hash}. + *
+ * + *

{@link Objects#equals} is used for both comparisons because {@code source} and {@code hash} + * may legitimately be {@code null} (e.g. JARs whose origin or digest could not be resolved), and + * a plain {@code ==}/{@code .equals} would either NPE or misclassify two null values. + * + *

Case this protects (must emit both): a Tomcat container running two webapps that each ship + * their own physical copy of the same artifact under different {@code WEB-INF/lib} paths. The + * copies have different {@code source}/{@code hash}, so both are reported — matching the behavior + * of the legacy {@link datadog.telemetry.dependency.DependencyPeriodicAction}. + * + *

Case this suppresses (re-detection, do not re-emit): a Spring Boot fat JAR where {@code + * LaunchedURLClassLoader} reports the same nested JAR from the same URI on multiple heartbeats. + * The {@code source}/{@code hash} are identical, so the dep is emitted only once. + */ + private static boolean isNewPhysicalCopy(Dependency previous, Dependency dep) { + if (previous == null) { + return true; + } + if (!Objects.equals(dep.source, previous.source)) { + return true; + } + return !Objects.equals(dep.hash, previous.hash); + } + private static List buildMetadata(DependencySnapshot snapshot) { List metadataValues = new ArrayList<>(snapshot.cves.size()); for (CveSnapshot cve : snapshot.cves) { diff --git a/telemetry/src/test/java/datadog/telemetry/sca/ScaReachabilityPeriodicActionTest.java b/telemetry/src/test/java/datadog/telemetry/sca/ScaReachabilityPeriodicActionTest.java index 7879ab4053d..4037e73286c 100644 --- a/telemetry/src/test/java/datadog/telemetry/sca/ScaReachabilityPeriodicActionTest.java +++ b/telemetry/src/test/java/datadog/telemetry/sca/ScaReachabilityPeriodicActionTest.java @@ -475,6 +475,80 @@ void cveRegisteredBeforeDepResolved_step2PeeksCveStateInLaterHeartbeat() { "HB2 metadata must contain the CVE id"); } + /** + * Regression test for the multi-classloader re-detection bug. + * + *

{@link DependencyService} can report the same JAR on consecutive heartbeats when it + * discovers it from multiple classloaders in the same application. The CVE hit must be emitted + * exactly once — on the heartbeat where the CVE state is pending or first detected via {@code + * peekSnapshot}. Re-detections of the same JAR with no new CVE activity must produce no emission. + * + *

Without the fix, Step 2 called {@code peekSnapshot} unconditionally when {@code + * snapshotByKey} had no entry, causing the hit to be re-emitted on every subsequent heartbeat + * where {@code DependencyService} reported the JAR again (e.g. from a different classloader). + */ + @Test + void depReDetectedByDependencyService_hitNotReEmittedOnSubsequentDetection() { + DependencyService svc = mock(DependencyService.class); + Dependency dep = new Dependency("com.example:lib", "1.0.0", "lib.jar", "HASH"); + // Same dep returned on both heartbeats (simulates multiple classloaders detecting the same JAR) + when(svc.drainDeterminedDependencies()) + .thenReturn(Collections.singletonList(dep)) // HB1: first detection + .thenReturn(Collections.singletonList(dep)); // HB2: re-detected from another classloader + ScaReachabilityPeriodicAction merged = new ScaReachabilityPeriodicAction(svc); + + ScaReachabilityDependencyRegistry.INSTANCE.registerCve("com.example:lib", "1.0.0", "GHSA-dup"); + ScaReachabilityDependencyRegistry.INSTANCE.recordHit( + "com.example:lib", "1.0.0", "GHSA-dup", "com.app.Ctrl", "handle", 10); + + // HB1: first detection, CVE is pending → emit merged entry with hit + merged.doIteration(telService); + ArgumentCaptor captor1 = ArgumentCaptor.forClass(Dependency.class); + verify(telService, times(1)).addDependency(captor1.capture()); + assertTrue( + captor1.getValue().reachabilityMetadata.get(0).contains("\"path\""), + "HB1 must include the callsite hit"); + reset(telService); + + // HB2: same JAR re-detected, no new CVE activity → must NOT re-emit the hit + merged.doIteration(telService); + verify(telService, never()).addDependency(any()); + } + + /** + * Companion to {@link #depReDetectedByDependencyService_hitNotReEmittedOnSubsequentDetection}: + * verifies that a REAL new CVE state change (hit arriving between heartbeats) is still emitted + * correctly even when DependencyService also reports the dep again on the same heartbeat. + */ + @Test + void depReDetectedWithNewHit_emitsOnceWithNewHit() { + DependencyService svc = mock(DependencyService.class); + Dependency dep = new Dependency("com.example:lib", "1.0.0", "lib.jar", "HASH"); + when(svc.drainDeterminedDependencies()) + .thenReturn(Collections.singletonList(dep)) // HB1 + .thenReturn(Collections.singletonList(dep)); // HB2 + ScaReachabilityPeriodicAction merged = new ScaReachabilityPeriodicAction(svc); + + ScaReachabilityDependencyRegistry.INSTANCE.registerCve("com.example:lib", "1.0.0", "GHSA-new"); + + // HB1: first detection, CVE pending with reached:[] → emitted once + merged.doIteration(telService); + verify(telService, times(1)).addDependency(any()); + reset(telService); + + // Hit recorded between HB1 and HB2 + ScaReachabilityDependencyRegistry.INSTANCE.recordHit( + "com.example:lib", "1.0.0", "GHSA-new", "com.app.Svc", "exec", 7); + + // HB2: re-detection AND new hit pending (snapshotByKey has the entry) → emit once with hit + merged.doIteration(telService); + ArgumentCaptor captor = ArgumentCaptor.forClass(Dependency.class); + verify(telService, times(1)).addDependency(captor.capture()); + assertTrue( + captor.getValue().reachabilityMetadata.get(0).contains("\"path\""), + "HB2 must include the new callsite hit"); + } + /** * Dep and CVE arrive simultaneously (same heartbeat) — existing Step 2 merge path. This existing * behavior must still work after the knownDeps refactor. @@ -495,4 +569,106 @@ void cveAndDepArriveSameHeartbeat_step2MergeStillWorks() { assertEquals("lib.jar", emitted.source, "Step 2 merge must preserve source"); assertTrue(emitted.reachabilityMetadata.get(0).contains("GHSA-simultaneous")); } + + /** + * Regression test for the registry key mismatch for JARs without pom.properties (PR #11614). + * + *

For JARs without {@code pom.properties}, {@code DependencyResolver.guessFallbackNoPom} + * produces an artifact-ID-only name (e.g. {@code "junrar"} instead of {@code + * "com.github.junrar:junrar"}). The transformer must register the CVE under the same name so that + * the registry key matches what {@code DependencyService} will report. + * + *

Without the fix, {@code registerCve} was called with {@code entry.artifact()} = {@code + * "com.github.junrar:junrar"}, while {@code DependencyService} reported {@code dep.name} = {@code + * "junrar"}. The result: two separate telemetry entries for the same physical JAR — one with + * {@code metadata:[]} (from Step 2, carrying source/hash but no CVE) and one with the CVE + * metadata (from Step 3, without source/hash). + * + *

With the fix, the transformer uses the resolved {@code dep.name} from {@code matchDep} (i.e. + * {@code "junrar"}) for {@code registerCve}, so the registry and {@code DependencyService} keys + * match. Step 2 merges them into a single emission with both the CVE metadata and source/hash. + */ + @Test + void noPomJar_artifactIdOnlyName_cveAndSourceHashMergedIntoSingleEntry() { + // Simulates what ScaReachabilityTransformer.processClass() now does after the fix: + // registerCve with the artifactId-only name that DependencyService will also report. + ScaReachabilityDependencyRegistry.INSTANCE.registerCve("junrar", "7.5.5", "GHSA-hf5p-test"); + + // DependencyService returns the dep with the same artifactId-only name (guessFallbackNoPom). + Dependency incoming = new Dependency("junrar", "7.5.5", "junrar-7.5.5.jar", "CAFEBABE"); + ScaReachabilityPeriodicAction merged = actionWithDeps(incoming); + + merged.doIteration(telService); + + // Must produce exactly ONE emission with BOTH the CVE metadata AND source/hash — not two + // separate entries (one with CVE but no source/hash, one with source/hash but no CVE). + ArgumentCaptor captor = ArgumentCaptor.forClass(Dependency.class); + verify(telService, times(1)).addDependency(captor.capture()); + Dependency emitted = captor.getValue(); + assertEquals( + "junrar", emitted.name, "name must be the artifactId-only name from DependencyService"); + assertEquals("7.5.5", emitted.version); + assertEquals( + "junrar-7.5.5.jar", emitted.source, "source/hash from DependencyService must be preserved"); + assertEquals("CAFEBABE", emitted.hash, "hash from DependencyService must be preserved"); + assertFalse( + emitted.reachabilityMetadata.isEmpty(), + "CVE metadata must NOT be lost — a single merged entry must carry both CVE data and source/hash"); + assertTrue(emitted.reachabilityMetadata.get(0).contains("GHSA-hf5p-test")); + } + + /** + * Same physical copy (identical source/hash) re-detected on a later heartbeat must NOT be + * re-emitted — the backend already received it. Mirrors a Spring Boot {@code + * LaunchedURLClassLoader} reporting the same nested JAR (same URI) again. + */ + @Test + void sameSourceHashReDetected_doesNotReEmit() { + DependencyService svc = mock(DependencyService.class); + Dependency dep = new Dependency("com.example:lib", "1.0", "lib.jar", "AABB"); + when(svc.drainDeterminedDependencies()) + .thenReturn(Collections.singletonList(dep)) // HB1: first detection + .thenReturn(Collections.singletonList(dep)); // HB2: same physical copy re-detected + ScaReachabilityPeriodicAction merged = new ScaReachabilityPeriodicAction(svc); + + // HB1: first detection → emits metadata:[] (SCA monitoring signal) + merged.doIteration(telService); + verify(telService, times(1)).addDependency(any(Dependency.class)); + reset(telService); + + // HB2: same source/hash → backend already knows it → no emission + merged.doIteration(telService); + verify(telService, never()).addDependency(any()); + } + + /** + * Two physical copies of the same {@code name@version} but with different source/hash (e.g. two + * Tomcat webapps each shipping their own copy of the artifact) must BOTH be emitted, matching the + * legacy {@code DependencyPeriodicAction} behavior. + */ + @Test + void differentSourceHashSameKey_emitsBothPhysicalCopies() { + DependencyService svc = mock(DependencyService.class); + Dependency copy1 = new Dependency("com.example:lib", "1.0", "/app1/lib.jar", "AABB"); + Dependency copy2 = new Dependency("com.example:lib", "1.0", "/app2/lib.jar", "CCDD"); + when(svc.drainDeterminedDependencies()) + .thenReturn(Collections.singletonList(copy1)) // HB1: first physical copy + .thenReturn(Collections.singletonList(copy2)); // HB2: distinct physical copy + ScaReachabilityPeriodicAction merged = new ScaReachabilityPeriodicAction(svc); + + // HB1: first copy → emitted + merged.doIteration(telService); + ArgumentCaptor captor1 = ArgumentCaptor.forClass(Dependency.class); + verify(telService, times(1)).addDependency(captor1.capture()); + assertEquals("/app1/lib.jar", captor1.getValue().source); + assertEquals("AABB", captor1.getValue().hash); + reset(telService); + + // HB2: different source/hash → new physical copy → also emitted + merged.doIteration(telService); + ArgumentCaptor captor2 = ArgumentCaptor.forClass(Dependency.class); + verify(telService, times(1)).addDependency(captor2.capture()); + assertEquals("/app2/lib.jar", captor2.getValue().source); + assertEquals("CCDD", captor2.getValue().hash); + } } From 3d4423e72617a47e165a8e5098639e0440c8c93d Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Fri, 26 Jun 2026 09:14:28 -0400 Subject: [PATCH 051/139] Fix javadoc warnings across modules (#11747) Fix javadoc warnings across modules Co-Authored-By: Claude Opus 4.8 (1M context) Use JUnit example in ThreadUtils javadoc Co-Authored-By: Claude Opus 4.8 (1M context) Drop needless javadoc on Closure overload Co-Authored-By: Claude Opus 4.8 (1M context) Co-authored-by: alexey.kuznetsov --- .../serialization/GenerationalUtf8Cache.java | 2 +- .../main/java/datadog/context/ContextKey.java | 2 +- .../datadog/environment/ThreadSupport.java | 8 ++-- .../main/java/datadog/json/JsonMapper.java | 6 +-- .../datadog/appsec/api/blocking/Blocking.java | 4 +- .../java/datadog/trace/api/GlobalTracer.java | 2 +- .../trace/api/interceptor/MutableSpan.java | 6 +-- .../trace/api/internal/TraceSegment.java | 4 +- .../common/sampling/SpanSamplingRules.java | 6 +-- .../common/sampling/TraceSamplingRules.java | 6 +-- .../main/java/datadog/trace/api/Config.java | 12 +++--- .../main/java/datadog/trace/api/TagMap.java | 6 +-- .../trace/api/naming/NamingSchema.java | 6 +-- .../remoteconfig/ServiceNameCollector.java | 2 +- .../trace/api/sampling/SamplingMechanism.java | 6 +-- .../instrumentation/api/URIDataAdapter.java | 2 +- .../java/datadog/trace/util/Hashtable.java | 3 +- .../trace/junit/utils/config/WithConfig.java | 12 +++--- .../datadog/trace/test/util/ThreadUtils.java | 37 +++++++++---------- 19 files changed, 64 insertions(+), 68 deletions(-) diff --git a/communication/src/main/java/datadog/communication/serialization/GenerationalUtf8Cache.java b/communication/src/main/java/datadog/communication/serialization/GenerationalUtf8Cache.java index 33b775b197d..537cdff7b0b 100644 --- a/communication/src/main/java/datadog/communication/serialization/GenerationalUtf8Cache.java +++ b/communication/src/main/java/datadog/communication/serialization/GenerationalUtf8Cache.java @@ -136,7 +136,7 @@ public int tenuredCapacity() { return this.tenuredEntries.length; } - /** Updates access time used @link {@link #getUtf8(String, String)} to the provided value */ + /** Updates the access time used by {@link #getUtf8(String)} to the provided value. */ @SuppressFBWarnings("AT_NONATOMIC_64BIT_PRIMITIVE") public void updateAccessTime(long accessTimeMs) { this.accessTimeMs = accessTimeMs; diff --git a/components/context/src/main/java/datadog/context/ContextKey.java b/components/context/src/main/java/datadog/context/ContextKey.java index cc1cd6d8cb0..2576fec4a50 100644 --- a/components/context/src/main/java/datadog/context/ContextKey.java +++ b/components/context/src/main/java/datadog/context/ContextKey.java @@ -3,7 +3,7 @@ import java.util.concurrent.atomic.AtomicInteger; /** - * {@link Context} key that maps to a value of type {@link T}. + * {@link Context} key that maps to a value of type {@code T}. * *

Keys are compared by identity rather than by name. Each stored context type should either * share its key for re-use or implement {@link ImplicitContextKeyed} to keep its key private. diff --git a/components/environment/src/main/java/datadog/environment/ThreadSupport.java b/components/environment/src/main/java/datadog/environment/ThreadSupport.java index 861215ca837..4c3221ceca1 100644 --- a/components/environment/src/main/java/datadog/environment/ThreadSupport.java +++ b/components/environment/src/main/java/datadog/environment/ThreadSupport.java @@ -24,8 +24,8 @@ public final class ThreadSupport { private ThreadSupport() {} /** - * Provides the best identifier available for the current {@link Thread}. Uses {@link - * Thread#threadId()} on 19+ or {@link Thread#getId()} on older JVMs. + * Provides the best identifier available for the current {@link Thread}. Uses {@code + * Thread.threadId()} on 19+ or {@link Thread#getId()} on older JVMs. * * @return The best identifier available for the current {@link Thread}. */ @@ -34,8 +34,8 @@ public static long threadId() { } /** - * Provides the best identifier available for the given {@link Thread}. Uses {@link - * Thread#threadId()} on 19+ or {@link Thread#getId()} on older JVMs. + * Provides the best identifier available for the given {@link Thread}. Uses {@code + * Thread.threadId()} on 19+ or {@link Thread#getId()} on older JVMs. * * @return The best identifier available for the given {@link Thread}. */ diff --git a/components/json/src/main/java/datadog/json/JsonMapper.java b/components/json/src/main/java/datadog/json/JsonMapper.java index 4a69b7d7d93..1233f7ebde6 100644 --- a/components/json/src/main/java/datadog/json/JsonMapper.java +++ b/components/json/src/main/java/datadog/json/JsonMapper.java @@ -69,7 +69,7 @@ public static String toJson(Map map) { } /** - * Converts a {@link Iterable} to a JSON array. + * Converts a {@code Iterable} to a JSON array. * * @param items The iterable to convert. * @return The converted JSON array as Java string. @@ -132,10 +132,10 @@ public static Map fromJsonToMap(String json) throws IOException } /** - * Parses a JSON string array into a {@link List}. + * Parses a JSON string array into a {@code List}. * * @param json The JSON string array to parse. - * @return A {@link List} containing the parsed JSON strings. + * @return A {@code List} containing the parsed JSON strings. * @throws IOException If the JSON is invalid or a reader error occurs. */ public static List fromJsonToList(String json) throws IOException { diff --git a/dd-trace-api/src/main/java/datadog/appsec/api/blocking/Blocking.java b/dd-trace-api/src/main/java/datadog/appsec/api/blocking/Blocking.java index 370863f8e99..c902ce83582 100644 --- a/dd-trace-api/src/main/java/datadog/appsec/api/blocking/Blocking.java +++ b/dd-trace-api/src/main/java/datadog/appsec/api/blocking/Blocking.java @@ -61,8 +61,8 @@ public static boolean tryCommitBlockingResponse( } /** - * Equivalent to calling {@link #tryCommitBlockingResponse(int, BlockingContentType, Map)} with the last parameter being an empty map. + * Equivalent to calling {@link #tryCommitBlockingResponse(int, BlockingContentType, Map)} with + * the last parameter being an empty map. * * @param statusCode the status code of the response * @param contentType the content-type of the response. diff --git a/dd-trace-api/src/main/java/datadog/trace/api/GlobalTracer.java b/dd-trace-api/src/main/java/datadog/trace/api/GlobalTracer.java index 74e1bd7f274..b3f73c18fba 100644 --- a/dd-trace-api/src/main/java/datadog/trace/api/GlobalTracer.java +++ b/dd-trace-api/src/main/java/datadog/trace/api/GlobalTracer.java @@ -86,7 +86,7 @@ public static Tracer get() { } /** - * @deprecated use static methods in {@link EventTrackerV2} directly + * @deprecated use static methods in {@link datadog.appsec.api.login.EventTrackerV2} directly */ @Deprecated public static EventTracker getEventTracker() { diff --git a/dd-trace-api/src/main/java/datadog/trace/api/interceptor/MutableSpan.java b/dd-trace-api/src/main/java/datadog/trace/api/interceptor/MutableSpan.java index e5ef4cef73c..97f32852a80 100644 --- a/dd-trace-api/src/main/java/datadog/trace/api/interceptor/MutableSpan.java +++ b/dd-trace-api/src/main/java/datadog/trace/api/interceptor/MutableSpan.java @@ -29,9 +29,9 @@ public interface MutableSpan { Integer getSamplingPriority(); /** - * @param newPriority - * @return - * @deprecated Use {@link io.opentracing.Span#setTag(String, boolean)} instead using either tag + * @param newPriority the sampling priority to set + * @return this {@link MutableSpan} instance, for chaining + * @deprecated Use {@code io.opentracing.Span#setTag(String, boolean)} instead using either tag * names {@link datadog.trace.api.DDTags#MANUAL_KEEP} or {@link * datadog.trace.api.DDTags#MANUAL_DROP}. */ diff --git a/dd-trace-api/src/main/java/datadog/trace/api/internal/TraceSegment.java b/dd-trace-api/src/main/java/datadog/trace/api/internal/TraceSegment.java index 0015c59452c..d6e262cfc78 100644 --- a/dd-trace-api/src/main/java/datadog/trace/api/internal/TraceSegment.java +++ b/dd-trace-api/src/main/java/datadog/trace/api/internal/TraceSegment.java @@ -132,8 +132,8 @@ default Object getTagCurrent(String key) { * * @param field field name * @param value value of the data - * @see datadog.trace.common.writer.ddagent.TraceMapperV0_4.MetaStructWriter - * @see datadog.trace.core.CoreSpan#setMetaStruct(String, Object) + * @see "datadog.trace.common.writer.ddagent.TraceMapperV0_4.MetaStructWriter" + * @see "datadog.trace.core.CoreSpan#setMetaStruct(String, Object)" */ void setMetaStructCurrent(String field, Object value); diff --git a/dd-trace-core/src/main/java/datadog/trace/common/sampling/SpanSamplingRules.java b/dd-trace-core/src/main/java/datadog/trace/common/sampling/SpanSamplingRules.java index b148c9a82f0..d4950c5e8f1 100644 --- a/dd-trace-core/src/main/java/datadog/trace/common/sampling/SpanSamplingRules.java +++ b/dd-trace-core/src/main/java/datadog/trace/common/sampling/SpanSamplingRules.java @@ -108,10 +108,10 @@ private Rule( } /** - * Validate and create a {@link Rule} from its {@link JsonRule} representation. + * Validate and create a {@link Rule} from its {@code JsonRule} representation. * - * @param jsonRule The {@link JsonRule} to validate. - * @return A {@link Rule} if the {@link JsonRule} is valid, {@code null} otherwise. + * @param jsonRule The {@code JsonRule} to validate. + * @return A {@link Rule} if the {@code JsonRule} is valid, {@code null} otherwise. */ public static Rule create(JsonRule jsonRule) { String service = SamplingRule.normalizeGlob(jsonRule.service); diff --git a/dd-trace-core/src/main/java/datadog/trace/common/sampling/TraceSamplingRules.java b/dd-trace-core/src/main/java/datadog/trace/common/sampling/TraceSamplingRules.java index 16df3534c3e..455b66443fe 100644 --- a/dd-trace-core/src/main/java/datadog/trace/common/sampling/TraceSamplingRules.java +++ b/dd-trace-core/src/main/java/datadog/trace/common/sampling/TraceSamplingRules.java @@ -87,10 +87,10 @@ private Rule( } /** - * Validate and create a {@link Rule} from its {@link JsonRule} representation. + * Validate and create a {@link Rule} from its {@code JsonRule} representation. * - * @param jsonRule The {@link JsonRule} to validate. - * @return A {@link Rule} if the {@link JsonRule} is valid, {@code null} otherwise. + * @param jsonRule The {@code JsonRule} to validate. + * @return A {@link Rule} if the {@code JsonRule} is valid, {@code null} otherwise. */ public static Rule create(JsonRule jsonRule) { String service = SamplingRule.normalizeGlob(jsonRule.service); diff --git a/internal-api/src/main/java/datadog/trace/api/Config.java b/internal-api/src/main/java/datadog/trace/api/Config.java index 0a748caf358..d1a9ba4aada 100644 --- a/internal-api/src/main/java/datadog/trace/api/Config.java +++ b/internal-api/src/main/java/datadog/trace/api/Config.java @@ -5657,9 +5657,9 @@ public boolean isRuleEnabled(final String name, boolean defaultEnabled) { } /** - * @param integrationNames - * @param defaultEnabled - * @return + * @param integrationNames the integration names to check + * @param defaultEnabled the value to return when no integration name is configured + * @return {@code true} if the JMX fetch integration is enabled * @deprecated This method should only be used internally. Use the instance getter instead {@link * #isJmxFetchIntegrationEnabled(Iterable, boolean)}. */ @@ -5826,9 +5826,9 @@ public > T getEnumValue( } /** - * @param integrationNames - * @param defaultEnabled - * @return + * @param integrationNames the integration names to check + * @param defaultEnabled the value to return when no integration name is configured + * @return {@code true} if the trace analytics integration is enabled * @deprecated This method should only be used internally. Use the instance getter instead {@link * #isTraceAnalyticsIntegrationEnabled(SortedSet, boolean)}. */ diff --git a/internal-api/src/main/java/datadog/trace/api/TagMap.java b/internal-api/src/main/java/datadog/trace/api/TagMap.java index 7e65b590276..f8f33f1c023 100644 --- a/internal-api/src/main/java/datadog/trace/api/TagMap.java +++ b/internal-api/src/main/java/datadog/trace/api/TagMap.java @@ -198,8 +198,8 @@ static Ledger ledger(int size) { * Similar to {@link Map#putAll(Map)} but optimized to quickly copy from one TagMap to another * *

For optimized TagMaps, this method takes advantage of the consistent TagMap layout to - * quickly handle each bucket. And similar to {@link TagMap#(Entry)} this method shares Entry - * objects from the source TagMap + * quickly handle each bucket. And similar to {@link TagMap#getAndSet(Entry)} this method shares + * Entry objects from the source TagMap */ void putAll(TagMap that); @@ -989,7 +989,7 @@ public boolean isDefinitelyEmpty() { * Provides the estimated size of the map created by the ledger Doesn't account for overwritten * entries or entry removal * - * @return + * @return the estimated size of the map created by the ledger */ public int estimateSize() { return this.nextPos; diff --git a/internal-api/src/main/java/datadog/trace/api/naming/NamingSchema.java b/internal-api/src/main/java/datadog/trace/api/naming/NamingSchema.java index 31b610887ee..9ddf3178f3b 100644 --- a/internal-api/src/main/java/datadog/trace/api/naming/NamingSchema.java +++ b/internal-api/src/main/java/datadog/trace/api/naming/NamingSchema.java @@ -51,14 +51,14 @@ public interface NamingSchema { /** * Policy for peer service tags calculation * - * @return + * @return the peer service naming policy */ ForPeerService peerService(); /** * If true, the schema allows having service names != DD_SERVICE * - * @return + * @return {@code true} if the schema allows service names different from {@code DD_SERVICE} */ boolean allowInferredServices(); @@ -222,7 +222,7 @@ interface ForPeerService { /** * Whenever the schema supports peer service calculation * - * @return + * @return {@code true} if the schema supports peer service calculation */ boolean supports(); diff --git a/internal-api/src/main/java/datadog/trace/api/remoteconfig/ServiceNameCollector.java b/internal-api/src/main/java/datadog/trace/api/remoteconfig/ServiceNameCollector.java index 664e1f1fe6f..838d3cf3157 100644 --- a/internal-api/src/main/java/datadog/trace/api/remoteconfig/ServiceNameCollector.java +++ b/internal-api/src/main/java/datadog/trace/api/remoteconfig/ServiceNameCollector.java @@ -57,7 +57,7 @@ public void addService(final String serviceName) { * Get the list of unique services deduplicated by case. There is no locking on the addService map * so, the method is not thread safe. * - * @return + * @return the list of unique services, or {@code null} if none have been collected */ @Nullable public List getServices() { diff --git a/internal-api/src/main/java/datadog/trace/api/sampling/SamplingMechanism.java b/internal-api/src/main/java/datadog/trace/api/sampling/SamplingMechanism.java index 36f9578709c..40ac7bf4990 100644 --- a/internal-api/src/main/java/datadog/trace/api/sampling/SamplingMechanism.java +++ b/internal-api/src/main/java/datadog/trace/api/sampling/SamplingMechanism.java @@ -74,9 +74,9 @@ public static boolean validateWithSamplingPriority(int mechanism, int priority) /** * Returns true if sampling priority lock can be avoided for the given mechanism and priority * - * @param mechanism - * @param priority - * @return + * @param priority the sampling priority + * @param mechanism the sampling mechanism + * @return {@code true} if the sampling priority lock can be avoided, {@code false} otherwise */ public static boolean canAvoidSamplingPriorityLock(int priority, int mechanism) { return (!Config.get().isApmTracingEnabled() && mechanism == SamplingMechanism.APPSEC) diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/URIDataAdapter.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/URIDataAdapter.java index 6536401f620..e2511b6e4be 100644 --- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/URIDataAdapter.java +++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/URIDataAdapter.java @@ -37,7 +37,7 @@ public interface URIDataAdapter { /** * The URI is a valid one or not (looks malformed) * - * @return + * @return {@code true} if the URI is valid, {@code false} if it looks malformed */ boolean isValid(); } diff --git a/internal-api/src/main/java/datadog/trace/util/Hashtable.java b/internal-api/src/main/java/datadog/trace/util/Hashtable.java index ff3202c1f33..84db05b9f01 100644 --- a/internal-api/src/main/java/datadog/trace/util/Hashtable.java +++ b/internal-api/src/main/java/datadog/trace/util/Hashtable.java @@ -618,8 +618,7 @@ public TEntry next() { /** * Mutating iterator over entries in a single bucket whose {@code keyHash} matches a specific - * search hash. Supports {@link #remove()} and {@link #replace(Entry)} to splice the chain in - * place. + * search hash. Supports {@link #remove()} and {@link #replace} to splice the chain in place. * *

Carries previous-node pointers for the current entry and the next-match entry so that {@code * remove} and {@code replace} can fix up the chain in O(1) without re-walking from the bucket diff --git a/utils/junit-utils/src/main/java/datadog/trace/junit/utils/config/WithConfig.java b/utils/junit-utils/src/main/java/datadog/trace/junit/utils/config/WithConfig.java index a77045210ca..c52635bd853 100644 --- a/utils/junit-utils/src/main/java/datadog/trace/junit/utils/config/WithConfig.java +++ b/utils/junit-utils/src/main/java/datadog/trace/junit/utils/config/WithConfig.java @@ -18,16 +18,16 @@ * *

Examples: * - * 

{@code
- * @WithConfig(key = "service", value = "my_service")
- * @WithConfig(key = "trace.resolver.enabled", value = "false")
+ * 
+ * @WithConfig(key = "service", value = "my_service")
+ * @WithConfig(key = "trace.resolver.enabled", value = "false")
  * class MyTest extends DDJavaSpecification {
  *
- *   @Test
- *   @WithConfig(key = "AGENT_HOST", value = "localhost", env = true)
+ *   @Test
+ *   @WithConfig(key = "AGENT_HOST", value = "localhost", env = true)
  *   void testWithEnv() { ... }
  * }
- * }

+ *
*/ @Retention(RUNTIME) @Target({TYPE, METHOD}) diff --git a/utils/test-utils/src/main/java/datadog/trace/test/util/ThreadUtils.java b/utils/test-utils/src/main/java/datadog/trace/test/util/ThreadUtils.java index 3dde0459573..8439c2c038a 100644 --- a/utils/test-utils/src/main/java/datadog/trace/test/util/ThreadUtils.java +++ b/utils/test-utils/src/main/java/datadog/trace/test/util/ThreadUtils.java @@ -9,35 +9,32 @@ public class ThreadUtils { + /** A {@link Runnable} whose {@link #run()} may throw a checked exception. */ + @FunctionalInterface + public interface ThrowingRunnable { + void run() throws Throwable; + } + /** - * Utility to easily run a Closure in parallel, i.e. in spock like this: + * Utility to easily run a piece of code in parallel, e.g. in a JUnit test like this: * * 
{@code
-   * def "some test"() {
-   *   expect:
-   *   runConcurrently(10, 100, {
-   *     def something = ...
-   *     def other = ...
-   *     assert something == other
-   *   })
-   * }
+   * runConcurrently(
+   *     10,
+   *     100,
+   *     () -> {
+   *       Object something = computeSomething();
+   *       Object other = computeOther();
+   *       assertEquals(something, other);
+   *     });
    * }
* - * Writing a spock extension was investigated, but it is not possible to run an Invocation - * multiple times concurrently since a lot of the spock internal state and mock scoping is not - * thread safe. - * * @param concurrency the number of concurrent invocations * @param totalInvocations the total number of invocations - * @param closure the closure to run - * @return true if everything went well + * @param runnable the code to run + * @return {@code true} if everything went well * @throws Throwable if anything went wrong */ - @FunctionalInterface - public interface ThrowingRunnable { - void run() throws Throwable; - } - public static boolean runConcurrently( final int concurrency, final int totalInvocations, final ThrowingRunnable runnable) throws Throwable { From 4e7bb7b6a8bc6e18b98d9a12092a491c58b9c70f Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Fri, 26 Jun 2026 10:33:35 -0400 Subject: [PATCH 052/139] Fix buildSrc Gradle warnings (#11746) Fix buildSrc Gradle warnings Co-authored-by: alexey.kuznetsov --- .../plugin/instrument/BuildTimeInstrumentationPlugin.kt | 1 - .../kotlin/datadog/gradle/plugin/sca/ScaEnrichmentsPlugin.kt | 4 ++-- .../src/main/kotlin/dd-trace-java.gradle-debug.gradle.kts | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/buildSrc/src/main/kotlin/datadog/gradle/plugin/instrument/BuildTimeInstrumentationPlugin.kt b/buildSrc/src/main/kotlin/datadog/gradle/plugin/instrument/BuildTimeInstrumentationPlugin.kt index d347cfd689c..e89a7f13ea0 100644 --- a/buildSrc/src/main/kotlin/datadog/gradle/plugin/instrument/BuildTimeInstrumentationPlugin.kt +++ b/buildSrc/src/main/kotlin/datadog/gradle/plugin/instrument/BuildTimeInstrumentationPlugin.kt @@ -56,7 +56,6 @@ class BuildTimeInstrumentationPlugin : Plugin { project.extensions.create("buildTimeInstrumentation") project.configurations.register(BUILD_TIME_INSTRUMENTATION_PLUGIN_CONFIGURATION) { - isVisible = false isCanBeConsumed = false isCanBeResolved = true } diff --git a/buildSrc/src/main/kotlin/datadog/gradle/plugin/sca/ScaEnrichmentsPlugin.kt b/buildSrc/src/main/kotlin/datadog/gradle/plugin/sca/ScaEnrichmentsPlugin.kt index fc1a4252190..c0812cb895d 100644 --- a/buildSrc/src/main/kotlin/datadog/gradle/plugin/sca/ScaEnrichmentsPlugin.kt +++ b/buildSrc/src/main/kotlin/datadog/gradle/plugin/sca/ScaEnrichmentsPlugin.kt @@ -4,7 +4,7 @@ import datadog.gradle.sca.GhsaEnrichmentParser import groovy.json.JsonOutput import groovy.json.JsonSlurper import java.net.HttpURLConnection -import java.net.URL +import java.net.URI import org.gradle.api.GradleException import org.gradle.api.Plugin import org.gradle.api.Project @@ -89,7 +89,7 @@ class ScaEnrichmentsPlugin : Plugin { } private fun githubConnect(url: String, token: String?): HttpURLConnection { - val connection = URL(url).openConnection() as HttpURLConnection + val connection = URI.create(url).toURL().openConnection() as HttpURLConnection connection.setRequestProperty("Accept", "application/vnd.github+json") connection.setRequestProperty("X-GitHub-Api-Version", "2022-11-28") if (!token.isNullOrEmpty()) { diff --git a/buildSrc/src/main/kotlin/dd-trace-java.gradle-debug.gradle.kts b/buildSrc/src/main/kotlin/dd-trace-java.gradle-debug.gradle.kts index 2e50d9ee687..22e509ea755 100644 --- a/buildSrc/src/main/kotlin/dd-trace-java.gradle-debug.gradle.kts +++ b/buildSrc/src/main/kotlin/dd-trace-java.gradle-debug.gradle.kts @@ -41,7 +41,7 @@ fun getJdkFromCompilerOptions(co: CompileOptions): String? { fun printJdkForProjectTasks(project: Project, logFile: File) { project.tasks.forEach { task -> val data = mutableMapOf() - data["task"] = task.path.toString() + data["task"] = task.path if (task is JavaExec) { val launcher = task.javaLauncher.get() data["jdk"] = launcher.metadata.languageVersion.toString() From 265cec1099fa178ba4176d234791df4a609d283a Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Fri, 26 Jun 2026 12:25:28 -0400 Subject: [PATCH 053/139] Bump Guava to 33.6.0-jre and drop redundant usage (#11722) Bump and clean guava library usages. Merge branch 'master' into alexeyk/bump-and-clean-guava # Conflicts: # gradle/libs.versions.toml Fixed failed test that hard linked to old Guava. Drop unused guava. Use Java built-in charsets. Merge branch 'master' into alexeyk/bump-and-clean-guava Lock files updated. Merge branch 'master' into alexeyk/bump-and-clean-guava Merge branch 'master' into alexeyk/bump-and-clean-guava # Conflicts: # dd-java-agent/instrumentation/glassfish-3.0/gradle.lockfile # dd-java-agent/instrumentation/grizzly/grizzly-2.0/gradle.lockfile # dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/gradle.lockfile # dd-java-agent/instrumentation/kafka/kafka-clients-0.11/gradle.lockfile # dd-java-agent/instrumentation/kafka/kafka-clients-3.8/gradle.lockfile # dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/gradle.lockfile Fixed lock file. Fixed review notes. Merge branch 'master' into alexeyk/bump-and-clean-guava Pin guava for old cassandra. Cleanup not needed guava pin for SofaRpc. Cleanup for cassandra. Merge branch 'master' into alexeyk/bump-and-clean-guava Co-authored-by: alexey.kuznetsov --- .../codeowners/CodeownersTest.groovy | 8 ++-- dd-java-agent/agent-iast/build.gradle | 1 - dd-java-agent/agent-iast/gradle.lockfile | 1 - .../iast/util/ObjectVisitorTest.groovy | 3 +- .../profiling-controller/gradle.lockfile | 7 ++- .../profiling-testing/gradle.lockfile | 7 ++- dd-java-agent/gradle.lockfile | 7 ++- .../instrumentation-testing/gradle.lockfile | 8 +++- .../datastax-cassandra-3.0/build.gradle | 8 +++- .../dropwizard/dropwizard-0.8/build.gradle | 8 ++++ .../dropwizard/dropwizard-0.8/gradle.lockfile | 6 ++- .../glassfish-3.0/gradle.lockfile | 8 +++- .../grizzly/grizzly-2.0/build.gradle | 7 +++ .../grizzly/grizzly-2.0/gradle.lockfile | 9 +++- .../java-concurrent-1.8/gradle.lockfile | 8 +++- .../kafka/kafka-clients-0.11/gradle.lockfile | 8 +++- .../kafka/kafka-clients-3.8/gradle.lockfile | 9 ++-- .../src/test/groovy/OpenAiTest.groovy | 5 ++- .../jax-rs-client-2.0/build.gradle | 7 +++ .../jax-rs-client-2.0/gradle.lockfile | 9 +++- .../sofarpc/sofarpc-5.0/build.gradle | 5 --- .../sofarpc/sofarpc-5.0/gradle.lockfile | 13 +++--- .../test/filter/FilteredAppConfig.groovy | 43 +++++++++---------- dd-java-agent/load-generator/gradle.lockfile | 7 ++- dd-java-agent/testing/gradle.lockfile | 7 ++- dd-trace-api/build.gradle.kts | 1 - dd-trace-api/gradle.lockfile | 1 - .../correlation-id-injection/build.gradle.kts | 1 - .../correlation-id-injection/gradle.lockfile | 7 ++- gradle/libs.versions.toml | 2 +- 30 files changed, 151 insertions(+), 70 deletions(-) diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/codeowners/CodeownersTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/codeowners/CodeownersTest.groovy index b30070f5a1d..d73ddf08d52 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/codeowners/CodeownersTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/codeowners/CodeownersTest.groovy @@ -1,15 +1,15 @@ package datadog.trace.civisibility.codeowners -import com.google.common.base.Charsets +import static java.nio.charset.StandardCharsets.UTF_8 + import spock.lang.Specification class CodeownersTest extends Specification { def "test codeowners matching: #path"() { setup: - def codeowners = new InputStreamReader(CodeownersTest.getClassLoader().getResourceAsStream("ci/codeowners/CODEOWNERS_sample"), Charsets.UTF_8).withCloseable { reader -> - CodeownersImpl.parse(reader) - } + def codeowners = new InputStreamReader(CodeownersTest.getClassLoader().getResourceAsStream("ci/codeowners/CODEOWNERS_sample"), UTF_8) + .withCloseable { reader -> CodeownersImpl.parse(reader) } when: def owners = codeowners.getOwners(path) diff --git a/dd-java-agent/agent-iast/build.gradle b/dd-java-agent/agent-iast/build.gradle index 2433fd496b0..1909cf4bdc2 100644 --- a/dd-java-agent/agent-iast/build.gradle +++ b/dd-java-agent/agent-iast/build.gradle @@ -51,7 +51,6 @@ dependencies { testImplementation project(':dd-java-agent:agent-bootstrap') testImplementation('org.skyscreamer:jsonassert:1.5.1') testImplementation(libs.bytebuddy) - testImplementation(libs.guava) testImplementation(libs.groovy.yaml) diff --git a/dd-java-agent/agent-iast/gradle.lockfile b/dd-java-agent/agent-iast/gradle.lockfile index d7c1f129d4a..823a3d81a32 100644 --- a/dd-java-agent/agent-iast/gradle.lockfile +++ b/dd-java-agent/agent-iast/gradle.lockfile @@ -51,7 +51,6 @@ com.google.errorprone:error_prone_type_annotations:2.23.0=annotationProcessor,er com.google.errorprone:javac:9+181-r4173-1=errorproneJavac com.google.guava:failureaccess:1.0.1=annotationProcessor,errorprone,jmhAnnotationProcessor,jmhRuntimeClasspath,testAnnotationProcessor,testCompileProtoPath,testRuntimeClasspath com.google.guava:guava-parent:32.1.1-jre=annotationProcessor,errorprone,jmhAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath com.google.guava:guava:30.1.1-android=jmhRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath com.google.guava:guava:32.1.1-jre=annotationProcessor,errorprone,jmhAnnotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=jmhRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/util/ObjectVisitorTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/util/ObjectVisitorTest.groovy index 9e66caabc0f..d0c36aaf8f4 100644 --- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/util/ObjectVisitorTest.groovy +++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/util/ObjectVisitorTest.groovy @@ -1,6 +1,5 @@ package com.datadog.iast.util -import com.google.common.collect.Iterables import foo.bar.VisitableClass import spock.lang.Specification @@ -40,7 +39,7 @@ class ObjectVisitorTest extends Specification { given: final visitor = Mock(ObjectVisitor.Visitor) final wrapped = ['1', '2', '3'] - final target = Iterables.unmodifiableIterable(wrapped) + final Iterable target = wrapped.&iterator as Iterable when: ObjectVisitor.visit(target, visitor) { Iterable.isAssignableFrom(it) } diff --git a/dd-java-agent/agent-profiling/profiling-controller/gradle.lockfile b/dd-java-agent/agent-profiling/profiling-controller/gradle.lockfile index a49f7b8e506..28d9d4ed4d7 100644 --- a/dd-java-agent/agent-profiling/profiling-controller/gradle.lockfile +++ b/dd-java-agent/agent-profiling/profiling-controller/gradle.lockfile @@ -12,7 +12,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.thoughtworks.qdox:qdox:1.12.1=codenarc commons-io:commons-io:2.20.0=spotbugs de.thetaphi:forbiddenapis:3.10=compileClasspath @@ -47,6 +51,7 @@ org.jacoco:org.jacoco.agent:0.8.14=jacocoAgent,jacocoAnt org.jacoco:org.jacoco.ant:0.8.14=jacocoAnt org.jacoco:org.jacoco.core:0.8.14=jacocoAnt org.jacoco:org.jacoco.report:0.8.14=jacocoAnt +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-profiling/profiling-testing/gradle.lockfile b/dd-java-agent/agent-profiling/profiling-testing/gradle.lockfile index 8007edd00f4..5bd509e5f3c 100644 --- a/dd-java-agent/agent-profiling/profiling-testing/gradle.lockfile +++ b/dd-java-agent/agent-profiling/profiling-testing/gradle.lockfile @@ -12,7 +12,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:mockwebserver:3.12.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okio:okio:1.15.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -55,6 +59,7 @@ org.jacoco:org.jacoco.ant:0.8.14=jacocoAnt org.jacoco:org.jacoco.core:0.8.14=jacocoAnt org.jacoco:org.jacoco.report:0.8.14=jacocoAnt org.javadelight:delight-fileupload:0.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/gradle.lockfile b/dd-java-agent/gradle.lockfile index ca06c77fbfd..1e7c38326f7 100644 --- a/dd-java-agent/gradle.lockfile +++ b/dd-java-agent/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=sharedShadowInclude,testRuntimeClasspath,traceShadowInclude com.squareup.moshi:moshi:1.11.0=sharedShadowInclude,testCompileClasspath,testRuntimeClasspath,traceShadowInclude com.squareup.okhttp3:mockwebserver:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -72,6 +76,7 @@ org.hamcrest:hamcrest-core:1.3=testCompileClasspath,testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=sharedShadowInclude,testRuntimeClasspath,traceShadowInclude org.jctools:jctools-core:4.0.6=sharedShadowInclude,testRuntimeClasspath,traceShadowInclude +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation-testing/gradle.lockfile b/dd-java-agent/instrumentation-testing/gradle.lockfile index 70089b8281a..47a34bc81f1 100644 --- a/dd-java-agent/instrumentation-testing/gradle.lockfile +++ b/dd-java-agent/instrumentation-testing/gradle.lockfile @@ -33,11 +33,14 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testAnnotationPr com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=testAnnotationProcessor -com.google.guava:guava:20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=runtimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -86,6 +89,7 @@ org.hamcrest:hamcrest-core:1.3=compileClasspath,runtimeClasspath,testCompileClas org.hamcrest:hamcrest:3.0=compileClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=runtimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=runtimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=runtimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/build.gradle b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/build.gradle index 0eba6eadd02..d8dc5c49f88 100644 --- a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/build.gradle +++ b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/build.gradle @@ -40,7 +40,6 @@ muzzle { apply from: "$rootDir/gradle/java.gradle" - testJvmConstraints { // Test use Cassandra 3 which requires Java 8. (Currently incompatible with Java 9.) maxJavaVersion = JavaVersion.VERSION_1_8 @@ -49,6 +48,13 @@ testJvmConstraints { addTestSuiteForDir('latestDepTest', 'test') dependencies { + constraints { + testImplementation("com.google.guava:guava") { + version { strictly "19.0" } + because "cassandra-driver-core 3.x is not compatible with Guava 20+" + } + } + compileOnly group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '3.0.0' compileOnly group: 'com.google.guava', name: 'guava', version: '18.0' diff --git a/dd-java-agent/instrumentation/dropwizard/dropwizard-0.8/build.gradle b/dd-java-agent/instrumentation/dropwizard/dropwizard-0.8/build.gradle index c5d82fd530e..82925a513e6 100644 --- a/dd-java-agent/instrumentation/dropwizard/dropwizard-0.8/build.gradle +++ b/dd-java-agent/instrumentation/dropwizard/dropwizard-0.8/build.gradle @@ -23,3 +23,11 @@ dependencies { // Anything 1.0+ fails with a java.lang.NoClassDefFoundError: org/eclipse/jetty/server/RequestLog // latestDepTestImplementation group: 'io.dropwizard', name: 'dropwizard-testing', version: '1.+' } + +// Dropwizard 0.8 (via Jackson's FuzzyEnumModule) references the CharMatcher.WHITESPACE field, +// which present only until 25.1-jre. +['testCompileClasspath', 'testRuntimeClasspath'].each { + configurations.named(it) { + resolutionStrategy.force 'com.google.guava:guava:25.1-jre' + } +} diff --git a/dd-java-agent/instrumentation/dropwizard/dropwizard-0.8/gradle.lockfile b/dd-java-agent/instrumentation/dropwizard/dropwizard-0.8/gradle.lockfile index 711322244e5..485ed9de324 100644 --- a/dd-java-agent/instrumentation/dropwizard/dropwizard-0.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/dropwizard/dropwizard-0.8/gradle.lockfile @@ -42,12 +42,14 @@ com.google.auto.service:auto-service:1.1.1=annotationProcessor,testAnnotationPro com.google.auto:auto-common:1.2.1=annotationProcessor,testAnnotationProcessor com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs +com.google.errorprone:error_prone_annotations:2.1.3=testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:18.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:25.1-jre=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:1.1=testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath @@ -110,6 +112,7 @@ org.apache.logging.log4j:log4j-api:2.25.2=spotbugs org.apache.logging.log4j:log4j-core:2.25.2=spotbugs org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.assertj:assertj-core:1.7.1=testCompileClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:2.0.0=testCompileClasspath,testRuntimeClasspath org.checkerframework:checker-qual:3.33.0=annotationProcessor,testAnnotationProcessor org.codehaus.groovy:groovy-ant:3.0.23=codenarc org.codehaus.groovy:groovy-docgenerator:3.0.23=codenarc @@ -120,6 +123,7 @@ org.codehaus.groovy:groovy-templates:3.0.23=codenarc org.codehaus.groovy:groovy-xml:3.0.23=codenarc org.codehaus.groovy:groovy:3.0.23=codenarc org.codehaus.groovy:groovy:3.0.25=testCompileClasspath,testRuntimeClasspath +org.codehaus.mojo:animal-sniffer-annotations:1.14=testCompileClasspath,testRuntimeClasspath org.codenarc:CodeNarc:3.7.0=codenarc org.dom4j:dom4j:2.2.0=spotbugs org.eclipse.jetty.toolchain.setuid:jetty-setuid-java:1.0.2=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/glassfish-3.0/gradle.lockfile b/dd-java-agent/instrumentation/glassfish-3.0/gradle.lockfile index 7f1dd8abccc..671f09a1021 100644 --- a/dd-java-agent/instrumentation/glassfish-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/glassfish-3.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -86,6 +89,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-2.0/build.gradle b/dd-java-agent/instrumentation/grizzly/grizzly-2.0/build.gradle index 4dc46f8d760..11610568ae6 100644 --- a/dd-java-agent/instrumentation/grizzly/grizzly-2.0/build.gradle +++ b/dd-java-agent/instrumentation/grizzly/grizzly-2.0/build.gradle @@ -30,3 +30,10 @@ configurations.named('testRuntimeOnly') { // jersey-container-grizzly2-http transitively imports its own set repackaged asm classes exclude group: 'org.ow2.asm' } + +// Jersey 2.0 links to Guava's removed MoreExecutors.sameThreadExecutor method. +['testCompileClasspath', 'testRuntimeClasspath'].each { + configurations.named(it) { + resolutionStrategy.force 'com.google.guava:guava:20.0' + } +} diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-2.0/gradle.lockfile b/dd-java-agent/instrumentation/grizzly/grizzly-2.0/gradle.lockfile index 87b342bd4d2..29468c69d11 100644 --- a/dd-java-agent/instrumentation/grizzly/grizzly-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/grizzly/grizzly-2.0/gradle.lockfile @@ -32,11 +32,15 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -128,6 +132,7 @@ org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClas org.javassist:javassist:3.30.2-GA=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/gradle.lockfile b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/gradle.lockfile index 20467fb3bed..b10689b9cb9 100644 --- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -86,6 +89,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/gradle.lockfile b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/gradle.lockfile index 98caaf516a5..10f27255ca7 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/gradle.lockfile +++ b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/gradle.lockfile @@ -50,11 +50,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,iastL com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,iastLatestDepTest3AnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,iastLatestDepTest3AnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,iastLatestDepTest3AnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,iastLatestDepTest3AnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,iastLatestDepTest3AnnotationProcessor,iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,iastLatestDepTest3AnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=iastLatestDepTest3RuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -145,6 +148,7 @@ org.hamcrest:hamcrest-core:1.3=iastLatestDepTest3RuntimeClasspath,latestDepTestR org.hamcrest:hamcrest:3.0=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=iastLatestDepTest3RuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=iastLatestDepTest3RuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=iastLatestDepTest3RuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/gradle.lockfile b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/gradle.lockfile index 26abfb293ee..c5c9f5a23f8 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/gradle.lockfile @@ -42,14 +42,16 @@ com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepForkedTe com.google.auto:auto-common:1.2.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs -com.google.errorprone:error_prone_annotations:2.10.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -167,6 +169,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepForkedTestRuntimeClasspath,latestDepTest org.hamcrest:hamcrest:3.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/test/groovy/OpenAiTest.groovy b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/test/groovy/OpenAiTest.groovy index 9d3b8c4ec01..4dbc4e9c05a 100644 --- a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/test/groovy/OpenAiTest.groovy +++ b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/test/groovy/OpenAiTest.groovy @@ -1,4 +1,5 @@ -import com.google.common.base.Charsets +import static java.nio.charset.StandardCharsets.UTF_8 + import com.google.common.base.Strings import com.openai.client.OpenAIClient import com.openai.client.okhttp.OkHttpClient @@ -61,7 +62,7 @@ abstract class OpenAiTest extends InstrumentationSpecification { handlers { prefix("/$API_VERSION/") { def requestBody = request.text - def recFile = RequestResponseRecord.requestToFileName("POST", requestBody.getBytes(Charsets.UTF_8)) + def recFile = RequestResponseRecord.requestToFileName("POST", requestBody.getBytes(UTF_8)) def rec = cache.get(recFile) if (rec == null) { String path = request.path diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/build.gradle b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/build.gradle index d815a85207e..3cab406b467 100644 --- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/build.gradle +++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/build.gradle @@ -41,3 +41,10 @@ dependencies { latestDepTestImplementation group: 'org.apache.cxf', name: 'cxf-rt-rs-client', version: '3.2.6' latestDepTestImplementation group: 'org.jboss.resteasy', name: 'resteasy-client', version: '3.0.26.Final' } + +// Jersey 2.0 links to Guava's removed MoreExecutors.sameThreadExecutor method. +['testCompileClasspath', 'testRuntimeClasspath'].each { + configurations.named(it) { + resolutionStrategy.force 'com.google.guava:guava:20.0' + } +} diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/gradle.lockfile b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/gradle.lockfile index 9491550ef7a..1b7f309fbec 100644 --- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/gradle.lockfile @@ -33,11 +33,15 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -145,6 +149,7 @@ org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec:1.0.0.Final=lates org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.0_spec:1.0.1.Beta1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/build.gradle b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/build.gradle index 90385de3196..1d7ef979c0d 100644 --- a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/build.gradle +++ b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/build.gradle @@ -25,15 +25,10 @@ dependencies { testImplementation group: "io.grpc", name: "grpc-stub", version: "1.53.0" testImplementation group: "com.google.protobuf", name: "protobuf-java", version: "3.25.3" testImplementation group: "com.alibaba", name: "fastjson", version: "1.2.83" - testImplementation group: "com.google.guava", name: "guava", version: "32.1.3-jre" latestDepTestImplementation group: "com.alipay.sofa", name: "sofa-rpc-all", version: "+" constraints { - testImplementation("com.google.guava:guava:32.1.3-jre") { - because "sofa-rpc-all may bring an older guava version; pin to match the direct test dependency" - } - // Regression fix for Gradle 9.6.0 (should be fixed in 9.7.0) // // The `sofa-rpc-all:5.14.2` brings `netty-all:4.1.44.Final`, which is a fat jar, diff --git a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/gradle.lockfile b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/gradle.lockfile index 87fc7532ff7..87b2a4fa8d3 100644 --- a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/gradle.lockfile @@ -68,17 +68,18 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.code.gson:gson:2.9.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.errorprone:error_prone_annotations:2.21.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:16.0.1=compileClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:32.1.3-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.http-client:google-http-client-gson:1.41.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.http-client:google-http-client:1.41.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.j2objc:j2objc-annotations:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath +com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.protobuf:protobuf-java-util:3.21.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.protobuf:protobuf-java:3.25.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.6=latestDepTestCompileClasspath,testCompileClasspath @@ -189,7 +190,6 @@ org.apache.logging.log4j:log4j-api:2.25.2=spotbugs org.apache.logging.log4j:log4j-core:2.25.2=spotbugs org.apiguardian:apiguardian-api:1.1.2=latestDepTestCompileClasspath,testCompileClasspath org.checkerframework:checker-qual:3.33.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -org.checkerframework:checker-qual:3.37.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.groovy:groovy-ant:3.0.23=codenarc org.codehaus.groovy:groovy-docgenerator:3.0.23=codenarc org.codehaus.groovy:groovy-groovydoc:3.0.23=codenarc @@ -219,6 +219,7 @@ org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec:1.0.2.Final=compileClasspath org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.3_spec:1.0.1.Final=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/test/groovy/test/filter/FilteredAppConfig.groovy b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/test/groovy/test/filter/FilteredAppConfig.groovy index 874fbefb5e1..f787fafbf82 100644 --- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/test/groovy/test/filter/FilteredAppConfig.groovy +++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/test/groovy/test/filter/FilteredAppConfig.groovy @@ -1,7 +1,26 @@ package test.filter -import com.google.common.base.Charsets +import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_URLENCODED +import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.ERROR +import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.EXCEPTION +import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.FORWARDED +import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.PATH_PARAM +import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.QUERY_ENCODED_BOTH +import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.QUERY_ENCODED_QUERY +import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.QUERY_PARAM +import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.REDIRECT +import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.SUCCESS +import static java.nio.charset.StandardCharsets.UTF_8 + import datadog.trace.agent.test.base.HttpServerTest +import javax.servlet.Filter +import javax.servlet.FilterChain +import javax.servlet.FilterConfig +import javax.servlet.ServletException +import javax.servlet.ServletRequest +import javax.servlet.ServletResponse +import javax.servlet.http.HttpServletRequest +import javax.servlet.http.HttpServletResponse import org.apache.catalina.connector.Connector import org.springframework.boot.autoconfigure.SpringBootApplication import org.springframework.boot.context.embedded.EmbeddedServletContainerFactory @@ -22,26 +41,6 @@ import org.springframework.web.context.request.NativeWebRequest import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter -import javax.servlet.Filter -import javax.servlet.FilterChain -import javax.servlet.FilterConfig -import javax.servlet.ServletException -import javax.servlet.ServletRequest -import javax.servlet.ServletResponse -import javax.servlet.http.HttpServletRequest -import javax.servlet.http.HttpServletResponse - -import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_URLENCODED -import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.ERROR -import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.EXCEPTION -import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.FORWARDED -import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.PATH_PARAM -import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.QUERY_ENCODED_BOTH -import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.QUERY_ENCODED_QUERY -import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.QUERY_PARAM -import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.REDIRECT -import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.SUCCESS - @SpringBootApplication class FilteredAppConfig extends WebMvcConfigurerAdapter { @@ -90,7 +89,7 @@ class FilteredAppConfig extends WebMvcConfigurerAdapter { @Override protected void writeInternal(Map stringObjectMap, HttpOutputMessage outputMessage) throws IOException, HttpMessageNotWritableException { - StreamUtils.copy(stringObjectMap.get("message"), Charsets.UTF_8, outputMessage.getBody()) + StreamUtils.copy(stringObjectMap.get("message"), UTF_8, outputMessage.getBody()) } } } diff --git a/dd-java-agent/load-generator/gradle.lockfile b/dd-java-agent/load-generator/gradle.lockfile index 53e385c2974..7d85b0756fd 100644 --- a/dd-java-agent/load-generator/gradle.lockfile +++ b/dd-java-agent/load-generator/gradle.lockfile @@ -25,7 +25,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=runtimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=runtimeClasspath,testRuntimeClasspath com.squareup.okio:okio:1.17.5=runtimeClasspath,testRuntimeClasspath @@ -65,6 +69,7 @@ org.gmetrics:GMetrics:2.1.0=codenarc org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=runtimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=runtimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/testing/gradle.lockfile b/dd-java-agent/testing/gradle.lockfile index 437b96b153b..0197fa506ef 100644 --- a/dd-java-agent/testing/gradle.lockfile +++ b/dd-java-agent/testing/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=runtimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -84,6 +88,7 @@ org.jacoco:org.jacoco.core:0.8.14=jacocoAnt org.jacoco:org.jacoco.report:0.8.14=jacocoAnt org.jctools:jctools-core-jdk11:4.0.6=runtimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=runtimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-trace-api/build.gradle.kts b/dd-trace-api/build.gradle.kts index 5382eeeb019..4063701bf5a 100644 --- a/dd-trace-api/build.gradle.kts +++ b/dd-trace-api/build.gradle.kts @@ -71,7 +71,6 @@ description = "dd-trace-api" dependencies { api(libs.slf4j) - testImplementation(libs.guava) testImplementation(libs.bundles.mockito) testImplementation(project(":utils:test-utils")) } diff --git a/dd-trace-api/gradle.lockfile b/dd-trace-api/gradle.lockfile index 4ae92e1e87a..cf017a396e3 100644 --- a/dd-trace-api/gradle.lockfile +++ b/dd-trace-api/gradle.lockfile @@ -12,7 +12,6 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.thoughtworks.qdox:qdox:1.12.1=codenarc commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClasspath commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-trace-ot/correlation-id-injection/build.gradle.kts b/dd-trace-ot/correlation-id-injection/build.gradle.kts index ad70a7334f9..0a39e67a1eb 100644 --- a/dd-trace-ot/correlation-id-injection/build.gradle.kts +++ b/dd-trace-ot/correlation-id-injection/build.gradle.kts @@ -23,7 +23,6 @@ dependencies { compileOnly("org.apache.logging.log4j:log4j-api:$log4j2") compileOnly("log4j:log4j:$log4j1") - testImplementation(libs.guava) testImplementation(project(":dd-trace-ot")) testImplementation(project(":dd-java-agent:testing")) testImplementation(libs.bundles.mockito) diff --git a/dd-trace-ot/correlation-id-injection/gradle.lockfile b/dd-trace-ot/correlation-id-injection/gradle.lockfile index 8029e76f2df..3e107c8796f 100644 --- a/dd-trace-ot/correlation-id-injection/gradle.lockfile +++ b/dd-trace-ot/correlation-id-injection/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -84,6 +88,7 @@ org.jacoco:org.jacoco.core:0.8.14=jacocoAnt org.jacoco:org.jacoco.report:0.8.14=jacocoAnt org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9671e511d41..6ed047edda2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -52,7 +52,7 @@ cafe_crypto = "0.1.0" # Common utils commons = "3.2" -guava = "[16.0,20.0]" # Last version to support Java 7 +guava = "33.6.0-jre" javaparser = "3.28.2" jctools = "4.0.6" lz4 = "1.11.0" From 35096e2567144f56c0e56847ac281b9dffe59d0e Mon Sep 17 00:00:00 2001 From: Andrea Marziali Date: Fri, 26 Jun 2026 20:29:34 +0200 Subject: [PATCH 054/139] Add RxJava 3 instrumentation (#11506) Scaffold rxjava-3.0 instrumentation module Co-Authored-By: Claude Opus 4.8 (1M context) Add rxjava-3.0 Tracing observer/subscriber wrappers Co-Authored-By: Claude Opus 4.8 (1M context) Add rxjava-3.0 type instrumentations, module and async result extension Co-Authored-By: Claude Opus 4.8 (1M context) Register rxjava3 async result extension for Graal native-image Co-Authored-By: Claude Opus 4.8 (1M context) Add rxjava-3.0 SubscriptionTest Co-Authored-By: Claude Opus 4.8 (1M context) Add rxjava-3.0 core context propagation test Co-Authored-By: Claude Opus 4.8 (1M context) Fix pending-trace leak from RxJava3 AbstractDirectTask static initializer RxJava 3 introduced io.reactivex.rxjava3.internal.schedulers.AbstractDirectTask, whose static initializer constructs FINISHED/DISPOSED sentinel FutureTask instances. When that initializer first runs under an active trace (e.g. the first delay/timeout scheduler hop inside a span), the executor instrumentation captures a ScopeContinuation on those static singletons that is never cancelled, leaking the pending trace so it is never reported. Disable async propagation while AbstractDirectTask's type initializer runs, mirroring the existing reactor.core.scheduler.SchedulerTask/WorkerTask handling. The matcher is inert unless RxJava 3 is on the classpath. RxJava 2 has no equivalent class. Restores the delayed-Maybe coverage in RxJava3Test, which fails without this fix and passes with it. Co-Authored-By: Claude Opus 4.8 (1M context) Add rxjava-3.0 @WithSpan async result extension test Co-Authored-By: Claude Opus 4.8 (1M context) Add rxjava-3.0 Java 8 interop context-propagation investigation test Co-Authored-By: Claude Opus 4.8 (1M context) Unify rxjava-3.0 test package under testdog.trace.instrumentation.rxjava3 Two tests were under datadog.trace.instrumentation.rxjava3 while the @Trace-using tests must live under testdog.* (the agent ignores datadog.* for instrumentation). Move all four tests to testdog.* for consistency. Co-Authored-By: Claude Opus 4.8 (1M context) review Add config json entry Skip root context capture in Observable and Single CaptureParentSpanAdvice Add scheduler context propagation and no-spurious-traces tests for Observable and Single Fix misleading comment in correctParentsFromSubscriptionTime test Extend cancel test to cover all five reactive types Ensure publisher-parent span is always finished in cancelUnderTrace Normalize PropagateParentSpanAdvice guard and add @Nonnull to TracingObserver spotless spotless Extend SubscriptionTest to cover all five RxJava 3 reactive types Add cancelledNever test to cover dispose-path span lifecycle in RxJava3ResultExtensionTest Co-authored-by: ValentinZakharov Co-authored-by: devflow.devflow-routing-intake --- ...veImageGeneratorRunnerInstrumentation.java | 1 + ...syncPropagatingDisableInstrumentation.java | 15 + .../rxjava/rxjava-3.0/build.gradle | 36 + .../rxjava3/CompletableInstrumentation.java | 73 ++ .../rxjava3/FlowableInstrumentation.java | 72 ++ .../rxjava3/MaybeInstrumentation.java | 70 ++ .../rxjava3/ObservableInstrumentation.java | 71 ++ .../rxjava3/RxJavaAsyncResultExtension.java | 68 ++ .../instrumentation/rxjava3/RxJavaModule.java | 51 ++ .../rxjava3/SingleInstrumentation.java | 71 ++ .../rxjava3/TracingCompletableObserver.java | 38 + .../rxjava3/TracingMaybeObserver.java | 45 ++ .../rxjava3/TracingObserver.java | 45 ++ .../rxjava3/TracingSingleObserver.java | 38 + .../rxjava3/TracingSubscriber.java | 45 ++ .../annotatedsample/RxJava3TracedMethods.java | 137 ++++ .../rxjava3/RxJava3InteropTest.java | 162 +++++ .../rxjava3/RxJava3ResultExtensionTest.java | 242 +++++++ .../instrumentation/rxjava3/RxJava3Test.java | 674 ++++++++++++++++++ .../rxjava3/SubscriptionTest.java | 162 +++++ metadata/supported-configurations.json | 8 + settings.gradle.kts | 1 + 22 files changed, 2125 insertions(+) create mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/build.gradle create mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/CompletableInstrumentation.java create mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/FlowableInstrumentation.java create mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/MaybeInstrumentation.java create mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/ObservableInstrumentation.java create mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/RxJavaAsyncResultExtension.java create mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/RxJavaModule.java create mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/SingleInstrumentation.java create mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingCompletableObserver.java create mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingMaybeObserver.java create mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingObserver.java create mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingSingleObserver.java create mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingSubscriber.java create mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/annotatedsample/RxJava3TracedMethods.java create mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3InteropTest.java create mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3ResultExtensionTest.java create mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3Test.java create mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/SubscriptionTest.java diff --git a/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/NativeImageGeneratorRunnerInstrumentation.java b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/NativeImageGeneratorRunnerInstrumentation.java index 7fa0195e70e..8ab84d9b8af 100644 --- a/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/NativeImageGeneratorRunnerInstrumentation.java +++ b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/NativeImageGeneratorRunnerInstrumentation.java @@ -157,6 +157,7 @@ public static void onEnter(@Advice.Argument(value = 0, readOnly = false) String[ + "datadog.trace.instrumentation.reactivestreams.ReactiveStreamsAsyncResultExtension:build_time," + "datadog.trace.instrumentation.reactor.core.ReactorAsyncResultExtension:build_time," + "datadog.trace.instrumentation.rxjava2.RxJavaAsyncResultExtension:build_time," + + "datadog.trace.instrumentation.rxjava3.RxJavaAsyncResultExtension:build_time," + "datadog.trace.logging.ddlogger.DDLogger:build_time," + "datadog.trace.logging.ddlogger.DDLoggerFactory:build_time," + "datadog.trace.logging.ddlogger.DDLoggerFactory$HelperWrapper:build_time," diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/AsyncPropagatingDisableInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/AsyncPropagatingDisableInstrumentation.java index 94c94573032..5c4dcae8ea2 100644 --- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/AsyncPropagatingDisableInstrumentation.java +++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/AsyncPropagatingDisableInstrumentation.java @@ -47,6 +47,17 @@ public AsyncPropagatingDisableInstrumentation() { namedOneOf("reactor.core.scheduler.SchedulerTask", "reactor.core.scheduler.WorkerTask"); private static final ElementMatcher RXJAVA2_DISABLED_TYPE_INITIALIZERS = named("io.reactivex.internal.schedulers.AbstractDirectTask"); + + /** + * RxJava 3's AbstractDirectTask creates FINISHED/DISPOSED sentinel FutureTask instances in its + * static initializer. If that initializer runs while a trace is active (e.g. the first scheduled + * delay/timeout under a span), the executor instrumentation captures a continuation on those + * static singletons that is never cancelled, leaking the pending trace. Disable async propagation + * while the type initializer runs. + */ + private static final ElementMatcher RXJAVA3_DISABLED_TYPE_INITIALIZERS = + named("io.reactivex.rxjava3.internal.schedulers.AbstractDirectTask"); + private static final ElementMatcher NETTY_GLOBAL_EVENT_EXECUTOR = namedOneOf( "io.netty.util.concurrent.GlobalEventExecutor", @@ -90,6 +101,7 @@ public String[] knownMatchingTypes() { "org.apache.activemq.broker.TransactionBroker", "com.mongodb.internal.connection.DefaultConnectionPool$AsyncWorkManager", "io.reactivex.internal.schedulers.AbstractDirectTask", + "io.reactivex.rxjava3.internal.schedulers.AbstractDirectTask", "jdk.internal.net.http.HttpClientImpl", LETTUCE_HANDSHAKE_HANDLER, "io.netty.util.concurrent.GlobalEventExecutor", @@ -110,6 +122,7 @@ public ElementMatcher hierarchyMatcher() { .or(GRPC_MANAGED_CHANNEL) .or(REACTOR_DISABLED_TYPE_INITIALIZERS) .or(RXJAVA2_DISABLED_TYPE_INITIALIZERS) + .or(RXJAVA3_DISABLED_TYPE_INITIALIZERS) .or(JAVA_HTTP_CLIENT); } @@ -196,6 +209,8 @@ public void methodAdvice(MethodTransformer transformer) { isTypeInitializer().and(isDeclaredBy(REACTOR_DISABLED_TYPE_INITIALIZERS)), advice); transformer.applyAdvice( isTypeInitializer().and(isDeclaredBy(RXJAVA2_DISABLED_TYPE_INITIALIZERS)), advice); + transformer.applyAdvice( + isTypeInitializer().and(isDeclaredBy(RXJAVA3_DISABLED_TYPE_INITIALIZERS)), advice); transformer.applyAdvice( isTypeInitializer().and(isDeclaredBy(NETTY_GLOBAL_EVENT_EXECUTOR)), advice); transformer.applyAdvice(namedOneOf("sendAsync").and(isDeclaredBy(JAVA_HTTP_CLIENT)), advice); diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/build.gradle b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/build.gradle new file mode 100644 index 00000000000..50d136149d4 --- /dev/null +++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/build.gradle @@ -0,0 +1,36 @@ +muzzle { + pass { + group = "io.reactivex.rxjava3" + module = "rxjava" + versions = "[3.0.0,)" + } + // Assert the rxjava3 advice never resolves against rxjava2 — the two namespaces + // must not overlap. rxjava3 references io.reactivex.rxjava3.core.*, absent from the + // rxjava2 artifact, so muzzle must fail to match it. + fail { + name = "rxjava2-must-not-match" + group = "io.reactivex.rxjava2" + module = "rxjava" + versions = "[2.0.0,)" + } +} + +apply from: "$rootDir/gradle/java.gradle" + +addTestSuiteForDir('latestDepTest', 'test') + +dependencies { + compileOnly group: 'org.reactivestreams', name: 'reactive-streams', version: '1.0.3' + compileOnly group: 'io.reactivex.rxjava3', name: 'rxjava', version: '3.0.0' + + testImplementation project(':dd-java-agent:instrumentation:datadog:tracing:trace-annotation') + testImplementation project(':dd-java-agent:instrumentation:opentelemetry:opentelemetry-annotations-1.20') + testImplementation group: 'io.reactivex.rxjava3', name: 'rxjava', version: '3.0.0' + testImplementation group: 'io.opentelemetry.instrumentation', name: 'opentelemetry-instrumentation-annotations', version: '1.28.0' + + // Load the rxjava2 instrumenter at test runtime to prove the two versions coexist on + // the agent without interference (it stays dormant with only rxjava3 on the classpath). + testRuntimeOnly project(':dd-java-agent:instrumentation:rxjava:rxjava-2.0') + + latestDepTestImplementation group: 'io.reactivex.rxjava3', name: 'rxjava', version: '+' +} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/CompletableInstrumentation.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/CompletableInstrumentation.java new file mode 100644 index 00000000000..3af41d89fa8 --- /dev/null +++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/CompletableInstrumentation.java @@ -0,0 +1,73 @@ +package datadog.trace.instrumentation.rxjava3; + +import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; +import static net.bytebuddy.matcher.ElementMatchers.isConstructor; +import static net.bytebuddy.matcher.ElementMatchers.isMethod; +import static net.bytebuddy.matcher.ElementMatchers.takesArgument; +import static net.bytebuddy.matcher.ElementMatchers.takesArguments; + +import datadog.context.Context; +import datadog.context.ContextScope; +import datadog.trace.agent.tooling.Instrumenter; +import datadog.trace.bootstrap.InstrumentationContext; +import datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge; +import io.reactivex.rxjava3.core.Completable; +import io.reactivex.rxjava3.core.CompletableObserver; +import net.bytebuddy.asm.Advice; + +public final class CompletableInstrumentation + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { + + @Override + public String instrumentedType() { + return "io.reactivex.rxjava3.core.Completable"; + } + + @Override + public void methodAdvice(MethodTransformer transformer) { + transformer.applyAdvice(isConstructor(), getClass().getName() + "$CaptureParentSpanAdvice"); + transformer.applyAdvice( + isMethod() + .and(named("subscribe")) + .and(takesArguments(1)) + .and(takesArgument(0, named("io.reactivex.rxjava3.core.CompletableObserver"))), + getClass().getName() + "$PropagateParentSpanAdvice"); + } + + public static class CaptureParentSpanAdvice { + @Advice.OnMethodExit(suppress = Throwable.class) + public static void onConstruct(@Advice.This final Completable completable) { + Context parentContext = Java8BytecodeBridge.getCurrentContext(); + if (parentContext != null && parentContext != Java8BytecodeBridge.getRootContext()) { + InstrumentationContext.get(Completable.class, Context.class) + .put(completable, parentContext); + } + } + } + + public static class PropagateParentSpanAdvice { + @Advice.OnMethodEnter(suppress = Throwable.class) + public static ContextScope onSubscribe( + @Advice.This final Completable completable, + @Advice.Argument(value = 0, readOnly = false) CompletableObserver observer) { + if (observer != null) { + Context parentContext = + InstrumentationContext.get(Completable.class, Context.class).get(completable); + if (parentContext != null) { + // wrap the observer so spans from its events treat the captured span as their parent + observer = new TracingCompletableObserver(observer, parentContext); + // attach the context here in case additional observers are created during subscribe + return parentContext.attach(); + } + } + return null; + } + + @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) + public static void closeScope(@Advice.Enter final ContextScope scope) { + if (scope != null) { + scope.close(); + } + } + } +} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/FlowableInstrumentation.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/FlowableInstrumentation.java new file mode 100644 index 00000000000..3b4b8a5c53d --- /dev/null +++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/FlowableInstrumentation.java @@ -0,0 +1,72 @@ +package datadog.trace.instrumentation.rxjava3; + +import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; +import static net.bytebuddy.matcher.ElementMatchers.isConstructor; +import static net.bytebuddy.matcher.ElementMatchers.isMethod; +import static net.bytebuddy.matcher.ElementMatchers.takesArgument; +import static net.bytebuddy.matcher.ElementMatchers.takesArguments; + +import datadog.context.Context; +import datadog.context.ContextScope; +import datadog.trace.agent.tooling.Instrumenter; +import datadog.trace.bootstrap.InstrumentationContext; +import datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.core.FlowableSubscriber; +import net.bytebuddy.asm.Advice; + +public final class FlowableInstrumentation + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { + + @Override + public String instrumentedType() { + return "io.reactivex.rxjava3.core.Flowable"; + } + + @Override + public void methodAdvice(MethodTransformer transformer) { + transformer.applyAdvice(isConstructor(), getClass().getName() + "$CaptureParentSpanAdvice"); + transformer.applyAdvice( + isMethod() + .and(named("subscribe")) + .and(takesArguments(1)) + .and(takesArgument(0, named("io.reactivex.rxjava3.core.FlowableSubscriber"))), + getClass().getName() + "$PropagateParentSpanAdvice"); + } + + public static class CaptureParentSpanAdvice { + @Advice.OnMethodExit(suppress = Throwable.class) + public static void onConstruct(@Advice.This final Flowable flowable) { + Context parentContext = Java8BytecodeBridge.getCurrentContext(); + if (parentContext != null && parentContext != Java8BytecodeBridge.getRootContext()) { + InstrumentationContext.get(Flowable.class, Context.class).put(flowable, parentContext); + } + } + } + + public static class PropagateParentSpanAdvice { + @Advice.OnMethodEnter(suppress = Throwable.class) + public static ContextScope onSubscribe( + @Advice.This final Flowable flowable, + @Advice.Argument(value = 0, readOnly = false) FlowableSubscriber subscriber) { + if (subscriber != null) { + Context parentContext = + InstrumentationContext.get(Flowable.class, Context.class).get(flowable); + if (parentContext != null) { + // wrap the subscriber so spans from its events treat the captured span as their parent + subscriber = new TracingSubscriber<>(subscriber, parentContext); + // attach the context here in case additional subscribers are created during subscribe + return parentContext.attach(); + } + } + return null; + } + + @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) + public static void closeScope(@Advice.Enter final ContextScope scope) { + if (scope != null) { + scope.close(); + } + } + } +} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/MaybeInstrumentation.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/MaybeInstrumentation.java new file mode 100644 index 00000000000..49bf3e35acf --- /dev/null +++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/MaybeInstrumentation.java @@ -0,0 +1,70 @@ +package datadog.trace.instrumentation.rxjava3; + +import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; +import static net.bytebuddy.matcher.ElementMatchers.isConstructor; +import static net.bytebuddy.matcher.ElementMatchers.isMethod; +import static net.bytebuddy.matcher.ElementMatchers.takesArgument; +import static net.bytebuddy.matcher.ElementMatchers.takesArguments; + +import datadog.context.Context; +import datadog.context.ContextScope; +import datadog.trace.agent.tooling.Instrumenter; +import datadog.trace.bootstrap.InstrumentationContext; +import datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge; +import io.reactivex.rxjava3.core.Maybe; +import io.reactivex.rxjava3.core.MaybeObserver; +import net.bytebuddy.asm.Advice; + +public final class MaybeInstrumentation + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { + @Override + public String instrumentedType() { + return "io.reactivex.rxjava3.core.Maybe"; + } + + @Override + public void methodAdvice(MethodTransformer transformer) { + transformer.applyAdvice(isConstructor(), getClass().getName() + "$CaptureParentSpanAdvice"); + transformer.applyAdvice( + isMethod() + .and(named("subscribe")) + .and(takesArguments(1)) + .and(takesArgument(0, named("io.reactivex.rxjava3.core.MaybeObserver"))), + getClass().getName() + "$PropagateParentSpanAdvice"); + } + + public static class CaptureParentSpanAdvice { + @Advice.OnMethodExit(suppress = Throwable.class) + public static void onConstruct(@Advice.This final Maybe maybe) { + Context parentContext = Java8BytecodeBridge.getCurrentContext(); + if (parentContext != null && parentContext != Java8BytecodeBridge.getRootContext()) { + InstrumentationContext.get(Maybe.class, Context.class).put(maybe, parentContext); + } + } + } + + public static class PropagateParentSpanAdvice { + @Advice.OnMethodEnter(suppress = Throwable.class) + public static ContextScope onSubscribe( + @Advice.This final Maybe maybe, + @Advice.Argument(value = 0, readOnly = false) MaybeObserver observer) { + if (observer != null) { + Context parentContext = InstrumentationContext.get(Maybe.class, Context.class).get(maybe); + if (parentContext != null) { + // wrap the observer so spans from its events treat the captured span as their parent + observer = new TracingMaybeObserver<>(observer, parentContext); + // attach the context here in case additional observers are created during subscribe + return parentContext.attach(); + } + } + return null; + } + + @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) + public static void closeScope(@Advice.Enter final ContextScope scope) { + if (scope != null) { + scope.close(); + } + } + } +} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/ObservableInstrumentation.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/ObservableInstrumentation.java new file mode 100644 index 00000000000..dd252cbfe07 --- /dev/null +++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/ObservableInstrumentation.java @@ -0,0 +1,71 @@ +package datadog.trace.instrumentation.rxjava3; + +import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; +import static net.bytebuddy.matcher.ElementMatchers.isConstructor; +import static net.bytebuddy.matcher.ElementMatchers.isMethod; +import static net.bytebuddy.matcher.ElementMatchers.takesArgument; +import static net.bytebuddy.matcher.ElementMatchers.takesArguments; + +import datadog.context.Context; +import datadog.context.ContextScope; +import datadog.trace.agent.tooling.Instrumenter; +import datadog.trace.bootstrap.InstrumentationContext; +import datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.core.Observer; +import net.bytebuddy.asm.Advice; + +public final class ObservableInstrumentation + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { + @Override + public String instrumentedType() { + return "io.reactivex.rxjava3.core.Observable"; + } + + @Override + public void methodAdvice(MethodTransformer transformer) { + transformer.applyAdvice(isConstructor(), getClass().getName() + "$CaptureParentSpanAdvice"); + transformer.applyAdvice( + isMethod() + .and(named("subscribe")) + .and(takesArguments(1)) + .and(takesArgument(0, named("io.reactivex.rxjava3.core.Observer"))), + getClass().getName() + "$PropagateParentSpanAdvice"); + } + + public static class CaptureParentSpanAdvice { + @Advice.OnMethodExit(suppress = Throwable.class) + public static void onConstruct(@Advice.This final Observable observable) { + Context parentContext = Java8BytecodeBridge.getCurrentContext(); + if (parentContext != null && parentContext != Java8BytecodeBridge.getRootContext()) { + InstrumentationContext.get(Observable.class, Context.class).put(observable, parentContext); + } + } + } + + public static class PropagateParentSpanAdvice { + @Advice.OnMethodEnter(suppress = Throwable.class) + public static ContextScope onSubscribe( + @Advice.This final Observable observable, + @Advice.Argument(value = 0, readOnly = false) Observer observer) { + if (observer != null) { + Context parentContext = + InstrumentationContext.get(Observable.class, Context.class).get(observable); + if (parentContext != null) { + // wrap the observer so spans from its events treat the captured span as their parent + observer = new TracingObserver<>(observer, parentContext); + // attach the context here in case additional observers are created during subscribe + return parentContext.attach(); + } + } + return null; + } + + @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) + public static void closeScope(@Advice.Enter final ContextScope scope) { + if (scope != null) { + scope.close(); + } + } + } +} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/RxJavaAsyncResultExtension.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/RxJavaAsyncResultExtension.java new file mode 100644 index 00000000000..26ad58cfcf3 --- /dev/null +++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/RxJavaAsyncResultExtension.java @@ -0,0 +1,68 @@ +package datadog.trace.instrumentation.rxjava3; + +import datadog.trace.bootstrap.instrumentation.api.AgentSpan; +import datadog.trace.bootstrap.instrumentation.api.EagerHelper; +import datadog.trace.bootstrap.instrumentation.java.concurrent.AsyncResultExtension; +import datadog.trace.bootstrap.instrumentation.java.concurrent.AsyncResultExtensions; +import io.reactivex.rxjava3.core.Completable; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.core.Maybe; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.core.Single; + +public class RxJavaAsyncResultExtension implements AsyncResultExtension, EagerHelper { + static { + AsyncResultExtensions.register(new RxJavaAsyncResultExtension()); + } + + /** + * Register the extension as an {@link AsyncResultExtension} using static class initialization. + *
+ * It uses an empty static method call to ensure the class loading and the one-time-only static + * class initialization. This will ensure this extension will only be registered once under {@link + * AsyncResultExtensions}. + */ + public static void init() {} + + @Override + public boolean supports(Class result) { + return Completable.class.isAssignableFrom(result) + || Maybe.class.isAssignableFrom(result) + || Single.class.isAssignableFrom(result) + || Observable.class.isAssignableFrom(result) + || Flowable.class.isAssignableFrom(result); + } + + @Override + public Object apply(Object result, AgentSpan span) { + if (result instanceof Completable) { + return ((Completable) result) + .doOnEvent(throwable -> onError(span, throwable)) + .doOnDispose(span::finish); + } else if (result instanceof Maybe) { + return ((Maybe) result) + .doOnEvent((o, throwable) -> onError(span, throwable)) + .doOnDispose(span::finish); + } else if (result instanceof Single) { + return ((Single) result) + .doOnEvent((o, throwable) -> onError(span, throwable)) + .doOnDispose(span::finish); + } else if (result instanceof Observable) { + return ((Observable) result) + .doOnComplete(span::finish) + .doOnError(throwable -> onError(span, throwable)) + .doOnDispose(span::finish); + } else if (result instanceof Flowable) { + return ((Flowable) result) + .doOnComplete(span::finish) + .doOnError(throwable -> onError(span, throwable)) + .doOnCancel(span::finish); + } + return null; + } + + private static void onError(AgentSpan span, Throwable throwable) { + span.addThrowable(throwable); + span.finish(); + } +} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/RxJavaModule.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/RxJavaModule.java new file mode 100644 index 00000000000..842bd3b703c --- /dev/null +++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/RxJavaModule.java @@ -0,0 +1,51 @@ +package datadog.trace.instrumentation.rxjava3; + +import static java.util.Arrays.asList; + +import com.google.auto.service.AutoService; +import datadog.context.Context; +import datadog.trace.agent.tooling.Instrumenter; +import datadog.trace.agent.tooling.InstrumenterModule; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@AutoService(InstrumenterModule.class) +public final class RxJavaModule extends InstrumenterModule.ContextTracking { + public RxJavaModule() { + super("rxjava", "rxjava-3"); + } + + @Override + public String[] helperClassNames() { + return new String[] { + packageName + ".TracingCompletableObserver", + packageName + ".TracingSubscriber", + packageName + ".TracingMaybeObserver", + packageName + ".TracingObserver", + packageName + ".RxJavaAsyncResultExtension", + packageName + ".TracingSingleObserver", + }; + } + + @Override + public Map contextStore() { + final Map store = new HashMap<>(); + store.put("io.reactivex.rxjava3.core.Flowable", Context.class.getName()); + store.put("io.reactivex.rxjava3.core.Completable", Context.class.getName()); + store.put("io.reactivex.rxjava3.core.Maybe", Context.class.getName()); + store.put("io.reactivex.rxjava3.core.Observable", Context.class.getName()); + store.put("io.reactivex.rxjava3.core.Single", Context.class.getName()); + return store; + } + + @Override + public List typeInstrumentations() { + return asList( + new CompletableInstrumentation(), + new FlowableInstrumentation(), + new MaybeInstrumentation(), + new ObservableInstrumentation(), + new SingleInstrumentation()); + } +} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/SingleInstrumentation.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/SingleInstrumentation.java new file mode 100644 index 00000000000..c7c93433ddb --- /dev/null +++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/SingleInstrumentation.java @@ -0,0 +1,71 @@ +package datadog.trace.instrumentation.rxjava3; + +import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; +import static net.bytebuddy.matcher.ElementMatchers.isConstructor; +import static net.bytebuddy.matcher.ElementMatchers.isMethod; +import static net.bytebuddy.matcher.ElementMatchers.takesArgument; +import static net.bytebuddy.matcher.ElementMatchers.takesArguments; + +import datadog.context.Context; +import datadog.context.ContextScope; +import datadog.trace.agent.tooling.Instrumenter; +import datadog.trace.bootstrap.InstrumentationContext; +import datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge; +import io.reactivex.rxjava3.core.Single; +import io.reactivex.rxjava3.core.SingleObserver; +import net.bytebuddy.asm.Advice; + +public final class SingleInstrumentation + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { + + @Override + public String instrumentedType() { + return "io.reactivex.rxjava3.core.Single"; + } + + @Override + public void methodAdvice(MethodTransformer transformer) { + transformer.applyAdvice(isConstructor(), getClass().getName() + "$CaptureParentSpanAdvice"); + transformer.applyAdvice( + isMethod() + .and(named("subscribe")) + .and(takesArguments(1)) + .and(takesArgument(0, named("io.reactivex.rxjava3.core.SingleObserver"))), + getClass().getName() + "$PropagateParentSpanAdvice"); + } + + public static class CaptureParentSpanAdvice { + @Advice.OnMethodExit(suppress = Throwable.class) + public static void onConstruct(@Advice.This final Single single) { + Context parentContext = Java8BytecodeBridge.getCurrentContext(); + if (parentContext != null && parentContext != Java8BytecodeBridge.getRootContext()) { + InstrumentationContext.get(Single.class, Context.class).put(single, parentContext); + } + } + } + + public static class PropagateParentSpanAdvice { + @Advice.OnMethodEnter(suppress = Throwable.class) + public static ContextScope onSubscribe( + @Advice.This final Single single, + @Advice.Argument(value = 0, readOnly = false) SingleObserver observer) { + if (observer != null) { + Context parentContext = InstrumentationContext.get(Single.class, Context.class).get(single); + if (parentContext != null) { + // wrap the observer so spans from its events treat the captured span as their parent + observer = new TracingSingleObserver<>(observer, parentContext); + // attach the context here in case additional observers are created during subscribe + return parentContext.attach(); + } + } + return null; + } + + @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) + public static void closeScope(@Advice.Enter final ContextScope scope) { + if (scope != null) { + scope.close(); + } + } + } +} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingCompletableObserver.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingCompletableObserver.java new file mode 100644 index 00000000000..8a0dd7254e1 --- /dev/null +++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingCompletableObserver.java @@ -0,0 +1,38 @@ +package datadog.trace.instrumentation.rxjava3; + +import datadog.context.Context; +import datadog.context.ContextScope; +import io.reactivex.rxjava3.core.CompletableObserver; +import io.reactivex.rxjava3.disposables.Disposable; +import javax.annotation.Nonnull; + +/** Wrapper that makes sure spans from observer events treat the captured span as their parent. */ +public final class TracingCompletableObserver implements CompletableObserver { + private final CompletableObserver observer; + private final Context parentContext; + + public TracingCompletableObserver( + @Nonnull final CompletableObserver observer, @Nonnull final Context parentContext) { + this.observer = observer; + this.parentContext = parentContext; + } + + @Override + public void onSubscribe(final Disposable d) { + observer.onSubscribe(d); + } + + @Override + public void onError(final Throwable e) { + try (final ContextScope scope = parentContext.attach()) { + observer.onError(e); + } + } + + @Override + public void onComplete() { + try (final ContextScope scope = parentContext.attach()) { + observer.onComplete(); + } + } +} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingMaybeObserver.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingMaybeObserver.java new file mode 100644 index 00000000000..0cbf34c61e4 --- /dev/null +++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingMaybeObserver.java @@ -0,0 +1,45 @@ +package datadog.trace.instrumentation.rxjava3; + +import datadog.context.Context; +import datadog.context.ContextScope; +import io.reactivex.rxjava3.core.MaybeObserver; +import io.reactivex.rxjava3.disposables.Disposable; +import javax.annotation.Nonnull; + +/** Wrapper that makes sure spans from observer events treat the captured span as their parent. */ +public final class TracingMaybeObserver implements MaybeObserver { + private final MaybeObserver observer; + private final Context parentContext; + + public TracingMaybeObserver( + @Nonnull final MaybeObserver observer, @Nonnull final Context parentContext) { + this.observer = observer; + this.parentContext = parentContext; + } + + @Override + public void onSubscribe(final Disposable d) { + observer.onSubscribe(d); + } + + @Override + public void onSuccess(final T value) { + try (final ContextScope scope = parentContext.attach()) { + observer.onSuccess(value); + } + } + + @Override + public void onError(final Throwable e) { + try (final ContextScope scope = parentContext.attach()) { + observer.onError(e); + } + } + + @Override + public void onComplete() { + try (final ContextScope scope = parentContext.attach()) { + observer.onComplete(); + } + } +} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingObserver.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingObserver.java new file mode 100644 index 00000000000..50bad4e92a1 --- /dev/null +++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingObserver.java @@ -0,0 +1,45 @@ +package datadog.trace.instrumentation.rxjava3; + +import datadog.context.Context; +import datadog.context.ContextScope; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.disposables.Disposable; +import javax.annotation.Nonnull; + +/** Wrapper that makes sure spans from observer events treat the captured span as their parent. */ +public final class TracingObserver implements Observer { + private final Observer observer; + private final Context parentContext; + + public TracingObserver( + @Nonnull final Observer observer, @Nonnull final Context parentContext) { + this.observer = observer; + this.parentContext = parentContext; + } + + @Override + public void onSubscribe(final Disposable d) { + observer.onSubscribe(d); + } + + @Override + public void onNext(final T value) { + try (final ContextScope scope = parentContext.attach()) { + observer.onNext(value); + } + } + + @Override + public void onError(final Throwable e) { + try (final ContextScope scope = parentContext.attach()) { + observer.onError(e); + } + } + + @Override + public void onComplete() { + try (final ContextScope scope = parentContext.attach()) { + observer.onComplete(); + } + } +} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingSingleObserver.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingSingleObserver.java new file mode 100644 index 00000000000..3e05d1124bc --- /dev/null +++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingSingleObserver.java @@ -0,0 +1,38 @@ +package datadog.trace.instrumentation.rxjava3; + +import datadog.context.Context; +import datadog.context.ContextScope; +import io.reactivex.rxjava3.core.SingleObserver; +import io.reactivex.rxjava3.disposables.Disposable; +import javax.annotation.Nonnull; + +/** Wrapper that makes sure spans from observer events treat the captured span as their parent. */ +public final class TracingSingleObserver implements SingleObserver { + private final SingleObserver observer; + private final Context parentContext; + + public TracingSingleObserver( + @Nonnull final SingleObserver observer, @Nonnull final Context parentContext) { + this.observer = observer; + this.parentContext = parentContext; + } + + @Override + public void onSubscribe(final Disposable d) { + observer.onSubscribe(d); + } + + @Override + public void onSuccess(final T value) { + try (final ContextScope scope = parentContext.attach()) { + observer.onSuccess(value); + } + } + + @Override + public void onError(final Throwable e) { + try (final ContextScope scope = parentContext.attach()) { + observer.onError(e); + } + } +} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingSubscriber.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingSubscriber.java new file mode 100644 index 00000000000..49caa0e6ecf --- /dev/null +++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingSubscriber.java @@ -0,0 +1,45 @@ +package datadog.trace.instrumentation.rxjava3; + +import datadog.context.Context; +import datadog.context.ContextScope; +import io.reactivex.rxjava3.core.FlowableSubscriber; +import javax.annotation.Nonnull; +import org.reactivestreams.Subscription; + +/** Wrapper that makes sure spans from subscriber events treat the captured span as their parent. */ +public final class TracingSubscriber implements FlowableSubscriber { + private final FlowableSubscriber subscriber; + private final Context parentContext; + + public TracingSubscriber( + @Nonnull final FlowableSubscriber subscriber, @Nonnull final Context parentContext) { + this.subscriber = subscriber; + this.parentContext = parentContext; + } + + @Override + public void onSubscribe(final Subscription subscription) { + subscriber.onSubscribe(subscription); + } + + @Override + public void onNext(final T value) { + try (final ContextScope scope = parentContext.attach()) { + subscriber.onNext(value); + } + } + + @Override + public void onError(final Throwable e) { + try (final ContextScope scope = parentContext.attach()) { + subscriber.onError(e); + } + } + + @Override + public void onComplete() { + try (final ContextScope scope = parentContext.attach()) { + subscriber.onComplete(); + } + } +} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/annotatedsample/RxJava3TracedMethods.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/annotatedsample/RxJava3TracedMethods.java new file mode 100644 index 00000000000..163f5fb4b69 --- /dev/null +++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/annotatedsample/RxJava3TracedMethods.java @@ -0,0 +1,137 @@ +package annotatedsample; + +import static java.util.concurrent.TimeUnit.SECONDS; + +import io.opentelemetry.instrumentation.annotations.WithSpan; +import io.reactivex.rxjava3.core.Completable; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.core.Maybe; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.core.Single; +import java.util.concurrent.CountDownLatch; + +public class RxJava3TracedMethods { + @WithSpan + public static Completable traceAsyncCompletable(CountDownLatch latch) { + return Completable.fromRunnable(() -> await(latch)); + } + + @WithSpan + public static Completable traceAsyncFailingCompletable( + CountDownLatch latch, Exception exception) { + return Completable.fromCallable( + () -> { + await(latch); + throw exception; + }); + } + + @WithSpan + public static Maybe traceAsyncMaybe(CountDownLatch latch) { + return Maybe.fromCallable( + () -> { + await(latch); + return "hello"; + }); + } + + @WithSpan + public static Maybe traceAsyncFailingMaybe(CountDownLatch latch, Exception exception) { + return Maybe.fromCallable( + () -> { + await(latch); + throw exception; + }); + } + + @WithSpan + public static Single traceAsyncSingle(CountDownLatch latch) { + return Single.fromCallable( + () -> { + await(latch); + return "hello"; + }); + } + + @WithSpan + public static Single traceAsyncFailingSingle(CountDownLatch latch, Exception exception) { + return Single.fromCallable( + () -> { + await(latch); + throw exception; + }); + } + + @WithSpan + public static Observable traceAsyncObservable(CountDownLatch latch) { + return Observable.fromCallable( + () -> { + await(latch); + return "hello"; + }); + } + + @WithSpan + public static Observable traceAsyncFailingObservable( + CountDownLatch latch, Exception exception) { + return Observable.fromCallable( + () -> { + await(latch); + throw exception; + }); + } + + @WithSpan + public static Flowable traceAsyncFlowable(CountDownLatch latch) { + return Flowable.fromCallable( + () -> { + await(latch); + return "hello"; + }); + } + + @WithSpan + public static Flowable traceAsyncFailingFlowable( + CountDownLatch latch, Exception exception) { + return Flowable.fromCallable( + () -> { + await(latch); + throw exception; + }); + } + + @WithSpan + public static Completable traceAsyncNeverCompletable() { + return Completable.never(); + } + + @WithSpan + public static Maybe traceAsyncNeverMaybe() { + return Maybe.never(); + } + + @WithSpan + public static Single traceAsyncNeverSingle() { + return Single.never(); + } + + @WithSpan + public static Observable traceAsyncNeverObservable() { + return Observable.never(); + } + + @WithSpan + public static Flowable traceAsyncNeverFlowable() { + return Flowable.never(); + } + + private static void await(CountDownLatch latch) { + try { + if (!latch.await(5, SECONDS)) { + throw new IllegalStateException("Latch still locked"); + } + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + } +} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3InteropTest.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3InteropTest.java new file mode 100644 index 00000000000..a070dfb23ef --- /dev/null +++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3InteropTest.java @@ -0,0 +1,162 @@ +package testdog.trace.instrumentation.rxjava3; + +import static datadog.trace.agent.test.assertions.Matchers.validates; +import static datadog.trace.agent.test.assertions.SpanMatcher.span; +import static datadog.trace.agent.test.assertions.TagsMatcher.defaultTags; +import static datadog.trace.agent.test.assertions.TagsMatcher.tag; +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.activeSpan; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import datadog.trace.agent.test.AbstractInstrumentationTest; +import datadog.trace.agent.test.assertions.TagsMatcher; +import datadog.trace.api.Trace; +import datadog.trace.bootstrap.instrumentation.api.Tags; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.core.Maybe; +import io.reactivex.rxjava3.core.Single; +import java.util.List; +import java.util.Optional; +import java.util.concurrent.CompletableFuture; +import java.util.function.Supplier; +import java.util.stream.Stream; +import org.junit.jupiter.api.Test; + +// NOTE: This test lives in the `testdog` package (not `datadog`) on purpose: the agent ignores +// `datadog.*` classes for instrumentation, so `@Trace`-annotated methods declared under `datadog.*` +// would never be instrumented. See RxJava3Test for the same convention. +// +// PURPOSE: investigate whether a Datadog trace context propagates through RxJava 3's Java 8 interop +// factory methods (fromCompletionStage / fromOptional / fromStream). There is no dedicated reactive +// instrumentation for these bridges; any propagation must come from the agent's +// concurrent/executor instrumentation. Each test asserts the ACTUAL observed behavior. +class RxJava3InteropTest extends AbstractInstrumentationTest { + + static { + // Async completion / scheduler hops can finish child spans after the local root is written, + // tripping strict trace write ordering checks. Mirror RxJava3Test. + testConfig.strictTraceWrites(false); + } + + // The component tag is stored as a UTF8BytesString, so compare by string content. + static TagsMatcher componentTrace() { + return tag(Tags.COMPONENT, validates(o -> "trace".equals(String.valueOf(o)))); + } + + static class Worker { + static long parentId; + + static int child(int i) { + return childTraced(i); + } + + @Trace(operationName = "child", resourceName = "child") + static int childTraced(int i) { + return i + 1; + } + + @Trace(operationName = "interop-parent", resourceName = "interop-parent") + static T runUnderParent(Supplier work) { + parentId = activeSpan().getSpanId(); + return work.get(); + } + } + + @Test + void fromCompletionStageSync() { + Integer result = + Worker.runUnderParent( + () -> + Single.fromCompletionStage(CompletableFuture.completedFuture(1)) + .map(Worker::child) + .blockingGet()); + assertEquals(2, result); + + assertTraces( + trace( + SORT_BY_START_TIME, + span().root().operationName("interop-parent").resourceName("interop-parent"), + span() + .childOf(Worker.parentId) + .operationName("child") + .resourceName("child") + .tags(componentTrace(), defaultTags()))); + } + + /** + * FINDING: context propagates even when the CompletableFuture is completed on another thread. + * There is no rxjava3 instrumentation for fromCompletionStage; propagation comes from the agent's + * concurrent/executor instrumentation, which carries the active context across the ForkJoinPool + * used by supplyAsync. blockingGet() runs the map() on the calling thread, where the + * interop-parent scope is still active, so the child span is a direct child of interop-parent. + */ + @Test + void fromCompletionStageAsync() { + Integer result = + Worker.runUnderParent( + () -> + Single.fromCompletionStage(CompletableFuture.supplyAsync(() -> 1)) + .map(Worker::child) + .blockingGet()); + assertEquals(2, result); + + assertTraces( + trace( + SORT_BY_START_TIME, + span().root().operationName("interop-parent").resourceName("interop-parent"), + span() + .childOf(Worker.parentId) + .operationName("child") + .resourceName("child") + .tags(componentTrace(), defaultTags()))); + } + + @Test + void fromOptional() { + Integer result = + Worker.runUnderParent( + () -> Maybe.fromOptional(Optional.of(1)).map(Worker::child).blockingGet()); + assertEquals(2, result); + + assertTraces( + trace( + SORT_BY_START_TIME, + span().root().operationName("interop-parent").resourceName("interop-parent"), + span() + .childOf(Worker.parentId) + .operationName("child") + .resourceName("child") + .tags(componentTrace(), defaultTags()))); + } + + /** + * FINDING: fromStream(2 elements) emits one child span per element (2 spans here), each a direct + * child of interop-parent. The map() runs synchronously on the subscribing thread under the + * active interop-parent scope, so no async/concurrent instrumentation is involved. + */ + @Test + void fromStream() { + List result = + Worker.runUnderParent( + () -> Flowable.fromStream(Stream.of(1, 2)).map(Worker::child).toList().blockingGet()); + assertEquals(2, result.size()); + assertEquals(2, result.get(0)); + assertEquals(3, result.get(1)); + + assertTraces( + trace( + SORT_BY_START_TIME, + span().root().operationName("interop-parent").resourceName("interop-parent"), + span() + .childOf(Worker.parentId) + .operationName("child") + .resourceName("child") + .tags(componentTrace(), defaultTags()), + span() + .childOf(Worker.parentId) + .operationName("child") + .resourceName("child") + .tags(componentTrace(), defaultTags()))); + } +} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3ResultExtensionTest.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3ResultExtensionTest.java new file mode 100644 index 00000000000..8c10beac6d0 --- /dev/null +++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3ResultExtensionTest.java @@ -0,0 +1,242 @@ +package testdog.trace.instrumentation.rxjava3; + +import static datadog.trace.agent.test.assertions.Matchers.validates; +import static datadog.trace.agent.test.assertions.SpanMatcher.span; +import static datadog.trace.agent.test.assertions.TagsMatcher.defaultTags; +import static datadog.trace.agent.test.assertions.TagsMatcher.error; +import static datadog.trace.agent.test.assertions.TagsMatcher.tag; +import static datadog.trace.agent.test.assertions.TraceMatcher.trace; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + +import annotatedsample.RxJava3TracedMethods; +import datadog.trace.agent.test.AbstractInstrumentationTest; +import datadog.trace.agent.test.assertions.SpanMatcher; +import datadog.trace.agent.test.assertions.TagsMatcher; +import datadog.trace.bootstrap.instrumentation.api.Tags; +import datadog.trace.junit.utils.config.WithConfig; +import io.reactivex.rxjava3.core.Completable; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.core.Maybe; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.core.Single; +import java.util.concurrent.CountDownLatch; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.EnumSource; + +@WithConfig(key = "trace.otel.enabled", value = "true") +@WithConfig(key = "integration.opentelemetry-annotations-1.20.enabled", value = "true") +class RxJava3ResultExtensionTest extends AbstractInstrumentationTest { + + static final String EXCEPTION_MESSAGE = "Test exception"; + + // The COMPONENT and SPAN_KIND tags are stored as UTF8BytesString, so we compare by string content + // rather than using is("...") which would fail the asymmetric String#equals(UTF8BytesString) + // check. + static TagsMatcher otelComponent() { + return tag(Tags.COMPONENT, validates(o -> "opentelemetry".equals(String.valueOf(o)))); + } + + static TagsMatcher internalSpanKind() { + return tag(Tags.SPAN_KIND, validates(o -> Tags.SPAN_KIND_INTERNAL.equals(String.valueOf(o)))); + } + + // The operation and resource names are stored as UTF8BytesString, so we compare by string content + // (CharSequence equality is asymmetric: String#equals(UTF8BytesString) is false). + static SpanMatcher otelSpan(String name) { + return span() + .operationName(java.util.regex.Pattern.compile(java.util.regex.Pattern.quote(name))) + .resourceName((CharSequence cs) -> name.contentEquals(cs)); + } + + /** + * The five reactive types exercised by the test, with their type-specific terminal operations. + */ + enum ReactiveType { + COMPLETABLE("Completable"), + MAYBE("Maybe"), + SINGLE("Single"), + OBSERVABLE("Observable"), + FLOWABLE("Flowable"); + + final String type; + + ReactiveType(String type) { + this.type = type; + } + + /** Runs the blocking terminal operation that drives the async result to completion. */ + void runTerminal(Object asyncType) { + switch (this) { + case COMPLETABLE: + ((Completable) asyncType).blockingAwait(); + break; + case MAYBE: + ((Maybe) asyncType).blockingGet(); + break; + case SINGLE: + ((Single) asyncType).blockingGet(); + break; + case OBSERVABLE: + ((Observable) asyncType).blockingLast(); + break; + case FLOWABLE: + ((Flowable) asyncType).blockingLast(); + break; + default: + throw new IllegalStateException("Unknown type: " + this); + } + } + + /** Subscribes and immediately disposes (cancels) the async result. */ + void subscribeAndDispose(Object asyncType) { + switch (this) { + case COMPLETABLE: + ((Completable) asyncType).subscribe().dispose(); + break; + case MAYBE: + ((Maybe) asyncType).subscribe().dispose(); + break; + case SINGLE: + ((Single) asyncType).subscribe().dispose(); + break; + case OBSERVABLE: + ((Observable) asyncType).subscribe().dispose(); + break; + case FLOWABLE: + ((Flowable) asyncType).subscribe().dispose(); + break; + default: + throw new IllegalStateException("Unknown type: " + this); + } + } + + Object traceAsync(CountDownLatch latch) { + switch (this) { + case COMPLETABLE: + return RxJava3TracedMethods.traceAsyncCompletable(latch); + case MAYBE: + return RxJava3TracedMethods.traceAsyncMaybe(latch); + case SINGLE: + return RxJava3TracedMethods.traceAsyncSingle(latch); + case OBSERVABLE: + return RxJava3TracedMethods.traceAsyncObservable(latch); + case FLOWABLE: + return RxJava3TracedMethods.traceAsyncFlowable(latch); + default: + throw new IllegalStateException("Unknown type: " + this); + } + } + + Object traceAsyncNever() { + switch (this) { + case COMPLETABLE: + return RxJava3TracedMethods.traceAsyncNeverCompletable(); + case MAYBE: + return RxJava3TracedMethods.traceAsyncNeverMaybe(); + case SINGLE: + return RxJava3TracedMethods.traceAsyncNeverSingle(); + case OBSERVABLE: + return RxJava3TracedMethods.traceAsyncNeverObservable(); + case FLOWABLE: + return RxJava3TracedMethods.traceAsyncNeverFlowable(); + default: + throw new IllegalStateException("Unknown type: " + this); + } + } + + Object traceAsyncFailing(CountDownLatch latch, Exception exception) { + switch (this) { + case COMPLETABLE: + return RxJava3TracedMethods.traceAsyncFailingCompletable(latch, exception); + case MAYBE: + return RxJava3TracedMethods.traceAsyncFailingMaybe(latch, exception); + case SINGLE: + return RxJava3TracedMethods.traceAsyncFailingSingle(latch, exception); + case OBSERVABLE: + return RxJava3TracedMethods.traceAsyncFailingObservable(latch, exception); + case FLOWABLE: + return RxJava3TracedMethods.traceAsyncFailingFlowable(latch, exception); + default: + throw new IllegalStateException("Unknown type: " + this); + } + } + } + + @ParameterizedTest(name = "test WithSpan annotated async method {0}") + @EnumSource(ReactiveType.class) + void success(ReactiveType type) { + CountDownLatch latch = new CountDownLatch(1); + Object asyncType = type.traceAsync(latch); + + // The span must not be finished before the async result completes. + assertEquals(0, writer.size()); + + latch.countDown(); + type.runTerminal(asyncType); + + String method = "traceAsync" + type.type; + assertTraces( + trace( + otelSpan("RxJava3TracedMethods." + method) + .tags(defaultTags(), otelComponent(), internalSpanKind()))); + } + + @ParameterizedTest(name = "test WithSpan annotated async method failing {0}") + @EnumSource(ReactiveType.class) + void failing(ReactiveType type) { + CountDownLatch latch = new CountDownLatch(1); + IllegalStateException expectedException = new IllegalStateException(EXCEPTION_MESSAGE); + Object asyncType = type.traceAsyncFailing(latch, expectedException); + + assertEquals(0, writer.size()); + + latch.countDown(); + assertThrows(IllegalStateException.class, () -> type.runTerminal(asyncType)); + + String method = "traceAsyncFailing" + type.type; + assertTraces( + trace( + otelSpan("RxJava3TracedMethods." + method) + .error() + .tags( + defaultTags(), + otelComponent(), + internalSpanKind(), + error(IllegalStateException.class, EXCEPTION_MESSAGE)))); + } + + @ParameterizedTest(name = "test WithSpan annotated async method cancelled {0}") + @EnumSource(ReactiveType.class) + void cancelled(ReactiveType type) { + CountDownLatch latch = new CountDownLatch(1); + Object asyncType = type.traceAsync(latch); + + assertEquals(0, writer.size()); + + latch.countDown(); + type.subscribeAndDispose(asyncType); + + String method = "traceAsync" + type.type; + assertTraces( + trace( + otelSpan("RxJava3TracedMethods." + method) + .tags(defaultTags(), otelComponent(), internalSpanKind()))); + } + + @ParameterizedTest(name = "test WithSpan annotated never async method cancelled {0}") + @EnumSource(ReactiveType.class) + void cancelledNever(ReactiveType type) { + Object asyncType = type.traceAsyncNever(); + + assertEquals(0, writer.size()); + + type.subscribeAndDispose(asyncType); + + String method = "traceAsyncNever" + type.type; + assertTraces( + trace( + otelSpan("RxJava3TracedMethods." + method) + .tags(defaultTags(), otelComponent(), internalSpanKind()))); + } +} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3Test.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3Test.java new file mode 100644 index 00000000000..8e13387dc13 --- /dev/null +++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3Test.java @@ -0,0 +1,674 @@ +package testdog.trace.instrumentation.rxjava3; + +import static datadog.trace.agent.test.assertions.Matchers.validates; +import static datadog.trace.agent.test.assertions.SpanMatcher.span; +import static datadog.trace.agent.test.assertions.TagsMatcher.defaultTags; +import static datadog.trace.agent.test.assertions.TagsMatcher.error; +import static datadog.trace.agent.test.assertions.TagsMatcher.tag; +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.activeSpan; +import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static java.util.concurrent.TimeUnit.MILLISECONDS; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + +import datadog.trace.agent.test.AbstractInstrumentationTest; +import datadog.trace.agent.test.assertions.SpanMatcher; +import datadog.trace.agent.test.assertions.TagsMatcher; +import datadog.trace.api.Trace; +import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.trace.bootstrap.instrumentation.api.AgentSpan; +import datadog.trace.bootstrap.instrumentation.api.Tags; +import io.reactivex.rxjava3.core.BackpressureStrategy; +import io.reactivex.rxjava3.core.Completable; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.core.Maybe; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.core.Scheduler; +import io.reactivex.rxjava3.core.Single; +import io.reactivex.rxjava3.schedulers.Schedulers; +import java.util.Arrays; +import java.util.List; +import java.util.function.Supplier; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; +import org.reactivestreams.Subscriber; +import org.reactivestreams.Subscription; + +// NOTE: This test lives in the `testdog` package (not `datadog`) on purpose: the agent ignores +// `datadog.*` classes for instrumentation, so `@Trace`-annotated methods declared under `datadog.*` +// would never be instrumented. See the java-lang-21 tests for the same convention. +class RxJava3Test extends AbstractInstrumentationTest { + + static { + // The reactive chains in these scenarios can finish child spans after the local root has been + // written (e.g. delayed/scheduled work), which trips strict trace write ordering checks. This + // mirrors the Groovy RxJava2Test which also disables strict trace writes for the same reason. + testConfig.strictTraceWrites(false); + } + + static final String EXCEPTION_MESSAGE = "test exception"; + + // The component tag is stored as a UTF8BytesString, so we compare by string content rather than + // using is("trace") which would fail the asymmetric String#equals(UTF8BytesString) check. + static TagsMatcher componentTrace() { + return tag(Tags.COMPONENT, validates(o -> "trace".equals(String.valueOf(o)))); + } + + /** + * Holds the {@code @Trace}-annotated methods used by the scenarios. The captured span ids are + * stored in static fields and read back by the asserting test methods to express cross-span + * parent relationships. + */ + static class Worker { + static long traceParentId; + static long publisherParentId; + static long intermediateId; + + static int addOne(int i) { + return addOneTraced(i); + } + + @Trace(operationName = "addOne", resourceName = "addOne") + static int addOneTraced(int i) { + return i + 1; + } + + static int addTwo(int i) { + return addTwoTraced(i); + } + + @Trace(operationName = "addTwo", resourceName = "addTwo") + static int addTwoTraced(int i) { + return i + 2; + } + + static Object throwException() { + throw new RuntimeException(EXCEPTION_MESSAGE); + } + + @Trace(operationName = "trace-parent", resourceName = "trace-parent") + @SuppressWarnings("unchecked") + static Object assemblePublisherUnderTrace(Supplier publisherSupplier) { + traceParentId = activeSpan().getSpanId(); + AgentSpan span = startSpan("test", "publisher-parent"); + publisherParentId = span.getSpanId(); + // After this activation, the operations below should be children of this span + AgentScope scope = activateSpan(span); + + Object publisher = publisherSupplier.get(); + try { + // Read all data from publisher + if (publisher instanceof Maybe) { + return ((Maybe) publisher).blockingGet(); + } else if (publisher instanceof Flowable) { + List list = ((Flowable) publisher).toList().blockingGet(); + return list.toArray(new Object[0]); + } + throw new RuntimeException("Unknown publisher: " + publisher); + } finally { + span.finish(); + scope.close(); + } + } + + @Trace(operationName = "trace-parent", resourceName = "trace-parent") + static void cancelUnderTrace(Supplier publisherSupplier) { + traceParentId = activeSpan().getSpanId(); + AgentSpan span = startSpan("test", "publisher-parent"); + publisherParentId = span.getSpanId(); + AgentScope scope = activateSpan(span); + + // Normalize every reactive type to a Flowable so a single Subscriber can cancel the + // subscription right away, exercising the cancellation path of each instrumentation. + Object publisher = publisherSupplier.get(); + Flowable flowable; + if (publisher instanceof Maybe) { + flowable = ((Maybe) publisher).toFlowable(); + } else if (publisher instanceof Single) { + flowable = ((Single) publisher).toFlowable(); + } else if (publisher instanceof Observable) { + flowable = ((Observable) publisher).toFlowable(BackpressureStrategy.BUFFER); + } else if (publisher instanceof Completable) { + flowable = ((Completable) publisher).toFlowable(); + } else { + flowable = (Flowable) publisher; + } + + try { + flowable.subscribe( + new Subscriber() { + @Override + public void onSubscribe(Subscription subscription) { + subscription.cancel(); + } + + @Override + public void onNext(Object t) {} + + @Override + public void onError(Throwable error) {} + + @Override + public void onComplete() {} + }); + } finally { + scope.close(); + span.finish(); + } + } + + @Trace(operationName = "trace-parent", resourceName = "trace-parent") + static Object runUnderTraceParent(Supplier work) { + traceParentId = activeSpan().getSpanId(); + return work.get(); + } + } + + // --- Publisher success --------------------------------------------------- + + static List publisherSuccessArgs() { + return Arrays.asList( + Arguments.of( + "basic maybe", + new Object[] {2}, + 1, + (Supplier) () -> Maybe.just(1).map(Worker::addOne)), + Arguments.of( + "two operations maybe", + new Object[] {4}, + 2, + (Supplier) () -> Maybe.just(2).map(Worker::addOne).map(Worker::addOne)), + Arguments.of( + "delayed maybe", + new Object[] {4}, + 1, + (Supplier) () -> Maybe.just(3).delay(100, MILLISECONDS).map(Worker::addOne)), + Arguments.of( + "delayed twice maybe", + new Object[] {6}, + 2, + (Supplier) + () -> + Maybe.just(4) + .delay(100, MILLISECONDS) + .map(Worker::addOne) + .delay(100, MILLISECONDS) + .map(Worker::addOne)), + Arguments.of( + "basic flowable", + new Object[] {6, 7}, + 2, + (Supplier) + () -> Flowable.fromIterable(Arrays.asList(5, 6)).map(Worker::addOne)), + Arguments.of( + "two operations flowable", + new Object[] {8, 9}, + 4, + (Supplier) + () -> + Flowable.fromIterable(Arrays.asList(6, 7)) + .map(Worker::addOne) + .map(Worker::addOne)), + Arguments.of( + "delayed flowable", + new Object[] {8, 9}, + 2, + (Supplier) + () -> + Flowable.fromIterable(Arrays.asList(7, 8)) + .delay(100, MILLISECONDS) + .map(Worker::addOne)), + Arguments.of( + "delayed twice flowable", + new Object[] {10, 11}, + 4, + (Supplier) + () -> + Flowable.fromIterable(Arrays.asList(8, 9)) + .delay(100, MILLISECONDS) + .map(Worker::addOne) + .delay(100, MILLISECONDS) + .map(Worker::addOne)), + Arguments.of( + "maybe from callable", + new Object[] {12}, + 2, + (Supplier) + () -> Maybe.fromCallable(() -> Worker.addOne(10)).map(Worker::addOne))); + } + + @ParameterizedTest(name = "Publisher ''{0}'' test") + @MethodSource("publisherSuccessArgs") + void publisherSuccess(String name, Object[] expected, int workSpans, Supplier supplier) { + Object result = Worker.assemblePublisherUnderTrace(supplier); + + if (expected.length == 1) { + assertEquals(expected[0], result); + } else { + assertArrayEquals(expected, (Object[]) result); + } + + SpanMatcher[] matchers = new SpanMatcher[workSpans + 2]; + matchers[0] = + span() + .root() + .operationName("trace-parent") + .resourceName("trace-parent") + .tags(componentTrace(), defaultTags()); + matchers[1] = + span() + .id(Worker.publisherParentId) + .childOf(Worker.traceParentId) + .operationName("publisher-parent") + .resourceName("publisher-parent") + .tags(defaultTags()); + for (int i = 0; i < workSpans; i++) { + matchers[2 + i] = + span() + .childOf(Worker.publisherParentId) + .operationName("addOne") + .resourceName("addOne") + .tags(componentTrace(), defaultTags()); + } + + assertTraces(trace(SORT_BY_START_TIME, matchers)); + } + + // --- Publisher error ----------------------------------------------------- + + static List publisherErrorArgs() { + return Arrays.asList( + Arguments.of( + "maybe", (Supplier) () -> Maybe.error(new RuntimeException(EXCEPTION_MESSAGE))), + Arguments.of( + "flowable", + (Supplier) () -> Flowable.error(new RuntimeException(EXCEPTION_MESSAGE)))); + } + + @ParameterizedTest(name = "Publisher error ''{0}'' test") + @MethodSource("publisherErrorArgs") + void publisherError(String name, Supplier supplier) { + RuntimeException exception = + assertThrows(RuntimeException.class, () -> Worker.assemblePublisherUnderTrace(supplier)); + assertEquals(EXCEPTION_MESSAGE, exception.getMessage()); + + assertTraces( + trace( + SORT_BY_START_TIME, + span() + .root() + .operationName("trace-parent") + .resourceName("trace-parent") + .error() + .tags( + componentTrace(), + error(RuntimeException.class, EXCEPTION_MESSAGE), + defaultTags()), + // It's important that we don't attach errors at the reactive level so that we don't + // impact the spans on reactive integrations such as netty and lettuce. + span() + .id(Worker.publisherParentId) + .childOf(Worker.traceParentId) + .operationName("publisher-parent") + .resourceName("publisher-parent") + .tags(defaultTags()))); + } + + // --- Publisher step error ------------------------------------------------ + + static List publisherStepErrorArgs() { + return Arrays.asList( + Arguments.of( + "basic maybe failure", + 1, + (Supplier) + () -> Maybe.just(1).map(Worker::addOne).map(i -> Worker.throwException())), + Arguments.of( + "basic flowable failure", + 1, + (Supplier) + () -> + Flowable.fromIterable(Arrays.asList(5, 6)) + .map(Worker::addOne) + .map(i -> Worker.throwException()))); + } + + @ParameterizedTest(name = "Publisher step ''{0}'' test") + @MethodSource("publisherStepErrorArgs") + void publisherStepError(String name, int workSpans, Supplier supplier) { + RuntimeException exception = + assertThrows(RuntimeException.class, () -> Worker.assemblePublisherUnderTrace(supplier)); + assertEquals(EXCEPTION_MESSAGE, exception.getMessage()); + + SpanMatcher[] matchers = new SpanMatcher[workSpans + 2]; + matchers[0] = + span() + .root() + .operationName("trace-parent") + .resourceName("trace-parent") + .error() + .tags( + componentTrace(), error(RuntimeException.class, EXCEPTION_MESSAGE), defaultTags()); + matchers[1] = + span() + .id(Worker.publisherParentId) + .childOf(Worker.traceParentId) + .operationName("publisher-parent") + .resourceName("publisher-parent") + .tags(defaultTags()); + for (int i = 0; i < workSpans; i++) { + matchers[2 + i] = + span() + .childOf(Worker.publisherParentId) + .operationName("addOne") + .resourceName("addOne") + .tags(componentTrace(), defaultTags()); + } + + assertTraces(trace(SORT_BY_START_TIME, matchers)); + } + + // --- Cancel -------------------------------------------------------------- + + static List cancelArgs() { + return Arrays.asList( + Arguments.of("basic maybe", (Supplier) () -> Maybe.just(1)), + Arguments.of( + "basic flowable", (Supplier) () -> Flowable.fromIterable(Arrays.asList(5, 6))), + Arguments.of("basic single", (Supplier) () -> Single.just(1)), + Arguments.of( + "basic observable", + (Supplier) () -> Observable.fromIterable(Arrays.asList(5, 6))), + Arguments.of("basic completable", (Supplier) Completable::complete)); + } + + @ParameterizedTest(name = "Publisher ''{0}'' cancel") + @MethodSource("cancelArgs") + void cancel(String name, Supplier supplier) { + Worker.cancelUnderTrace(supplier); + + assertTraces( + trace( + SORT_BY_START_TIME, + span() + .root() + .operationName("trace-parent") + .resourceName("trace-parent") + .tags(componentTrace(), defaultTags()), + span() + .id(Worker.publisherParentId) + .childOf(Worker.traceParentId) + .operationName("publisher-parent") + .resourceName("publisher-parent") + .tags(defaultTags()))); + } + + // --- Chain spans correct parent ------------------------------------------ + + static List chainParentArgs() { + return Arrays.asList( + Arguments.of( + "basic maybe", + 3, + (Supplier) + () -> + Maybe.just(1) + .map(Worker::addOne) + .map(Worker::addOne) + .concatWith(Maybe.just(1).map(Worker::addOne))), + Arguments.of( + "basic flowable", + 5, + (Supplier) + () -> + Flowable.fromIterable(Arrays.asList(5, 6)) + .map(Worker::addOne) + .map(Worker::addOne) + .concatWith(Maybe.just(1).map(Worker::addOne).toFlowable()))); + } + + @ParameterizedTest(name = "Publisher chain spans have the correct parent for ''{0}''") + @MethodSource("chainParentArgs") + void chainParent(String name, int workSpans, Supplier supplier) { + Worker.assemblePublisherUnderTrace(supplier); + + SpanMatcher[] matchers = new SpanMatcher[workSpans + 2]; + matchers[0] = + span() + .root() + .operationName("trace-parent") + .resourceName("trace-parent") + .tags(componentTrace(), defaultTags()); + matchers[1] = + span() + .id(Worker.publisherParentId) + .childOf(Worker.traceParentId) + .operationName("publisher-parent") + .resourceName("publisher-parent") + .tags(defaultTags()); + for (int i = 0; i < workSpans; i++) { + matchers[2 + i] = + span() + .childOf(Worker.publisherParentId) + .operationName("addOne") + .resourceName("addOne") + .tags(componentTrace(), defaultTags()); + } + + assertTraces(trace(SORT_BY_START_TIME, matchers)); + } + + // --- Correct parents from subscription time (blockingGet) ---------------- + + @Test + void correctParentsFromSubscriptionTimeBlockingGet() { + Maybe maybe = Maybe.just(42).map(Worker::addOne).map(Worker::addTwo); + + Worker.runUnderTraceParent( + () -> { + maybe.blockingGet(); + return null; + }); + + assertTraces( + trace( + SORT_BY_START_TIME, + span().root().operationName("trace-parent").resourceName("trace-parent"), + span() + .childOf(Worker.traceParentId) + .operationName("addOne") + .tags(componentTrace(), defaultTags()), + span() + .childOf(Worker.traceParentId) + .operationName("addTwo") + .tags(componentTrace(), defaultTags()))); + } + + // --- Correct parents from subscription time (intermediate span) ---------- + + static List subscriptionTimeIntermediateArgs() { + return Arrays.asList( + Arguments.of("basic maybe", 1, (Supplier) () -> Maybe.just(1).map(Worker::addOne)), + Arguments.of( + "basic flowable", + 2, + (Supplier) + () -> Flowable.fromIterable(Arrays.asList(1, 2)).map(Worker::addOne))); + } + + @ParameterizedTest( + name = "Publisher chain spans have the correct parents from subscription time ''{0}''") + @MethodSource("subscriptionTimeIntermediateArgs") + @SuppressWarnings("unchecked") + void correctParentsFromSubscriptionTime(String name, int workItems, Supplier supplier) { + Worker.assemblePublisherUnderTrace( + () -> { + // The "add one" operations are assembled under publisher-parent and stay its children. + // The "add two" operations are assembled under intermediate, but intermediate is finished + // before subscription, so re-activating its context at delivery time is a no-op and + // addTwo falls back to the still-active publisher-parent as well. + Object publisher = supplier.get(); + + AgentSpan intermediate = startSpan("test", "intermediate"); + Worker.intermediateId = intermediate.getSpanId(); + AgentScope scope = activateSpan(intermediate); + try { + if (publisher instanceof Maybe) { + return ((Maybe) publisher).map(Worker::addTwo); + } else if (publisher instanceof Flowable) { + return ((Flowable) publisher).map(Worker::addTwo); + } + throw new IllegalStateException("Unknown publisher type"); + } finally { + intermediate.finish(); + scope.close(); + } + }); + + SpanMatcher[] matchers = new SpanMatcher[3 + 2 * workItems]; + matchers[0] = + span() + .root() + .operationName("trace-parent") + .resourceName("trace-parent") + .tags(componentTrace(), defaultTags()); + matchers[1] = + span() + .id(Worker.publisherParentId) + .childOf(Worker.traceParentId) + .operationName("publisher-parent") + .resourceName("publisher-parent") + .tags(defaultTags()); + matchers[2] = + span() + .id(Worker.intermediateId) + .childOf(Worker.publisherParentId) + .operationName("intermediate") + .resourceName("intermediate") + .tags(defaultTags()); + for (int i = 0; i < 2 * workItems; i += 2) { + matchers[3 + i] = + span() + .childOf(Worker.publisherParentId) + .operationName("addOne") + .tags(componentTrace(), defaultTags()); + matchers[4 + i] = + span() + .childOf(Worker.publisherParentId) + .operationName("addTwo") + .tags(componentTrace(), defaultTags()); + } + + assertTraces(trace(SORT_BY_START_TIME, matchers)); + } + + // --- Schedulers ---------------------------------------------------------- + + static List schedulerArgs() { + return Arrays.asList( + Arguments.of("new-thread", Schedulers.newThread()), + Arguments.of("computation", Schedulers.computation()), + Arguments.of("single", Schedulers.single()), + Arguments.of("trampoline", Schedulers.trampoline())); + } + + @ParameterizedTest(name = "Flowables produce the right number of results on ''{0}'' scheduler") + @MethodSource("schedulerArgs") + void schedulers(String schedulerName, Scheduler scheduler) { + List values = + Flowable.fromIterable(Arrays.asList(1, 2, 3, 4)) + .parallel() + .runOn(scheduler) + .flatMap( + num -> + Maybe.just(num.toString() + " on " + Thread.currentThread().getName()) + .toFlowable()) + .sequential() + .toList() + .blockingGet(); + + assertEquals(4, values.size()); + + // No trace-parent span is active while the chain is assembled, so the instrumentation must be + // non-intrusive: parallel scheduler hops must not synthesize any trace. Flushing makes sure + // any span that the instrumentation might have wrongly created on the scheduler threads is + // reported before we assert the writer is empty. + tracer.flush(); + assertEquals( + 0, + writer.getTraceCount(), + () -> "Unexpected traces emitted without active trace: " + writer); + } + + @ParameterizedTest(name = "Flowable propagates context on ''{0}'' scheduler") + @MethodSource("schedulerArgs") + void flowableParallelContextPropagation(String schedulerName, Scheduler scheduler) { + Worker.assemblePublisherUnderTrace( + () -> + Flowable.fromIterable(Arrays.asList(1, 2, 3, 4)) + .parallel() + .runOn(scheduler) + .flatMap(num -> Maybe.just(num).map(Worker::addOne).toFlowable()) + .sequential()); + + SpanMatcher[] matchers = new SpanMatcher[6]; + matchers[0] = + span() + .root() + .operationName("trace-parent") + .resourceName("trace-parent") + .tags(componentTrace(), defaultTags()); + matchers[1] = + span() + .id(Worker.publisherParentId) + .childOf(Worker.traceParentId) + .operationName("publisher-parent") + .resourceName("publisher-parent") + .tags(defaultTags()); + for (int i = 0; i < 4; i++) { + matchers[2 + i] = + span() + .childOf(Worker.publisherParentId) + .operationName("addOne") + .resourceName("addOne") + .tags(componentTrace(), defaultTags()); + } + + assertTraces(trace(SORT_BY_START_TIME, matchers)); + } + + // --- No spurious traces outside active trace -------------------------------- + + // Verifies that CaptureParentSpanAdvice and PropagateParentSpanAdvice are no-ops when there is + // no active trace: the instrumentation must not synthesize any spans of its own. + static List noSpuriousTracesArgs() { + return Arrays.asList( + Arguments.of( + "observable", + (Supplier) + () -> + Observable.fromIterable(Arrays.asList(1, 2, 3, 4)) + .map(i -> i + 1) + .toList() + .blockingGet()), + Arguments.of( + "single", (Supplier) () -> Single.just(1).map(i -> i + 1).blockingGet())); + } + + @ParameterizedTest(name = "No spurious traces for ''{0}'' assembled outside active trace") + @MethodSource("noSpuriousTracesArgs") + void noSpuriousTracesWhenAssembledOutsideTrace(String name, Supplier supplier) { + supplier.get(); + tracer.flush(); + assertEquals( + 0, + writer.getTraceCount(), + () -> "Unexpected traces emitted without active trace: " + writer); + } +} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/SubscriptionTest.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/SubscriptionTest.java new file mode 100644 index 00000000000..d2f76d17a9b --- /dev/null +++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/SubscriptionTest.java @@ -0,0 +1,162 @@ +package testdog.trace.instrumentation.rxjava3; + +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.startSpan; + +import datadog.trace.agent.test.AbstractInstrumentationTest; +import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.trace.bootstrap.instrumentation.api.AgentSpan; +import io.reactivex.rxjava3.core.BackpressureStrategy; +import io.reactivex.rxjava3.core.Completable; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.core.Maybe; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.core.Single; +import java.util.Random; +import java.util.concurrent.CountDownLatch; +import org.junit.jupiter.api.Test; + +class SubscriptionTest extends AbstractInstrumentationTest { + + @Test + void maybeSubscriptionPropagatesParentSpan() throws InterruptedException { + CountDownLatch latch = new CountDownLatch(1); + + AgentSpan parent = startSpan("test", "parent"); + try (AgentScope scope = activateSpan(parent)) { + Maybe connection = Maybe.create(emitter -> emitter.onSuccess(new Connection())); + connection.subscribe( + c -> { + c.query(); + latch.countDown(); + }); + } finally { + parent.finish(); + } + latch.await(); + + assertTraces( + trace( + SORT_BY_START_TIME, + span().root().operationName("parent"), + span().childOfPrevious().operationName("Connection.query"))); + } + + @Test + void singleSubscriptionPropagatesParentSpan() throws InterruptedException { + CountDownLatch latch = new CountDownLatch(1); + + AgentSpan parent = startSpan("test", "parent"); + try (AgentScope scope = activateSpan(parent)) { + Single connection = Single.create(emitter -> emitter.onSuccess(new Connection())); + connection.subscribe( + c -> { + c.query(); + latch.countDown(); + }); + } finally { + parent.finish(); + } + latch.await(); + + assertTraces( + trace( + SORT_BY_START_TIME, + span().root().operationName("parent"), + span().childOfPrevious().operationName("Connection.query"))); + } + + @Test + void completableSubscriptionPropagatesParentSpan() throws InterruptedException { + CountDownLatch latch = new CountDownLatch(1); + + AgentSpan parent = startSpan("test", "parent"); + try (AgentScope scope = activateSpan(parent)) { + Completable action = Completable.create(emitter -> emitter.onComplete()); + action.subscribe( + () -> { + new Connection().query(); + latch.countDown(); + }); + } finally { + parent.finish(); + } + latch.await(); + + assertTraces( + trace( + SORT_BY_START_TIME, + span().root().operationName("parent"), + span().childOfPrevious().operationName("Connection.query"))); + } + + @Test + void observableSubscriptionPropagatesParentSpan() throws InterruptedException { + CountDownLatch latch = new CountDownLatch(1); + + AgentSpan parent = startSpan("test", "parent"); + try (AgentScope scope = activateSpan(parent)) { + Observable connection = + Observable.create( + emitter -> { + emitter.onNext(new Connection()); + emitter.onComplete(); + }); + connection.subscribe( + c -> { + c.query(); + latch.countDown(); + }); + } finally { + parent.finish(); + } + latch.await(); + + assertTraces( + trace( + SORT_BY_START_TIME, + span().root().operationName("parent"), + span().childOfPrevious().operationName("Connection.query"))); + } + + @Test + void flowableSubscriptionPropagatesParentSpan() throws InterruptedException { + CountDownLatch latch = new CountDownLatch(1); + + AgentSpan parent = startSpan("test", "parent"); + try (AgentScope scope = activateSpan(parent)) { + Flowable connection = + Flowable.create( + emitter -> { + emitter.onNext(new Connection()); + emitter.onComplete(); + }, + BackpressureStrategy.BUFFER); + connection.subscribe( + c -> { + c.query(); + latch.countDown(); + }); + } finally { + parent.finish(); + } + latch.await(); + + assertTraces( + trace( + SORT_BY_START_TIME, + span().root().operationName("parent"), + span().childOfPrevious().operationName("Connection.query"))); + } + + static class Connection { + int query() { + AgentSpan span = startSpan("test", "Connection.query"); + span.finish(); + return new Random().nextInt(); + } + } +} diff --git a/metadata/supported-configurations.json b/metadata/supported-configurations.json index ae081138b71..de18c9b39aa 100644 --- a/metadata/supported-configurations.json +++ b/metadata/supported-configurations.json @@ -9585,6 +9585,14 @@ "aliases": ["DD_TRACE_INTEGRATION_RXJAVA_ENABLED", "DD_INTEGRATION_RXJAVA_ENABLED"] } ], + "DD_TRACE_RXJAVA_3_ENABLED": [ + { + "version": "A", + "type": "boolean", + "default": "true", + "aliases": ["DD_TRACE_INTEGRATION_RXJAVA_3_ENABLED", "DD_INTEGRATION_RXJAVA_3_ENABLED"] + } + ], "DD_TRACE_S3_ENABLED": [ { "version": "A", diff --git a/settings.gradle.kts b/settings.gradle.kts index 0647382920a..12858c6c38d 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -559,6 +559,7 @@ include( ":dd-java-agent:instrumentation:rs:jax-rs:jax-rs-client:jax-rs-client-2.0", ":dd-java-agent:instrumentation:rxjava:rxjava-1.0", ":dd-java-agent:instrumentation:rxjava:rxjava-2.0", + ":dd-java-agent:instrumentation:rxjava:rxjava-3.0", ":dd-java-agent:instrumentation:scala:scala-concurrent-2.8", ":dd-java-agent:instrumentation:scala:scala-promise:scala-promise-2.10", ":dd-java-agent:instrumentation:scala:scala-promise:scala-promise-2.13", From a1a064b8df55a83e52fd02ba4c67fdf908fc9bc0 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Fri, 26 Jun 2026 15:01:42 -0400 Subject: [PATCH 055/139] Migrate feature-flagging groovy tests to java (#11716) Migrate feature-flagging groovy tests to java Address flaky test Merge branch 'master' into sarahchen6/migrate-feature-flagging-tests-to-java Merge branch 'master' into sarahchen6/migrate-feature-flagging-tests-to-java Merge branch 'master' into sarahchen6/migrate-feature-flagging-tests-to-java Clean up pt1 Clean up pt2 Clean up pt3 Clean up pt4 Wait for flush in both cases of testFailuresAreRetried Add VisibleForTesting annotation Merge branch 'master' into sarahchen6/migrate-feature-flagging-tests-to-java Merge branch 'master' into sarahchen6/migrate-feature-flagging-tests-to-java Update to use test-utils polling Co-authored-by: sarah.chen --- .../feature-flagging-agent/build.gradle.kts | 2 + .../FeatureFlaggingSystemTest.groovy | 60 --- .../FeatureFlaggingSystemTest.java | 63 +++ .../build.gradle.kts | 2 + .../FeatureFlaggingGatewayTest.groovy | 76 ---- .../FeatureFlaggingGatewayTest.java | 80 ++++ .../featureflag/ExposureWriterImpl.java | 11 + .../featureflag/ExposureWriterTests.groovy | 317 -------------- .../featureflag/LRUExposureCacheTest.groovy | 256 ----------- .../featureflag/ExposureWriterTests.java | 408 ++++++++++++++++++ .../featureflag/LRUExposureCacheTest.java | 244 +++++++++++ 11 files changed, 810 insertions(+), 709 deletions(-) delete mode 100644 products/feature-flagging/feature-flagging-agent/src/test/groovy/com/datadog/featureflag/FeatureFlaggingSystemTest.groovy create mode 100644 products/feature-flagging/feature-flagging-agent/src/test/java/com/datadog/featureflag/FeatureFlaggingSystemTest.java delete mode 100644 products/feature-flagging/feature-flagging-bootstrap/src/test/groovy/datadog/trace/api/featureflag/FeatureFlaggingGatewayTest.groovy create mode 100644 products/feature-flagging/feature-flagging-bootstrap/src/test/java/datadog/trace/api/featureflag/FeatureFlaggingGatewayTest.java delete mode 100644 products/feature-flagging/feature-flagging-lib/src/test/groovy/com/datadog/featureflag/ExposureWriterTests.groovy delete mode 100644 products/feature-flagging/feature-flagging-lib/src/test/groovy/com/datadog/featureflag/LRUExposureCacheTest.groovy create mode 100644 products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/ExposureWriterTests.java create mode 100644 products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/LRUExposureCacheTest.java diff --git a/products/feature-flagging/feature-flagging-agent/build.gradle.kts b/products/feature-flagging/feature-flagging-agent/build.gradle.kts index 902ae5a6023..1dcadde035f 100644 --- a/products/feature-flagging/feature-flagging-agent/build.gradle.kts +++ b/products/feature-flagging/feature-flagging-agent/build.gradle.kts @@ -16,6 +16,8 @@ dependencies { api(project(":products:feature-flagging:feature-flagging-lib")) api(project(":internal-api")) + testImplementation(libs.bundles.junit5) + testImplementation(libs.bundles.mockito) testImplementation(project(":utils:test-utils")) testRuntimeOnly(project(":dd-trace-core")) } diff --git a/products/feature-flagging/feature-flagging-agent/src/test/groovy/com/datadog/featureflag/FeatureFlaggingSystemTest.groovy b/products/feature-flagging/feature-flagging-agent/src/test/groovy/com/datadog/featureflag/FeatureFlaggingSystemTest.groovy deleted file mode 100644 index 32510d313d0..00000000000 --- a/products/feature-flagging/feature-flagging-agent/src/test/groovy/com/datadog/featureflag/FeatureFlaggingSystemTest.groovy +++ /dev/null @@ -1,60 +0,0 @@ -package com.datadog.featureflag - -import datadog.communication.ddagent.DDAgentFeaturesDiscovery -import datadog.communication.ddagent.SharedCommunicationObjects -import datadog.remoteconfig.Capabilities -import datadog.remoteconfig.ConfigurationDeserializer -import datadog.remoteconfig.ConfigurationPoller -import datadog.remoteconfig.Product -import datadog.trace.api.Config -import datadog.trace.test.util.DDSpecification -import okhttp3.HttpUrl - -class FeatureFlaggingSystemTest extends DDSpecification { - - void 'test feature flag system initialization'() { - setup: - final poller = Mock(ConfigurationPoller) - final discovery = Stub(DDAgentFeaturesDiscovery) { - discoverIfOutdated() >> {} - supportsEvpProxy() >> { return true } - } - final sco = Stub(SharedCommunicationObjects) { - configurationPoller(_ as Config) >> poller - featuresDiscovery(_ as Config) >> discovery - } - sco.featuresDiscovery = discovery - sco.agentUrl = HttpUrl.get('http://localhost') - - when: - FeatureFlaggingSystem.start(sco) - - then: - 1 * poller.addCapabilities(Capabilities.CAPABILITY_FFE_FLAG_CONFIGURATION_RULES) - 1 * poller.addListener(Product.FFE_FLAGS, _ as ConfigurationDeserializer, _) - 1 * poller.start() - - when: - FeatureFlaggingSystem.stop() - - then: - 1 * poller.removeCapabilities(Capabilities.CAPABILITY_FFE_FLAG_CONFIGURATION_RULES) - 1 * poller.removeListeners(Product.FFE_FLAGS) - 1 * poller.stop() - } - - void 'test that remote config is required'() { - setup: - injectSysConfig('remote_configuration.enabled', 'false') - final sco = Mock(SharedCommunicationObjects) - - when: - FeatureFlaggingSystem.start(sco) - - then: - thrown(IllegalStateException) - - cleanup: - FeatureFlaggingSystem.stop() - } -} diff --git a/products/feature-flagging/feature-flagging-agent/src/test/java/com/datadog/featureflag/FeatureFlaggingSystemTest.java b/products/feature-flagging/feature-flagging-agent/src/test/java/com/datadog/featureflag/FeatureFlaggingSystemTest.java new file mode 100644 index 00000000000..970c2cf16e3 --- /dev/null +++ b/products/feature-flagging/feature-flagging-agent/src/test/java/com/datadog/featureflag/FeatureFlaggingSystemTest.java @@ -0,0 +1,63 @@ +package com.datadog.featureflag; + +import static datadog.trace.api.config.RemoteConfigConfig.REMOTE_CONFIGURATION_ENABLED; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import datadog.communication.ddagent.DDAgentFeaturesDiscovery; +import datadog.communication.ddagent.SharedCommunicationObjects; +import datadog.remoteconfig.Capabilities; +import datadog.remoteconfig.ConfigurationDeserializer; +import datadog.remoteconfig.ConfigurationPoller; +import datadog.remoteconfig.Product; +import datadog.trace.api.Config; +import datadog.trace.junit.utils.config.WithConfig; +import okhttp3.HttpUrl; +import okhttp3.OkHttpClient; +import org.junit.jupiter.api.Test; + +class FeatureFlaggingSystemTest { + + @Test + void testFeatureFlagSystemInitialization() { + ConfigurationPoller poller = mock(ConfigurationPoller.class); + DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class); + SharedCommunicationObjects sharedCommunicationObjects = mock(SharedCommunicationObjects.class); + when(discovery.supportsEvpProxy()).thenReturn(true); + when(discovery.getEvpProxyEndpoint()).thenReturn("/evp_proxy/"); + when(sharedCommunicationObjects.configurationPoller(any(Config.class))).thenReturn(poller); + when(sharedCommunicationObjects.featuresDiscovery(any(Config.class))).thenReturn(discovery); + sharedCommunicationObjects.agentUrl = HttpUrl.get("http://localhost"); + sharedCommunicationObjects.agentHttpClient = new OkHttpClient.Builder().build(); + + FeatureFlaggingSystem.start(sharedCommunicationObjects); + + verify(poller).addCapabilities(Capabilities.CAPABILITY_FFE_FLAG_CONFIGURATION_RULES); + verify(poller).addListener(eq(Product.FFE_FLAGS), any(ConfigurationDeserializer.class), any()); + verify(poller).start(); + + FeatureFlaggingSystem.stop(); + + verify(poller).removeCapabilities(Capabilities.CAPABILITY_FFE_FLAG_CONFIGURATION_RULES); + verify(poller).removeListeners(Product.FFE_FLAGS); + verify(poller).stop(); + } + + @Test + @WithConfig(key = REMOTE_CONFIGURATION_ENABLED, value = "false") + void testThatRemoteConfigIsRequired() { + SharedCommunicationObjects sharedCommunicationObjects = mock(SharedCommunicationObjects.class); + + try { + assertThrows( + IllegalStateException.class, + () -> FeatureFlaggingSystem.start(sharedCommunicationObjects)); + } finally { + FeatureFlaggingSystem.stop(); + } + } +} diff --git a/products/feature-flagging/feature-flagging-bootstrap/build.gradle.kts b/products/feature-flagging/feature-flagging-bootstrap/build.gradle.kts index d2d68b59ddf..d8e945a5565 100644 --- a/products/feature-flagging/feature-flagging-bootstrap/build.gradle.kts +++ b/products/feature-flagging/feature-flagging-bootstrap/build.gradle.kts @@ -30,5 +30,7 @@ extra["excludedClassesCoverage"] = listOf( ) dependencies { + testImplementation(libs.bundles.junit5) + testImplementation(libs.bundles.mockito) testImplementation(project(":utils:test-utils")) } diff --git a/products/feature-flagging/feature-flagging-bootstrap/src/test/groovy/datadog/trace/api/featureflag/FeatureFlaggingGatewayTest.groovy b/products/feature-flagging/feature-flagging-bootstrap/src/test/groovy/datadog/trace/api/featureflag/FeatureFlaggingGatewayTest.groovy deleted file mode 100644 index 6dd02e3f96e..00000000000 --- a/products/feature-flagging/feature-flagging-bootstrap/src/test/groovy/datadog/trace/api/featureflag/FeatureFlaggingGatewayTest.groovy +++ /dev/null @@ -1,76 +0,0 @@ -package datadog.trace.api.featureflag - -import datadog.trace.api.featureflag.exposure.ExposureEvent -import datadog.trace.api.featureflag.ufc.v1.ServerConfiguration -import spock.lang.Specification - -class FeatureFlaggingGatewayTest extends Specification { - - void 'test attaching a config listener'() { - given: - def listener = Mock(FeatureFlaggingGateway.ConfigListener) - final first = Stub(ServerConfiguration) - final second = Stub(ServerConfiguration) - - when: - FeatureFlaggingGateway.addConfigListener(listener) - FeatureFlaggingGateway.dispatch(first) - - then: - 1 * listener.accept(first) - 0 * _ - - when: - FeatureFlaggingGateway.dispatch(second) - - then: - 1 * listener.accept(second) - 0 * _ - - - cleanup: - FeatureFlaggingGateway.removeConfigListener(listener) - } - - void 'test attaching a listener after configured'() { - given: - def listener = Mock(FeatureFlaggingGateway.ConfigListener) - final first = Stub(ServerConfiguration) - - when: - FeatureFlaggingGateway.dispatch(first) - FeatureFlaggingGateway.addConfigListener(listener) - - then: - 1 * listener.accept(first) - 0 * _ - - cleanup: - FeatureFlaggingGateway.removeConfigListener(listener) - } - - void 'test attaching an exposure listener'() { - given: - def listener = Mock(FeatureFlaggingGateway.ExposureListener) - final first = Stub(ExposureEvent) - final second = Stub(ExposureEvent) - - when: - FeatureFlaggingGateway.addExposureListener(listener) - FeatureFlaggingGateway.dispatch(first) - - then: - 1 * listener.accept(first) - 0 * _ - - when: - FeatureFlaggingGateway.dispatch(second) - - then: - 1 * listener.accept(second) - 0 * _ - - cleanup: - FeatureFlaggingGateway.removeExposureListener(listener) - } -} diff --git a/products/feature-flagging/feature-flagging-bootstrap/src/test/java/datadog/trace/api/featureflag/FeatureFlaggingGatewayTest.java b/products/feature-flagging/feature-flagging-bootstrap/src/test/java/datadog/trace/api/featureflag/FeatureFlaggingGatewayTest.java new file mode 100644 index 00000000000..fc04cf2193b --- /dev/null +++ b/products/feature-flagging/feature-flagging-bootstrap/src/test/java/datadog/trace/api/featureflag/FeatureFlaggingGatewayTest.java @@ -0,0 +1,80 @@ +package datadog.trace.api.featureflag; + +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; + +import datadog.trace.api.featureflag.exposure.ExposureEvent; +import datadog.trace.api.featureflag.ufc.v1.ServerConfiguration; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +class FeatureFlaggingGatewayTest { + + private FeatureFlaggingGateway.ConfigListener configListener; + private FeatureFlaggingGateway.ExposureListener exposureListener; + private ServerConfiguration firstConfiguration; + private ServerConfiguration secondConfiguration; + private ExposureEvent firstExposure; + private ExposureEvent secondExposure; + + @BeforeEach + void setUp() { + configListener = mock(FeatureFlaggingGateway.ConfigListener.class); + exposureListener = mock(FeatureFlaggingGateway.ExposureListener.class); + firstConfiguration = mock(ServerConfiguration.class); + secondConfiguration = mock(ServerConfiguration.class); + firstExposure = mock(ExposureEvent.class); + secondExposure = mock(ExposureEvent.class); + } + + @AfterEach + void tearDown() { + FeatureFlaggingGateway.removeConfigListener(configListener); + FeatureFlaggingGateway.removeExposureListener(exposureListener); + } + + @Test + void testAttachingAConfigListener() { + clearCurrentServerConfiguration(); + + FeatureFlaggingGateway.addConfigListener(configListener); + FeatureFlaggingGateway.dispatch(firstConfiguration); + + verify(configListener).accept(firstConfiguration); + verifyNoMoreInteractions(configListener); + + FeatureFlaggingGateway.dispatch(secondConfiguration); + + verify(configListener).accept(secondConfiguration); + verifyNoMoreInteractions(configListener); + } + + @Test + void testAttachingAListenerAfterConfigured() { + FeatureFlaggingGateway.dispatch(firstConfiguration); + FeatureFlaggingGateway.addConfigListener(configListener); + + verify(configListener).accept(firstConfiguration); + verifyNoMoreInteractions(configListener); + } + + @Test + void testAttachingAnExposureListener() { + FeatureFlaggingGateway.addExposureListener(exposureListener); + FeatureFlaggingGateway.dispatch(firstExposure); + + verify(exposureListener).accept(firstExposure); + verifyNoMoreInteractions(exposureListener); + + FeatureFlaggingGateway.dispatch(secondExposure); + + verify(exposureListener).accept(secondExposure); + verifyNoMoreInteractions(exposureListener); + } + + private static void clearCurrentServerConfiguration() { + FeatureFlaggingGateway.dispatch((ServerConfiguration) null); + } +} diff --git a/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/ExposureWriterImpl.java b/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/ExposureWriterImpl.java index 3783ae914f3..eddcd520f27 100644 --- a/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/ExposureWriterImpl.java +++ b/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/ExposureWriterImpl.java @@ -16,6 +16,7 @@ import datadog.trace.api.featureflag.exposure.ExposureEvent; import datadog.trace.api.featureflag.exposure.ExposuresRequest; import datadog.trace.api.intake.Intake; +import datadog.trace.api.internal.VisibleForTesting; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -84,6 +85,16 @@ public void accept(final ExposureEvent event) { queue.offer(event); } + @VisibleForTesting + boolean isSerializerThreadAlive() { + return serializerThread.isAlive(); + } + + @VisibleForTesting + int queueSize() { + return queue.size(); + } + private static class ExposureSerializingHandler implements Runnable { private final MessagePassingBlockingQueue queue; private final long ticksRequiredToFlush; diff --git a/products/feature-flagging/feature-flagging-lib/src/test/groovy/com/datadog/featureflag/ExposureWriterTests.groovy b/products/feature-flagging/feature-flagging-lib/src/test/groovy/com/datadog/featureflag/ExposureWriterTests.groovy deleted file mode 100644 index 960102b8da2..00000000000 --- a/products/feature-flagging/feature-flagging-lib/src/test/groovy/com/datadog/featureflag/ExposureWriterTests.groovy +++ /dev/null @@ -1,317 +0,0 @@ -package com.datadog.featureflag - -import static datadog.trace.agent.test.server.http.TestHttpServer.httpServer -import static java.util.concurrent.TimeUnit.MILLISECONDS - -import com.squareup.moshi.Moshi -import datadog.communication.ddagent.DDAgentFeaturesDiscovery -import datadog.communication.ddagent.SharedCommunicationObjects -import datadog.trace.agent.test.server.http.TestHttpServer -import datadog.trace.api.Config -import datadog.trace.api.IdGenerationStrategy -import datadog.trace.api.featureflag.FeatureFlaggingGateway -import datadog.trace.api.featureflag.exposure.Allocation -import datadog.trace.api.featureflag.exposure.ExposureEvent -import datadog.trace.api.featureflag.exposure.ExposuresRequest -import datadog.trace.api.featureflag.exposure.Flag -import datadog.trace.api.featureflag.exposure.Subject -import datadog.trace.api.featureflag.exposure.Variant -import datadog.trace.test.util.DDSpecification -import java.util.concurrent.ConcurrentHashMap -import java.util.concurrent.ConcurrentLinkedQueue -import java.util.concurrent.CountDownLatch -import java.util.concurrent.Executors -import okhttp3.HttpUrl -import okhttp3.OkHttpClient -import okio.Okio -import spock.lang.AutoCleanup -import spock.lang.Shared -import spock.util.concurrent.PollingConditions - -class ExposureWriterTests extends DDSpecification { - - @Shared - protected final Queue requests = new ConcurrentLinkedQueue<>() - - @Shared - protected final Set failed = Collections.newSetFromMap(new ConcurrentHashMap()) - - @Shared - @AutoCleanup - protected TestHttpServer server = httpServer { - final adapter = new Moshi.Builder().build().adapter(ExposuresRequest) - handlers { - prefix("/evp_proxy/api/v2/exposures") { - final exposuresRequest = adapter.fromJson(Okio.buffer(Okio.source(new ByteArrayInputStream(request.body)))) - final serviceName = exposuresRequest.context.service - final failForever = serviceName == 'fail-forever' - final fail = serviceName.startsWith('fail') && (failed.add(serviceName) || failForever) - if (fail) { - response.status(500).send('Boom!!!') - } else { - requests.add(exposuresRequest) - response.status(200).send('OK') - } - } - } - } - - @Shared - protected PollingConditions poll = new PollingConditions(timeout: 5) - - @Shared - protected SharedCommunicationObjects sco = Stub(SharedCommunicationObjects) { - featuresDiscovery(_ as Config) >> { - return Mock(DDAgentFeaturesDiscovery) { - supportsEvpProxy() >> true - getEvpProxyEndpoint() >> '/evp_proxy/' - } - } - }.tap { - agentUrl = HttpUrl.get(server.address) - agentHttpClient = new OkHttpClient.Builder().build() - } - - void cleanup() { - requests.clear() - failed.clear() - } - - void 'test exposure event writes'() { - setup: - def config = mockConfig(service, env, version) - def exposures = (1..5).collect { buildExposure() } - def writer = new ExposureWriterImpl(1 << 4, 100, MILLISECONDS, sco, config) - writer.init() - - when: - exposures.each { writer.accept(it) } - - then: - poll.eventually { - assert !requests.empty - requests.each { - assert it.context.service == service ?: 'unknown' - if (env) { - assert it.context.env == env - } - if (version) { - assert it.context.version == version.toString() - } - } - final received = requests*.exposures.flatten() as List - assertExposures(received, exposures) - } - - cleanup: - writer.close() - - where: - service | env | version - null | null | null - 'test-service' | 'test' | '23' - 'test-service' | null | '23' - 'test-service' | 'test' | null - } - - void 'test lru cache'() { - setup: - def config = mockConfig('test-service') - def exposures = (0..5).collect { buildExposure() } - def writer = new ExposureWriterImpl(1 << 4, 100, MILLISECONDS, sco, config) - writer.init() - - when: 'populating the cache' - exposures.each { writer.accept(it) } - - then: 'all events are written' - new PollingConditions(timeout: 1).eventually { - requests*.exposures.flatten().size() == exposures.size() - } - - when: 'publishing duplicate events' - exposures.each { writer.accept(it) } - - then: 'no events are written' - MILLISECONDS.sleep(300) // wait until a flush happens - requests*.exposures.flatten().size() == exposures.size() - - when: 'a new event is generated' - writer.accept(buildExposure()) - - then: 'oldest event is evicted and the new one is submitted' - poll.eventually { - requests*.exposures.flatten().size() == exposures.size() + 1 - } - - cleanup: - writer.close() - } - - void 'test high load scenario'() { - setup: - def config = mockConfig('test-service') - def exposuresPerThread = 100 - def random = new Random() - def threads = Runtime.runtime.availableProcessors() - def executor = Executors.newFixedThreadPool(threads) - def exposures = (1..(threads * exposuresPerThread)).collect { - buildExposure() - } - def latch = new CountDownLatch(1) - def writer = new ExposureWriterImpl(sco, config) - writer.init() - - when: - def futures = exposures.collate(exposuresPerThread).collect { partition -> - executor.submit { - latch.await() - partition.each { - MILLISECONDS.sleep(random.nextInt(2)) - writer.accept(it) - } - return true - } - } - latch.countDown() // start threads - - then: - futures.each { it.get() } // wait for all threads to finish - poll.eventually { - final received = requests*.exposures.flatten() as List - assertExposures(received, exposures) - } - - cleanup: - writer.close() - executor.shutdownNow() - } - - void 'test failures are retried'() { - setup: - def config = mockConfig(serviceName) - def writer = new ExposureWriterImpl(1 << 4, 100, MILLISECONDS, sco, config) - writer.init() - - when: - writer.accept(buildExposure()) - - then: - MILLISECONDS.sleep(500) // wait for a flush to happen - final found = requests.find { it.context.service == serviceName } - if (finallyFail) { - assert found == null: requests - } else { - assert found != null: requests - } - - cleanup: - writer.close() - - where: - serviceName | finallyFail - 'fail-once' | false - 'fail-forever' | true - } - - void 'test writer stops receiving exposures if evp proxy is not available'() { - given: - final sco = Stub(SharedCommunicationObjects) { - featuresDiscovery(_ as Config) >> { - return Mock(DDAgentFeaturesDiscovery) { - supportsEvpProxy() >> false - } - } - } - def writer = new ExposureWriterImpl(sco, Config.get()) - - when: - writer.init() - - then: - poll.eventually { - assert !writer.serializerThread.isAlive() - } - - when: - FeatureFlaggingGateway.dispatch(buildExposure()) - - then: - writer.queue.size() == 0 - - cleanup: - writer.close() - } - - private Config mockConfig(String serviceName, String env = 'test', String version = '0.0.0') { - return Mock(Config) { - getIdGenerationStrategy() >> IdGenerationStrategy.fromName("RANDOM") - getServiceName() >> serviceName - getEnv() >> env - getVersion() >> version - } - } - - private static void assertExposures(final List receivedExposures, final List expectedExposures) { - assert receivedExposures.size() == expectedExposures.size() - final received = new TreeSet(ExposureWriterTests::compare) - received.addAll(expectedExposures) - assert received.containsAll(expectedExposures) - } - - private static int compare(final ExposureEvent a, final ExposureEvent b) { - if (a.is(b)) { - return 0 - } - if (a == null) { - return -1 - } - if (b == null) { - return 1 - } - - def result = a.timestamp <=> b.timestamp - if (result) { - return result - } - - result = (a.flag?.key ?: '') <=> (b.flag?.key ?: '') - if (result) { - return result - } - - result = (a.variant?.key ?: '') <=> (b.variant?.key ?: '') - if (result) { - return result - } - - result = (a.allocation?.key ?: '') <=> (b.allocation?.key ?: '') - if (result) { - return result - } - - result = (a.subject?.id ?: '') <=> (b.subject?.id ?: '') - if (result) { - return result - } - - final aEntry = a.subject?.attributes?.entrySet()?.iterator()?.next() - final bEntry = b.subject?.attributes?.entrySet()?.iterator()?.next() - result = (aEntry?.key ?: '') <=> (bEntry?.key ?: '') - if (result) { - return result - } - return (aEntry?.value?.toString() ?: '') <=> (bEntry?.value?.toString() ?: '') - } - - private static ExposureEvent buildExposure() { - final idx = UUID.randomUUID().toString() - return new ExposureEvent( - System.currentTimeMillis(), - new Allocation("Allocation_$idx"), - new Flag("Flag_$idx"), - new Variant("Variant_$idx"), - new Subject("Subject_$idx", [("key_$idx".toString()): "value_$idx".toString()]) - ) - } -} diff --git a/products/feature-flagging/feature-flagging-lib/src/test/groovy/com/datadog/featureflag/LRUExposureCacheTest.groovy b/products/feature-flagging/feature-flagging-lib/src/test/groovy/com/datadog/featureflag/LRUExposureCacheTest.groovy deleted file mode 100644 index fa8bd14c3bd..00000000000 --- a/products/feature-flagging/feature-flagging-lib/src/test/groovy/com/datadog/featureflag/LRUExposureCacheTest.groovy +++ /dev/null @@ -1,256 +0,0 @@ -package com.datadog.featureflag - -import datadog.trace.api.featureflag.exposure.Allocation -import datadog.trace.api.featureflag.exposure.ExposureEvent -import datadog.trace.api.featureflag.exposure.Flag -import datadog.trace.api.featureflag.exposure.Subject -import datadog.trace.api.featureflag.exposure.Variant -import spock.lang.Specification - -class LRUExposureCacheTest extends Specification { - - void 'test adding elements'() { - given: - final cache = new LRUExposureCache(5) - final event = createEvent('flag', 'subject', 'variant', 'allocation') - - when: - final added = cache.add(event) - - then: - added - cache.size() == 1 - } - - void 'test adding duplicate events returns false'() { - given: - final cache = new LRUExposureCache(5) - final event = createEvent('flag', 'subject', 'variant', 'allocation') - - when: - cache.add(event) - final duplicateAdded = cache.add(event) - - then: - !duplicateAdded - cache.size() == 1 - } - - void 'test adding events with same key but different details updates cache'() { - given: - final cache = new LRUExposureCache(5) - final event1 = createEvent('flag', 'subject', 'variant1', 'allocation1') - final event2 = createEvent('flag', 'subject', 'variant2', 'allocation2') - final key = new ExposureCache.Key(event1) - - when: - final added1 = cache.add(event1) - final added2 = cache.add(event2) - final retrieved = cache.get(key) - - then: - added1 - added2 - cache.size() == 1 - retrieved.variant == 'variant2' - retrieved.allocation == 'allocation2' - } - - void 'test LRU eviction when capacity exceeded'() { - given: - final cache = new LRUExposureCache(2) - final event1 = createEvent('flag1', 'subject1', 'variant1', 'allocation1') - final event2 = createEvent('flag2', 'subject2', 'variant2', 'allocation2') - final event3 = createEvent('flag3', 'subject3', 'variant3', 'allocation3') - final key1 = new ExposureCache.Key(event1) - final key3 = new ExposureCache.Key(event3) - - when: - cache.add(event1) - cache.add(event2) - cache.add(event3) - - then: - cache.size() == 2 - cache.get(key1) == null // event1 should be evicted - cache.get(key3) != null // event3 should be present - cache.get(key3).variant == 'variant3' - cache.get(key3).allocation == 'allocation3' - } - - void 'test single capacity cache'() { - given: - final cache = new LRUExposureCache(1) - final event1 = createEvent('flag1', 'subject1', 'variant1', 'allocation1') - final event2 = createEvent('flag2', 'subject2', 'variant2', 'allocation2') - - when: - cache.add(event1) - cache.add(event2) - - then: - cache.size() == 1 - } - - void 'test zero capacity cache'() { - given: - final cache = new LRUExposureCache(0) - final event = createEvent('flag', 'subject', 'variant', 'allocation') - - when: - final added = cache.add(event) - - then: - added - cache.size() == 0 - } - - void 'test empty cache size'() { - given: - final cache = new LRUExposureCache(5) - - expect: - cache.size() == 0 - } - - void 'test multiple additions with same flag different subjects'() { - given: - final cache = new LRUExposureCache(10) - final events = [] - for (int i = 0; i < 5; i++) { - events << createEvent('flag', "subject${i}", 'variant', 'allocation') - } - - when: - def results = events.collect { cache.add(it) } - - then: - results.every { it == true } - cache.size() == 5 - } - - void 'test multiple additions with same subject different flags'() { - given: - final cache = new LRUExposureCache(10) - final events = [] - for (int i = 0; i < 5; i++) { - events << createEvent("flag${i}", 'subject', 'variant', 'allocation') - } - - when: - def results = events.collect { cache.add(it) } - - then: - results.every { it == true } - cache.size() == 5 - } - - void 'test key equality with null values'() { - given: - final cache = new LRUExposureCache(5) - final event1 = new ExposureEvent( - System.currentTimeMillis(), - new Allocation('allocation'), - new Flag(null), - new Variant('variant'), - new Subject(null, [:]) - ) - final event2 = new ExposureEvent( - System.currentTimeMillis(), - new Allocation('allocation'), - new Flag(null), - new Variant('variant'), - new Subject(null, [:]) - ) - - when: - cache.add(event1) - final duplicateAdded = cache.add(event2) - - then: - !duplicateAdded - cache.size() == 1 - } - - void 'test updating existing key maintains LRU position'() { - given: - final cache = new LRUExposureCache(3) - final event1 = createEvent('flag1', 'subject1', 'variant1', 'allocation1') - final event2 = createEvent('flag2', 'subject2', 'variant2', 'allocation2') - final event3 = createEvent('flag3', 'subject3', 'variant3', 'allocation3') - final event1Updated = createEvent('flag1', 'subject1', 'variant2', 'allocation2') - final event4 = createEvent('flag4', 'subject4', 'variant4', 'allocation4') - final key1 = new ExposureCache.Key(event1) - final key2 = new ExposureCache.Key(event2) - final key4 = new ExposureCache.Key(event4) - - when: - cache.add(event1) - cache.add(event2) - cache.add(event3) - cache.add(event1Updated) // Updates event1, moves to most recent - cache.add(event4) // Should evict event2, not event1 - - then: - cache.size() == 3 - cache.get(key1) != null // event1 should be updated and present - cache.get(key1).variant == 'variant2' // verify it was updated - cache.get(key1).allocation == 'allocation2' - cache.get(key2) == null // event2 should be evicted - cache.get(key4) != null // event4 should be present - cache.get(key4).variant == 'variant4' - } - - void 'test duplicate exposure keeps subject hot in LRU order'() { - given: - final cache = new LRUExposureCache(3) - final event1 = createEvent('flag1', 'subject1', 'variant1', 'allocation1') - final event2 = createEvent('flag2', 'subject2', 'variant2', 'allocation2') - final event3 = createEvent('flag3', 'subject3', 'variant3', 'allocation3') - // same key + same details as event1: will go through the "duplicate" path - final event1Duplicate = createEvent('flag1', 'subject1', 'variant1', 'allocation1') - final event4 = createEvent('flag4', 'subject4', 'variant4', 'allocation4') - - final key1 = new ExposureCache.Key(event1) - final key2 = new ExposureCache.Key(event2) - final key4 = new ExposureCache.Key(event4) - - when: - // Fill cache - def added1 = cache.add(event1) - def added2 = cache.add(event2) - def added3 = cache.add(event3) - - // Duplicate exposure for subject1: should *not* change size, but *should* bump recency - def duplicateAdded = cache.add(event1Duplicate) - - // Now push over capacity: the least recently used *non-hot* entry (event2) should be evicted - def added4 = cache.add(event4) - - then: - added1 - added2 - added3 - !duplicateAdded // dedup correctly - added4 - - cache.size() == 3 - - cache.get(key1) != null // hot subject1 should still be present - cache.get(key2) == null // subject2 should be evicted - cache.get(key4) != null // newest subject4 should be present - - cache.get(key1).variant == 'variant1' - cache.get(key1).allocation == 'allocation1' - } - - private static ExposureEvent createEvent(String flag, String subject, String variant, String allocation) { - return new ExposureEvent( - System.currentTimeMillis(), - new Allocation(allocation), - new Flag(flag), - new Variant(variant), - new Subject(subject, [:]) - ) - } -} diff --git a/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/ExposureWriterTests.java b/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/ExposureWriterTests.java new file mode 100644 index 00000000000..75c4b3b653b --- /dev/null +++ b/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/ExposureWriterTests.java @@ -0,0 +1,408 @@ +package com.datadog.featureflag; + +import static java.util.Collections.singletonMap; +import static java.util.concurrent.TimeUnit.MILLISECONDS; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import com.squareup.moshi.JsonAdapter; +import com.squareup.moshi.Moshi; +import datadog.communication.ddagent.DDAgentFeaturesDiscovery; +import datadog.communication.ddagent.SharedCommunicationObjects; +import datadog.trace.agent.test.server.http.JavaTestHttpServer; +import datadog.trace.agent.test.server.http.JavaTestHttpServer.HandlerApi; +import datadog.trace.api.Config; +import datadog.trace.api.IdGenerationStrategy; +import datadog.trace.api.featureflag.FeatureFlaggingGateway; +import datadog.trace.api.featureflag.exposure.Allocation; +import datadog.trace.api.featureflag.exposure.ExposureEvent; +import datadog.trace.api.featureflag.exposure.ExposuresRequest; +import datadog.trace.api.featureflag.exposure.Flag; +import datadog.trace.api.featureflag.exposure.Subject; +import datadog.trace.api.featureflag.exposure.Variant; +import datadog.trace.test.util.PollingConditions; +import java.io.ByteArrayInputStream; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Queue; +import java.util.Random; +import java.util.Set; +import java.util.TreeSet; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import okhttp3.HttpUrl; +import okhttp3.OkHttpClient; +import okio.Okio; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; +import org.tabletest.junit.TableTest; + +class ExposureWriterTests { + + private static final String EXPOSURES_ENDPOINT = "/evp_proxy/api/v2/exposures"; + private static final double TIMEOUT_SECONDS = 5; + + private final PollingConditions poll = new PollingConditions(TIMEOUT_SECONDS); + private Queue requests; + private Set failed; + private JavaTestHttpServer server; + private SharedCommunicationObjects sharedCommunicationObjects; + + @BeforeEach + void setUp() { + requests = new ConcurrentLinkedQueue<>(); + failed = Collections.newSetFromMap(new ConcurrentHashMap()); + JsonAdapter adapter = + new Moshi.Builder().build().adapter(ExposuresRequest.class); + server = + JavaTestHttpServer.httpServer( + s -> + s.handlers( + h -> h.prefix(EXPOSURES_ENDPOINT, api -> handleExposureRequest(api, adapter)))); + sharedCommunicationObjects = sharedCommunicationObjects(true); + } + + @AfterEach + void cleanup() { + if (server != null) { + server.close(); + } + } + + private void handleExposureRequest(HandlerApi api, JsonAdapter adapter) + throws Exception { + ExposuresRequest exposuresRequest = + adapter.fromJson( + Okio.buffer(Okio.source(new ByteArrayInputStream(api.getRequest().getBody())))); + String serviceName = exposuresRequest.context.get("service"); + boolean failForever = "fail-forever".equals(serviceName); + boolean fail = serviceName.startsWith("fail") && (failed.add(serviceName) || failForever); + if (fail) { + api.getResponse().status(500).send("Boom!!!"); + } else { + requests.add(exposuresRequest); + api.getResponse().status(200).send("OK"); + } + } + + @TableTest({ + "service | env | version", + " | | ", + "'test-service' | 'test' | '23' ", + "'test-service' | | '23' ", + "'test-service' | 'test' | " + }) + void testExposureEventWrites(String service, String env, String version) throws Exception { + Config config = mockConfig(service, env, version); + List exposures = buildExposures(5); + + try (ExposureWriterImpl writer = + new ExposureWriterImpl(1 << 4, 100, MILLISECONDS, sharedCommunicationObjects, config)) { + writer.init(); + for (ExposureEvent exposure : exposures) { + writer.accept(exposure); + } + + poll.eventually( + () -> { + assertFalse(requests.isEmpty()); + for (ExposuresRequest request : requests) { + assertContext(request.context, service, env, version); + } + assertExposures(allExposures(), exposures); + }); + } + } + + @Test + void testLruCache() throws Exception { + Config config = mockConfig("test-service"); + List exposures = buildExposures(6); + + try (ExposureWriterImpl writer = + new ExposureWriterImpl(1 << 4, 100, MILLISECONDS, sharedCommunicationObjects, config)) { + writer.init(); + // populating the cache + for (ExposureEvent exposure : exposures) { + writer.accept(exposure); + } + + // all events are written + poll.eventually(() -> assertEquals(exposures.size(), allExposures().size())); + + // publishing duplicate events + for (ExposureEvent exposure : exposures) { + writer.accept(exposure); + } + + // no events are written + MILLISECONDS.sleep(300); // wait until a flush happens + assertEquals(exposures.size(), allExposures().size()); + + // a new event is generated + writer.accept(buildExposure()); + + // oldest event is evicted and the new one is submitted + poll.eventually(() -> assertEquals(exposures.size() + 1, allExposures().size())); + } + } + + @Test + void testHighLoadScenario() throws Exception { + Config config = mockConfig("test-service"); + int exposuresPerThread = 100; + Random random = new Random(); + int threads = Runtime.getRuntime().availableProcessors(); + ExecutorService executor = Executors.newFixedThreadPool(threads); + List exposures = buildExposures(threads * exposuresPerThread); + CountDownLatch latch = new CountDownLatch(1); + + try (ExposureWriterImpl writer = new ExposureWriterImpl(sharedCommunicationObjects, config)) { + writer.init(); + List> futures = new ArrayList<>(); + for (int index = 0; index < exposures.size(); index += exposuresPerThread) { + List partition = + exposures.subList(index, Math.min(index + exposuresPerThread, exposures.size())); + futures.add( + executor.submit( + () -> { + latch.await(); + for (ExposureEvent exposure : partition) { + MILLISECONDS.sleep(random.nextInt(2)); + writer.accept(exposure); + } + return true; + })); + } + latch.countDown(); // start threads + + for (Future future : futures) { + assertTrue(future.get()); // wait for all threads to finish + } + poll.eventually(() -> assertExposures(allExposures(), exposures)); + } finally { + executor.shutdownNow(); + } + } + + @ParameterizedTest + @ValueSource(booleans = {false, true}) + void testFailuresAreRetried(boolean finallyFail) throws Exception { + String serviceName = finallyFail ? "fail-forever" : "fail-once"; + Config config = mockConfig(serviceName); + + try (ExposureWriterImpl writer = + new ExposureWriterImpl(1 << 4, 100, MILLISECONDS, sharedCommunicationObjects, config)) { + writer.init(); + writer.accept(buildExposure()); + + MILLISECONDS.sleep(500); // wait for a flush to happen + ExposuresRequest found = findRequest(serviceName); + if (finallyFail) { + assertNull(found, requests.toString()); + } else { + poll.eventually(() -> assertNotNull(findRequest(serviceName), requests.toString())); + } + } + } + + @Test + void testWriterStopsReceivingExposuresIfEvpProxyIsNotAvailable() throws Exception { + SharedCommunicationObjects sharedCommunicationObjects = sharedCommunicationObjects(false); + + try (ExposureWriterImpl writer = + new ExposureWriterImpl(sharedCommunicationObjects, Config.get())) { + writer.init(); + poll.eventually(() -> assertFalse(writer.isSerializerThreadAlive())); + + FeatureFlaggingGateway.dispatch(buildExposure()); + + assertEquals(0, writer.queueSize()); + } + } + + private static Config mockConfig(String serviceName) { + return mockConfig(serviceName, "test", "0.0.0"); + } + + private static Config mockConfig(String serviceName, String env, String version) { + Config config = mock(Config.class); + when(config.getIdGenerationStrategy()).thenReturn(IdGenerationStrategy.fromName("RANDOM")); + when(config.getServiceName()).thenReturn(serviceName); + when(config.getEnv()).thenReturn(env); + when(config.getVersion()).thenReturn(version); + return config; + } + + private SharedCommunicationObjects sharedCommunicationObjects(boolean evpProxyAvailable) { + DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class); + when(discovery.supportsEvpProxy()).thenReturn(evpProxyAvailable); + if (evpProxyAvailable) { + when(discovery.getEvpProxyEndpoint()).thenReturn("/evp_proxy/"); + } + + SharedCommunicationObjects sharedCommunicationObjects = new SharedCommunicationObjects(); + sharedCommunicationObjects.setFeaturesDiscovery(discovery); + sharedCommunicationObjects.agentUrl = HttpUrl.get(server.getAddress()); + sharedCommunicationObjects.agentHttpClient = new OkHttpClient.Builder().build(); + return sharedCommunicationObjects; + } + + private static void assertContext( + Map context, String service, String env, String version) { + assertEquals(service == null ? "unknown" : service, context.get("service")); + assertOptionalContextValue(context, "env", env); + assertOptionalContextValue(context, "version", version); + } + + private static void assertOptionalContextValue( + Map context, String key, String value) { + if (value == null) { + assertFalse(context.containsKey(key)); + } else { + assertEquals(value, context.get(key)); + } + } + + private ExposuresRequest findRequest(String serviceName) { + for (ExposuresRequest request : requests) { + if (serviceName.equals(request.context.get("service"))) { + return request; + } + } + return null; + } + + private List allExposures() { + List exposures = new ArrayList<>(); + for (ExposuresRequest request : requests) { + exposures.addAll(request.exposures); + } + return exposures; + } + + private static void assertExposures( + List receivedExposures, List expectedExposures) { + assertEquals(expectedExposures.size(), receivedExposures.size()); + TreeSet received = new TreeSet<>(ExposureWriterTests::compare); + received.addAll(receivedExposures); + assertTrue(received.containsAll(expectedExposures)); + } + + private static int compare(ExposureEvent first, ExposureEvent second) { + if (first == second) { + return 0; + } + if (first == null) { + return -1; + } + if (second == null) { + return 1; + } + + int result = Long.compare(first.timestamp, second.timestamp); + if (result != 0) { + return result; + } + + result = compareNullableString(first.flag == null ? null : first.flag.key, second.flag); + if (result != 0) { + return result; + } + + result = + compareNullableString(first.variant == null ? null : first.variant.key, second.variant); + if (result != 0) { + return result; + } + + result = + compareNullableString( + first.allocation == null ? null : first.allocation.key, second.allocation); + if (result != 0) { + return result; + } + + result = compareNullableString(first.subject == null ? null : first.subject.id, second.subject); + if (result != 0) { + return result; + } + + Map.Entry firstEntry = firstEntry(first.subject); + Map.Entry secondEntry = firstEntry(second.subject); + result = + compareNullableString( + firstEntry == null ? null : firstEntry.getKey(), + secondEntry == null ? null : secondEntry.getKey()); + if (result != 0) { + return result; + } + return compareNullableString( + firstEntry == null ? null : String.valueOf(firstEntry.getValue()), + secondEntry == null ? null : String.valueOf(secondEntry.getValue())); + } + + private static int compareNullableString(String first, Flag second) { + return compareNullableString(first, second == null ? null : second.key); + } + + private static int compareNullableString(String first, Variant second) { + return compareNullableString(first, second == null ? null : second.key); + } + + private static int compareNullableString(String first, Allocation second) { + return compareNullableString(first, second == null ? null : second.key); + } + + private static int compareNullableString(String first, Subject second) { + return compareNullableString(first, second == null ? null : second.id); + } + + private static int compareNullableString(String first, String second) { + String firstValue = first == null ? "" : first; + String secondValue = second == null ? "" : second; + return firstValue.compareTo(secondValue); + } + + private static Map.Entry firstEntry(Subject subject) { + if (subject == null || subject.attributes == null) { + return null; + } + Iterator> iterator = subject.attributes.entrySet().iterator(); + return iterator.hasNext() ? iterator.next() : null; + } + + private static List buildExposures(int count) { + List exposures = new ArrayList<>(); + for (int index = 0; index < count; index++) { + exposures.add(buildExposure()); + } + return exposures; + } + + private static ExposureEvent buildExposure() { + String id = UUID.randomUUID().toString(); + return new ExposureEvent( + System.currentTimeMillis(), + new Allocation("Allocation_" + id), + new Flag("Flag_" + id), + new Variant("Variant_" + id), + new Subject("Subject_" + id, singletonMap("key_" + id, (Object) ("value_" + id)))); + } +} diff --git a/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/LRUExposureCacheTest.java b/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/LRUExposureCacheTest.java new file mode 100644 index 00000000000..43c4c2d40f0 --- /dev/null +++ b/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/LRUExposureCacheTest.java @@ -0,0 +1,244 @@ +package com.datadog.featureflag; + +import static java.util.Collections.emptyMap; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import datadog.trace.api.featureflag.exposure.Allocation; +import datadog.trace.api.featureflag.exposure.ExposureEvent; +import datadog.trace.api.featureflag.exposure.Flag; +import datadog.trace.api.featureflag.exposure.Subject; +import datadog.trace.api.featureflag.exposure.Variant; +import java.util.ArrayList; +import java.util.List; +import org.junit.jupiter.api.Test; + +class LRUExposureCacheTest { + + @Test + void testAddingElements() { + LRUExposureCache cache = new LRUExposureCache(5); + ExposureEvent event = createEvent("flag", "subject", "variant", "allocation"); + + boolean added = cache.add(event); + + assertTrue(added); + assertEquals(1, cache.size()); + } + + @Test + void testAddingDuplicateEventsReturnsFalse() { + LRUExposureCache cache = new LRUExposureCache(5); + ExposureEvent event = createEvent("flag", "subject", "variant", "allocation"); + + cache.add(event); + boolean duplicateAdded = cache.add(event); + + assertFalse(duplicateAdded); + assertEquals(1, cache.size()); + } + + @Test + void testAddingEventsWithSameKeyButDifferentDetailsUpdatesCache() { + LRUExposureCache cache = new LRUExposureCache(5); + ExposureEvent event1 = createEvent("flag", "subject", "variant1", "allocation1"); + ExposureEvent event2 = createEvent("flag", "subject", "variant2", "allocation2"); + ExposureCache.Key key = new ExposureCache.Key(event1); + + boolean added1 = cache.add(event1); + boolean added2 = cache.add(event2); + ExposureCache.Value retrieved = cache.get(key); + + assertTrue(added1); + assertTrue(added2); + assertEquals(1, cache.size()); + assertEquals("variant2", retrieved.variant); + assertEquals("allocation2", retrieved.allocation); + } + + @Test + void testLruEvictionWhenCapacityExceeded() { + LRUExposureCache cache = new LRUExposureCache(2); + ExposureEvent event1 = createEvent("flag1", "subject1", "variant1", "allocation1"); + ExposureEvent event2 = createEvent("flag2", "subject2", "variant2", "allocation2"); + ExposureEvent event3 = createEvent("flag3", "subject3", "variant3", "allocation3"); + ExposureCache.Key key1 = new ExposureCache.Key(event1); + ExposureCache.Key key3 = new ExposureCache.Key(event3); + + cache.add(event1); + cache.add(event2); + cache.add(event3); + + assertEquals(2, cache.size()); + assertNull(cache.get(key1)); // event1 should be evicted + assertNotNull(cache.get(key3)); // event3 should be present + assertEquals("variant3", cache.get(key3).variant); + assertEquals("allocation3", cache.get(key3).allocation); + } + + @Test + void testSingleCapacityCache() { + LRUExposureCache cache = new LRUExposureCache(1); + ExposureEvent event1 = createEvent("flag1", "subject1", "variant1", "allocation1"); + ExposureEvent event2 = createEvent("flag2", "subject2", "variant2", "allocation2"); + + cache.add(event1); + cache.add(event2); + + assertEquals(1, cache.size()); + } + + @Test + void testZeroCapacityCache() { + LRUExposureCache cache = new LRUExposureCache(0); + ExposureEvent event = createEvent("flag", "subject", "variant", "allocation"); + + boolean added = cache.add(event); + + assertTrue(added); + assertEquals(0, cache.size()); + } + + @Test + void testEmptyCacheSize() { + LRUExposureCache cache = new LRUExposureCache(5); + + assertEquals(0, cache.size()); + } + + @Test + void testMultipleAdditionsWithSameFlagDifferentSubjects() { + LRUExposureCache cache = new LRUExposureCache(10); + List events = new ArrayList<>(); + for (int index = 0; index < 5; index++) { + events.add(createEvent("flag", "subject" + index, "variant", "allocation")); + } + + for (ExposureEvent event : events) { + assertTrue(cache.add(event)); + } + + assertEquals(5, cache.size()); + } + + @Test + void testMultipleAdditionsWithSameSubjectDifferentFlags() { + LRUExposureCache cache = new LRUExposureCache(10); + List events = new ArrayList<>(); + for (int index = 0; index < 5; index++) { + events.add(createEvent("flag" + index, "subject", "variant", "allocation")); + } + + for (ExposureEvent event : events) { + assertTrue(cache.add(event)); + } + + assertEquals(5, cache.size()); + } + + @Test + void testKeyEqualityWithNullValues() { + LRUExposureCache cache = new LRUExposureCache(5); + ExposureEvent event1 = + new ExposureEvent( + System.currentTimeMillis(), + new Allocation("allocation"), + new Flag(null), + new Variant("variant"), + new Subject(null, emptyMap())); + ExposureEvent event2 = + new ExposureEvent( + System.currentTimeMillis(), + new Allocation("allocation"), + new Flag(null), + new Variant("variant"), + new Subject(null, emptyMap())); + + cache.add(event1); + boolean duplicateAdded = cache.add(event2); + + assertFalse(duplicateAdded); + assertEquals(1, cache.size()); + } + + @Test + void testUpdatingExistingKeyMaintainsLruPosition() { + LRUExposureCache cache = new LRUExposureCache(3); + ExposureEvent event1 = createEvent("flag1", "subject1", "variant1", "allocation1"); + ExposureEvent event2 = createEvent("flag2", "subject2", "variant2", "allocation2"); + ExposureEvent event3 = createEvent("flag3", "subject3", "variant3", "allocation3"); + ExposureEvent event1Updated = createEvent("flag1", "subject1", "variant2", "allocation2"); + ExposureEvent event4 = createEvent("flag4", "subject4", "variant4", "allocation4"); + ExposureCache.Key key1 = new ExposureCache.Key(event1); + ExposureCache.Key key2 = new ExposureCache.Key(event2); + ExposureCache.Key key4 = new ExposureCache.Key(event4); + + cache.add(event1); + cache.add(event2); + cache.add(event3); + cache.add(event1Updated); // Updates event1, moves to most recent + cache.add(event4); // Should evict event2, not event1 + + assertEquals(3, cache.size()); + assertNotNull(cache.get(key1)); // event1 should be updated and present + assertEquals("variant2", cache.get(key1).variant); // verify it was updated + assertEquals("allocation2", cache.get(key1).allocation); + assertNull(cache.get(key2)); // event2 should be evicted + assertNotNull(cache.get(key4)); // event4 should be present + assertEquals("variant4", cache.get(key4).variant); + } + + @Test + void testDuplicateExposureKeepsSubjectHotInLruOrder() { + LRUExposureCache cache = new LRUExposureCache(3); + ExposureEvent event1 = createEvent("flag1", "subject1", "variant1", "allocation1"); + ExposureEvent event2 = createEvent("flag2", "subject2", "variant2", "allocation2"); + ExposureEvent event3 = createEvent("flag3", "subject3", "variant3", "allocation3"); + // same key + same details as event1: will go through the "duplicate" path + ExposureEvent event1Duplicate = createEvent("flag1", "subject1", "variant1", "allocation1"); + ExposureEvent event4 = createEvent("flag4", "subject4", "variant4", "allocation4"); + + ExposureCache.Key key1 = new ExposureCache.Key(event1); + ExposureCache.Key key2 = new ExposureCache.Key(event2); + ExposureCache.Key key4 = new ExposureCache.Key(event4); + + // Fill cache + boolean added1 = cache.add(event1); + boolean added2 = cache.add(event2); + boolean added3 = cache.add(event3); + + // Duplicate exposure for subject1: should *not* change size, but *should* bump recency + boolean duplicateAdded = cache.add(event1Duplicate); + + // Now push over capacity: the least recently used *non-hot* entry (event2) should be evicted + boolean added4 = cache.add(event4); + + assertTrue(added1); + assertTrue(added2); + assertTrue(added3); + assertFalse(duplicateAdded); // dedup correctly + assertTrue(added4); + + assertEquals(3, cache.size()); + + assertNotNull(cache.get(key1)); // hot subject1 should still be present + assertNull(cache.get(key2)); // subject2 should be evicted + assertNotNull(cache.get(key4)); // newest subject4 should be present + + assertEquals("variant1", cache.get(key1).variant); + assertEquals("allocation1", cache.get(key1).allocation); + } + + private static ExposureEvent createEvent( + String flag, String subject, String variant, String allocation) { + return new ExposureEvent( + System.currentTimeMillis(), + new Allocation(allocation), + new Flag(flag), + new Variant(variant), + new Subject(subject, emptyMap())); + } +} From ffb48aeb95a05df3d20c27afe3a7b1c5d0ba59c4 Mon Sep 17 00:00:00 2001 From: Yury Gribkov Date: Fri, 26 Jun 2026 12:13:55 -0700 Subject: [PATCH 056/139] Fix message handler spans appear disconnected from the incoming SQS trace (#11511) Add regression test for sync SQS receive response copy context loss Preserve SQS receive context across AWS SDK response rebuilding Store the receive queue URL before the SDK rebuilds ReceiveMessageResponse and propagate it through the response builder so messages() can still wrap the final list in TracingList. Also avoid wrapping messages during the SDK's internal MessageMD5ChecksumInterceptor pass to prevent creating consumer spans before user code actually consumes the messages. Merge branch 'master' into ygree/aws-sdk-sqs-bug Migrate SQS client tests to JUnit Document SQS checksum interceptor instrumentation add clarifying comments Merge branch 'master' into ygree/aws-sdk-sqs-bug Merge branch 'master' into ygree/aws-sdk-sqs-bug Co-authored-by: yury.gribkov --- .../aws/v2/TracingExecutionInterceptor.java | 24 +- ...Md5ChecksumInterceptorInstrumentation.java | 36 + .../instrumentation/aws/v2/sqs/SqsModule.java | 14 +- ...iveResponseBuilderImplInstrumentation.java | 54 ++ ...ReceiveResponseBuilderInstrumentation.java | 53 ++ .../sqs/SqsReceiveResponseInternalAccess.java | 20 + .../sqs/SqsReceiveResultInstrumentation.java | 5 + .../src/test/groovy/SqsClientTest.groovy | 683 --------------- .../src/test/java/SqsClientTest.java | 793 ++++++++++++++++++ 9 files changed, 989 insertions(+), 693 deletions(-) create mode 100644 dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsMd5ChecksumInterceptorInstrumentation.java create mode 100644 dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveResponseBuilderImplInstrumentation.java create mode 100644 dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveResponseBuilderInstrumentation.java create mode 100644 dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveResponseInternalAccess.java delete mode 100644 dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/test/groovy/SqsClientTest.groovy create mode 100644 dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/test/java/SqsClientTest.java diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/TracingExecutionInterceptor.java b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/TracingExecutionInterceptor.java index 4969eff41f6..8c0492406e1 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/TracingExecutionInterceptor.java +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/TracingExecutionInterceptor.java @@ -28,6 +28,7 @@ import software.amazon.awssdk.core.interceptor.Context.BeforeTransmission; import software.amazon.awssdk.core.interceptor.Context.FailedExecution; import software.amazon.awssdk.core.interceptor.Context.ModifyHttpRequest; +import software.amazon.awssdk.core.interceptor.Context.ModifyResponse; import software.amazon.awssdk.core.interceptor.ExecutionAttribute; import software.amazon.awssdk.core.interceptor.ExecutionAttributes; import software.amazon.awssdk.core.interceptor.ExecutionInterceptor; @@ -111,6 +112,22 @@ public void beforeTransmission( } } + @Override + public SdkResponse modifyResponse( + final ModifyResponse context, final ExecutionAttributes executionAttributes) { + final SdkResponse response = context.response(); + if (!AWS_LEGACY_TRACING && isPollingRequest(context.request()) && isPollingResponse(response)) { + // Attach queueUrl before AWS SDK core rebuilds the response with + // toBuilder().sdkHttpResponse(...).build(). afterExecution sees this pre-rebuild response, + // not the final response returned to user code, so capturing queueUrl there is too late. + context + .request() + .getValueForField("QueueUrl", String.class) + .ifPresent(queueUrl -> responseQueueStore.put(response, queueUrl)); + } + return response; + } + @Override public void afterExecution( final AfterExecution context, final ExecutionAttributes executionAttributes) { @@ -124,13 +141,6 @@ public void afterExecution( DECORATE.beforeFinish(span); span.finish(); } - if (!AWS_LEGACY_TRACING && isPollingResponse(context.response())) { - // store queueUrl inside response for SqsReceiveResultInstrumentation - context - .request() - .getValueForField("QueueUrl", String.class) - .ifPresent(queueUrl -> responseQueueStore.put(context.response(), queueUrl)); - } } @Override diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsMd5ChecksumInterceptorInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsMd5ChecksumInterceptorInstrumentation.java new file mode 100644 index 00000000000..074f09ca47c --- /dev/null +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsMd5ChecksumInterceptorInstrumentation.java @@ -0,0 +1,36 @@ +package datadog.trace.instrumentation.aws.v2.sqs; + +import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; +import static net.bytebuddy.matcher.ElementMatchers.isMethod; + +import datadog.trace.agent.tooling.Instrumenter; +import net.bytebuddy.asm.Advice; + +public final class SqsMd5ChecksumInterceptorInstrumentation + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { + + @Override + public String instrumentedType() { + // The AWS SDK checksum interceptor reads ReceiveMessageResponse.messages() while finalizing + // the response. Mark that internal access so we only wrap messages for application code. + return "software.amazon.awssdk.services.sqs.internal.MessageMD5ChecksumInterceptor"; + } + + @Override + public void methodAdvice(MethodTransformer transformer) { + transformer.applyAdvice( + isMethod().and(named("afterExecution")), getClass().getName() + "$AfterExecutionAdvice"); + } + + public static class AfterExecutionAdvice { + @Advice.OnMethodEnter(suppress = Throwable.class) + public static void onEnter() { + SqsReceiveResponseInternalAccess.enter(); + } + + @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) + public static void onExit() { + SqsReceiveResponseInternalAccess.exit(); + } + } +} diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsModule.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsModule.java index 5db7932aeef..4d2fe577bd1 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsModule.java +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsModule.java @@ -5,7 +5,6 @@ import datadog.trace.agent.tooling.InstrumenterModule; import datadog.trace.api.InstrumenterConfig; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Map; @@ -24,6 +23,7 @@ public String[] helperClassNames() { "datadog.trace.instrumentation.aws.v2.sqs.MessageAttributeInjector", "datadog.trace.instrumentation.aws.v2.sqs.MessageExtractAdapter", "datadog.trace.instrumentation.aws.v2.sqs.SqsDecorator", + "datadog.trace.instrumentation.aws.v2.sqs.SqsReceiveResponseInternalAccess", "datadog.trace.instrumentation.aws.v2.sqs.TracingIterator", "datadog.trace.instrumentation.aws.v2.sqs.TracingList", "datadog.trace.instrumentation.aws.v2.sqs.TracingListIterator" @@ -32,17 +32,25 @@ public String[] helperClassNames() { @Override public Map contextStore() { - return Collections.singletonMap( + Map contextStore = new java.util.HashMap<>(); + contextStore.put( "software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse", "java.lang.String"); + contextStore.put( + "software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse$BuilderImpl", + "java.lang.String"); + return contextStore; } @Override public List typeInstrumentations() { - final List ret = new ArrayList<>(4); + final List ret = new ArrayList<>(6); ret.add(new SqsClientInstrumentation()); ret.add(new SqsReceiveRequestInstrumentation()); // we don't need to instrument messages when we're doing legacy AWS-SDK tracing if (!InstrumenterConfig.get().isLegacyInstrumentationEnabled(false, "aws-sdk")) { + ret.add(new SqsMd5ChecksumInterceptorInstrumentation()); + ret.add(new SqsReceiveResponseBuilderInstrumentation()); + ret.add(new SqsReceiveResponseBuilderImplInstrumentation()); ret.add(new SqsReceiveResultInstrumentation()); } return ret; diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveResponseBuilderImplInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveResponseBuilderImplInstrumentation.java new file mode 100644 index 00000000000..9b6266ef0ad --- /dev/null +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveResponseBuilderImplInstrumentation.java @@ -0,0 +1,54 @@ +package datadog.trace.instrumentation.aws.v2.sqs; + +import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; +import static net.bytebuddy.matcher.ElementMatchers.isMethod; +import static net.bytebuddy.matcher.ElementMatchers.returns; +import static net.bytebuddy.matcher.ElementMatchers.takesNoArguments; + +import datadog.trace.agent.tooling.Instrumenter; +import datadog.trace.bootstrap.ContextStore; +import datadog.trace.bootstrap.InstrumentationContext; +import net.bytebuddy.asm.Advice; +import software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse; + +public final class SqsReceiveResponseBuilderImplInstrumentation + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { + + private static final String BUILDER_IMPL = + "software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse$BuilderImpl"; + + @Override + public String instrumentedType() { + return BUILDER_IMPL; + } + + @Override + public void methodAdvice(MethodTransformer transformer) { + transformer.applyAdvice( + isMethod() + .and(named("build")) + .and(takesNoArguments()) + .and( + returns(named("software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse"))), + getClass().getName() + "$BuildAdvice"); + } + + public static class BuildAdvice { + @Advice.OnMethodExit(suppress = Throwable.class) + public static void onExit( + @Advice.This Object builder, @Advice.Return ReceiveMessageResponse response) { + if (response == null) { + return; + } + ContextStore builderStore = + InstrumentationContext.get(BUILDER_IMPL, "java.lang.String"); + String queueUrl = builderStore.get(builder); + if (queueUrl != null) { + // Complete the handoff from the pre-rebuild response to the final response user code + // sees. + InstrumentationContext.get(ReceiveMessageResponse.class, String.class) + .put(response, queueUrl); + } + } + } +} diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveResponseBuilderInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveResponseBuilderInstrumentation.java new file mode 100644 index 00000000000..3fc1ffeb55d --- /dev/null +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveResponseBuilderInstrumentation.java @@ -0,0 +1,53 @@ +package datadog.trace.instrumentation.aws.v2.sqs; + +import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; +import static net.bytebuddy.matcher.ElementMatchers.isMethod; +import static net.bytebuddy.matcher.ElementMatchers.returns; +import static net.bytebuddy.matcher.ElementMatchers.takesNoArguments; + +import datadog.trace.agent.tooling.Instrumenter; +import datadog.trace.bootstrap.InstrumentationContext; +import net.bytebuddy.asm.Advice; +import software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse; + +public final class SqsReceiveResponseBuilderInstrumentation + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { + + private static final String BUILDER_IMPL = + "software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse$BuilderImpl"; + + @Override + public String instrumentedType() { + return "software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse"; + } + + @Override + public void methodAdvice(MethodTransformer transformer) { + transformer.applyAdvice( + isMethod() + .and(named("toBuilder")) + .and(takesNoArguments()) + .and( + returns( + named( + "software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse$Builder"))), + getClass().getName() + "$ToBuilderAdvice"); + } + + public static class ToBuilderAdvice { + @Advice.OnMethodExit(suppress = Throwable.class) + public static void onExit( + @Advice.This ReceiveMessageResponse response, @Advice.Return Object builder) { + if (builder == null) { + return; + } + String queueUrl = + InstrumentationContext.get(ReceiveMessageResponse.class, String.class).get(response); + if (queueUrl != null) { + // AWS SDK core finalizes modeled responses through response.toBuilder().build(). + // Carry queueUrl onto the builder so it survives that response instance change. + InstrumentationContext.get(BUILDER_IMPL, "java.lang.String").put(builder, queueUrl); + } + } + } +} diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveResponseInternalAccess.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveResponseInternalAccess.java new file mode 100644 index 00000000000..aa73af23641 --- /dev/null +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveResponseInternalAccess.java @@ -0,0 +1,20 @@ +package datadog.trace.instrumentation.aws.v2.sqs; + +import datadog.trace.bootstrap.CallDepthThreadLocalMap; + +public final class SqsReceiveResponseInternalAccess { + + private SqsReceiveResponseInternalAccess() {} + + public static void enter() { + CallDepthThreadLocalMap.incrementCallDepth(SqsReceiveResponseInternalAccess.class); + } + + public static void exit() { + CallDepthThreadLocalMap.decrementCallDepth(SqsReceiveResponseInternalAccess.class); + } + + public static boolean active() { + return CallDepthThreadLocalMap.getCallDepth(SqsReceiveResponseInternalAccess.class) > 0; + } +} diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveResultInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveResultInstrumentation.java index 148fd04479a..9b53fd8a316 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveResultInstrumentation.java +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveResultInstrumentation.java @@ -29,6 +29,11 @@ public static class GetMessagesAdvice { public static void onExit( @Advice.This ReceiveMessageResponse result, @Advice.Return(readOnly = false) List messages) { + if (SqsReceiveResponseInternalAccess.active()) { + // AWS SDK's MD5 checksum interceptor calls messages() during afterExecution. That should + // not create consumer spans; those belong around application message processing. + return; + } if (messages != null && !messages.isEmpty() && !(messages instanceof TracingList)) { String queueUrl = InstrumentationContext.get(ReceiveMessageResponse.class, String.class).get(result); diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/test/groovy/SqsClientTest.groovy b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/test/groovy/SqsClientTest.groovy deleted file mode 100644 index 0b8bbdc9207..00000000000 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/test/groovy/SqsClientTest.groovy +++ /dev/null @@ -1,683 +0,0 @@ -import static datadog.trace.agent.test.utils.TraceUtils.basicSpan -import static java.nio.charset.StandardCharsets.UTF_8 -import datadog.trace.api.config.TraceInstrumentationConfig - -import com.amazon.sqs.javamessaging.ProviderConfiguration -import com.amazon.sqs.javamessaging.SQSConnectionFactory -import datadog.trace.agent.test.naming.VersionedNamingTestBase -import datadog.trace.agent.test.utils.TraceUtils -import datadog.trace.api.Config -import datadog.trace.api.DDSpanId -import datadog.trace.api.DDSpanTypes -import datadog.trace.api.DDTags -import datadog.trace.api.config.GeneralConfig -import datadog.trace.api.naming.SpanNaming -import datadog.trace.bootstrap.instrumentation.api.InstrumentationTags -import datadog.trace.bootstrap.instrumentation.api.Tags -import datadog.trace.core.datastreams.StatsGroup -import datadog.trace.instrumentation.aws.ExpectedQueryParams -import datadog.trace.instrumentation.aws.v2.sqs.TracingList -import javax.jms.Session -import org.elasticmq.rest.sqs.SQSRestServerBuilder -import software.amazon.awssdk.auth.credentials.AnonymousCredentialsProvider -import software.amazon.awssdk.core.SdkBytes -import software.amazon.awssdk.core.SdkSystemSetting -import software.amazon.awssdk.regions.Region -import software.amazon.awssdk.services.sqs.SqsClient -import software.amazon.awssdk.services.sqs.model.CreateQueueRequest -import software.amazon.awssdk.services.sqs.model.Message -import software.amazon.awssdk.services.sqs.model.MessageAttributeValue -import software.amazon.awssdk.services.sqs.model.ReceiveMessageRequest -import software.amazon.awssdk.services.sqs.model.SendMessageRequest -import spock.lang.IgnoreIf -import spock.lang.Shared - -abstract class SqsClientTest extends VersionedNamingTestBase { - - def setup() { - System.setProperty(SdkSystemSetting.AWS_ACCESS_KEY_ID.property(), "my-access-key") - System.setProperty(SdkSystemSetting.AWS_SECRET_ACCESS_KEY.property(), "my-secret-key") - } - - @Override - protected void configurePreAgent() { - super.configurePreAgent() - // Set a service name that gets sorted early with SORT_BY_NAMES - injectSysConfig(GeneralConfig.SERVICE_NAME, "A-service") - injectSysConfig(GeneralConfig.DATA_STREAMS_ENABLED, isDataStreamsEnabled().toString()) - } - - @Shared - def credentialsProvider = AnonymousCredentialsProvider.create() - @Shared - def server = SQSRestServerBuilder.withInterface("localhost").withDynamicPort().start() - @Shared - def address = server.waitUntilStarted().localAddress() - @Shared - def endpoint = URI.create("http://localhost:${address.port}") - - def cleanupSpec() { - if (server != null) { - try { - server.stopAndWait() - } catch (InterruptedException ie) { - Thread.currentThread().interrupt() - } - } - } - - @Override - String operation() { - null - } - - @Override - String service() { - null - } - - boolean hasTimeInQueueSpan() { - false - } - - abstract String expectedOperation(String awsService, String awsOperation) - - abstract String expectedService(String awsService, String awsOperation) - - def "trace details propagated via SQS system message attributes"() { - setup: - def client = SqsClient.builder() - .region(Region.EU_CENTRAL_1) - .endpointOverride(endpoint) - .credentialsProvider(credentialsProvider) - .build() - def queueUrl = client.createQueue(CreateQueueRequest.builder().queueName('somequeue').build()).queueUrl() - TEST_WRITER.clear() - - when: - TraceUtils.runUnderTrace('parent', { - client.sendMessage(SendMessageRequest.builder().queueUrl(queueUrl).messageBody('sometext').build()) - }) - def messages = client.receiveMessage(ReceiveMessageRequest.builder().queueUrl(queueUrl).build()).messages() - - if (isDataStreamsEnabled()) { - TEST_DATA_STREAMS_WRITER.waitForGroups(2) - } - - messages.forEach {/* consume to create message spans */ } - - then: - def sendSpan - assertTraces(2) { - trace(2) { - basicSpan(it, "parent") - span { - serviceName expectedService("Sqs", "SendMessage") - operationName expectedOperation("Sqs", "SendMessage") - resourceName "Sqs.SendMessage" - spanType DDSpanTypes.HTTP_CLIENT - errored false - measured true - childOf(span(0)) - tags { - "$Tags.COMPONENT" "java-aws-sdk" - "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT - "$Tags.HTTP_METHOD" "POST" - "$Tags.HTTP_STATUS" 200 - "$Tags.PEER_PORT" address.port - "$Tags.PEER_HOSTNAME" "localhost" - "aws.service" "Sqs" - "aws_service" "Sqs" - "aws.operation" "SendMessage" - "aws.agent" "java-aws-sdk" - "aws.queue.url" "http://localhost:${address.port}/000000000000/somequeue" - "aws.requestId" "00000000-0000-0000-0000-000000000000" - if ({ isDataStreamsEnabled() }) { - "$DDTags.PATHWAY_HASH" { String } - } - urlTags("http://localhost:${address.port}/", ExpectedQueryParams.getExpectedQueryParams("SendMessage")) - serviceNameSource("java-aws-sdk") - defaultTags() - } - } - sendSpan = span(1) - } - trace(1) { - span { - serviceName expectedService("Sqs", "ReceiveMessage") - operationName expectedOperation("Sqs", "ReceiveMessage") - resourceName "Sqs.ReceiveMessage" - spanType DDSpanTypes.MESSAGE_CONSUMER - errored false - measured true - childOf(sendSpan) - tags { - "$Tags.COMPONENT" "java-aws-sdk" - "$Tags.SPAN_KIND" Tags.SPAN_KIND_CONSUMER - "aws.service" "Sqs" - "aws_service" "Sqs" - "aws.operation" "ReceiveMessage" - "aws.agent" "java-aws-sdk" - "aws.queue.url" "http://localhost:${address.port}/000000000000/somequeue" - "aws.requestId" "00000000-0000-0000-0000-000000000000" - if ({ isDataStreamsEnabled() }) { - "$DDTags.PATHWAY_HASH" { String } - } - defaultTags(true) - } - } - } - } - - and: - if (isDataStreamsEnabled()) { - StatsGroup first = TEST_DATA_STREAMS_WRITER.groups.find { it.parentHash == 0 } - - verifyAll(first) { - tags.hasAllTags("direction:out", "topic:somequeue", "type:sqs") - } - - StatsGroup second = TEST_DATA_STREAMS_WRITER.groups.find { it.parentHash == first.hash } - verifyAll(second) { - tags.hasAllTags("direction:in", "topic:somequeue", "type:sqs") - } - } - - assert messages[0].attributesAsStrings()['AWSTraceHeader'] =~ - /Root=1-[0-9a-f]{8}-00000000${sendSpan.traceId.toHexStringPadded(16)};Parent=${DDSpanId.toHexStringPadded(sendSpan.spanId)};Sampled=1/ - - cleanup: - client.close() - } - - def "dadatog context is not injected if SqsInjectDatadogAttribute is disabled"() { - setup: - injectSysConfig("sqs.inject.datadog.attribute.enabled", "false") - def client = SqsClient.builder() - .region(Region.EU_CENTRAL_1) - .endpointOverride(endpoint) - .credentialsProvider(credentialsProvider) - .build() - def queueUrl = client.createQueue(CreateQueueRequest.builder().queueName('somequeue').build()).queueUrl() - TEST_WRITER.clear() - - when: - client.sendMessage(SendMessageRequest.builder().queueUrl(queueUrl).messageBody('sometext').build()) - def messages = client.receiveMessage(ReceiveMessageRequest.builder().queueUrl(queueUrl).build()).messages() - - if (isDataStreamsEnabled()) { - TEST_DATA_STREAMS_WRITER.waitForGroups(1) - } - - then: - assert !messages[0].messageAttributes().containsKey("_datadog") - - cleanup: - client.close() - } - def "APM trace context is injected into _datadog message attribute on send"() { - setup: - def client = SqsClient.builder() - .region(Region.EU_CENTRAL_1) - .endpointOverride(endpoint) - .credentialsProvider(credentialsProvider) - .build() - def queueUrl = client.createQueue(CreateQueueRequest.builder().queueName('somequeue').build()).queueUrl() - TEST_WRITER.clear() - - when: - TraceUtils.runUnderTrace('parent', { - client.sendMessage(SendMessageRequest.builder().queueUrl(queueUrl).messageBody('sometext').build()) - }) - def messages = client.receiveMessage(ReceiveMessageRequest.builder().queueUrl(queueUrl).build()).messages() - - if (isDataStreamsEnabled()) { - TEST_DATA_STREAMS_WRITER.waitForGroups(2) - } - - messages.forEach {/* consume to create message spans */ } - - then: - def sendSpan - assertTraces(2) { - trace(2) { - basicSpan(it, 'parent') - span { - serviceName expectedService("Sqs", "SendMessage") - operationName expectedOperation("Sqs", "SendMessage") - resourceName "Sqs.SendMessage" - spanType DDSpanTypes.HTTP_CLIENT - errored false - measured true - childOf(span(0)) - tags { - "$Tags.COMPONENT" "java-aws-sdk" - "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT - "$Tags.HTTP_METHOD" "POST" - "$Tags.HTTP_STATUS" 200 - "$Tags.PEER_PORT" address.port - "$Tags.PEER_HOSTNAME" "localhost" - "aws.service" "Sqs" - "aws_service" "Sqs" - "aws.operation" "SendMessage" - "aws.agent" "java-aws-sdk" - "aws.queue.url" "http://localhost:${address.port}/000000000000/somequeue" - "aws.requestId" "00000000-0000-0000-0000-000000000000" - if ({ isDataStreamsEnabled() }) { - "$DDTags.PATHWAY_HASH" { String } - } - urlTags("http://localhost:${address.port}/", ExpectedQueryParams.getExpectedQueryParams("SendMessage")) - serviceNameSource("java-aws-sdk") - defaultTags() - } - } - sendSpan = span(1) - } - trace(1) { - span { - serviceName expectedService("Sqs", "ReceiveMessage") - operationName expectedOperation("Sqs", "ReceiveMessage") - resourceName "Sqs.ReceiveMessage" - spanType DDSpanTypes.MESSAGE_CONSUMER - errored false - measured true - childOf(sendSpan) - tags { - "$Tags.COMPONENT" "java-aws-sdk" - "$Tags.SPAN_KIND" Tags.SPAN_KIND_CONSUMER - "aws.service" "Sqs" - "aws_service" "Sqs" - "aws.operation" "ReceiveMessage" - "aws.agent" "java-aws-sdk" - "aws.queue.url" "http://localhost:${address.port}/000000000000/somequeue" - "aws.requestId" "00000000-0000-0000-0000-000000000000" - if ({ isDataStreamsEnabled() }) { - "$DDTags.PATHWAY_HASH" { String } - } - defaultTags(true) - } - } - } - } - - def ddAttr = messages[0].messageAttributes()['_datadog'] - ddAttr != null - ddAttr.dataType() == 'String' - ddAttr.stringValue().contains('"x-datadog-trace-id"') - ddAttr.stringValue().contains(sendSpan.traceId.toString()) - ddAttr.stringValue().contains('"x-datadog-parent-id"') - ddAttr.stringValue().contains(Long.toUnsignedString(sendSpan.spanId)) - - cleanup: - client.close() - } - - @IgnoreIf({instance.isDataStreamsEnabled()}) - def "trace details propagated via embedded SQS message attribute (string)"() { - setup: - TEST_WRITER.clear() - - when: - def message = Message.builder().messageAttributes(['_datadog': MessageAttributeValue.builder().dataType('String').stringValue( - "{\"x-datadog-trace-id\": \"4948377316357291421\", \"x-datadog-parent-id\": \"6746998015037429512\", \"x-datadog-sampling-priority\": \"1\"}" - ).build()]).build() - def messages = new TracingList([message], - "http://localhost:${address.port}/000000000000/somequeue", - "00000000-0000-0000-0000-000000000000") - - messages.forEach {/* consume to create message spans */ } - - then: - assertTraces(1) { - trace(1) { - span { - serviceName expectedService("Sqs", "ReceiveMessage") - operationName expectedOperation("Sqs", "ReceiveMessage") - resourceName "Sqs.ReceiveMessage" - spanType DDSpanTypes.MESSAGE_CONSUMER - errored false - measured true - traceId(4948377316357291421 as BigInteger) - parentSpanId(6746998015037429512 as BigInteger) - tags { - "$Tags.COMPONENT" "java-aws-sdk" - "$Tags.SPAN_KIND" Tags.SPAN_KIND_CONSUMER - "aws.service" "Sqs" - "aws_service" "Sqs" - "aws.operation" "ReceiveMessage" - "aws.agent" "java-aws-sdk" - "aws.queue.url" "http://localhost:${address.port}/000000000000/somequeue" - "aws.requestId" "00000000-0000-0000-0000-000000000000" - defaultTags(true) - } - } - } - } - } - - @IgnoreIf({instance.isDataStreamsEnabled()}) - def "trace details propagated via embedded SQS message attribute (binary)"() { - setup: - TEST_WRITER.clear() - - when: - def message = Message.builder().messageAttributes(['_datadog': MessageAttributeValue.builder().dataType('Binary').binaryValue(SdkBytes.fromByteBuffer( - headerValue - )).build()]).build() - def messages = new TracingList([message], - "http://localhost:${address.port}/000000000000/somequeue", - "00000000-0000-0000-0000-000000000000") - - messages.forEach {/* consume to create message spans */ } - - then: - assertTraces(1) { - trace(1) { - span { - serviceName expectedService("Sqs", "ReceiveMessage") - operationName expectedOperation("Sqs", "ReceiveMessage") - resourceName "Sqs.ReceiveMessage" - spanType DDSpanTypes.MESSAGE_CONSUMER - errored false - measured true - traceId(4948377316357291421 as BigInteger) - parentSpanId(6746998015037429512 as BigInteger) - tags { - "$Tags.COMPONENT" "java-aws-sdk" - "$Tags.SPAN_KIND" Tags.SPAN_KIND_CONSUMER - "aws.service" "Sqs" - "aws_service" "Sqs" - "aws.operation" "ReceiveMessage" - "aws.agent" "java-aws-sdk" - "aws.queue.url" "http://localhost:${address.port}/000000000000/somequeue" - "aws.requestId" "00000000-0000-0000-0000-000000000000" - defaultTags(true) - } - } - } - } - - where: - headerValue << [ - UTF_8.encode('{"x-datadog-trace-id":"4948377316357291421","x-datadog-parent-id":"6746998015037429512","x-datadog-sampling-priority":"1"}'), - // not sure this test case with base 64 corresponds to an actual use case - UTF_8.encode('eyJ4LWRhdGFkb2ctdHJhY2UtaWQiOiI0OTQ4Mzc3MzE2MzU3MjkxNDIxIiwieC1kYXRhZG9nLXBhcmVudC1pZCI6IjY3NDY5OTgwMTUwMzc0Mjk1MTIiLCJ4LWRhdGFkb2ctc2FtcGxpbmctcHJpb3JpdHkiOiIxIn0=') - ] - } - - @IgnoreIf({instance.isDataStreamsEnabled()}) - def "trace details propagated from SQS to JMS"() { - setup: - def client = SqsClient.builder() - .region(Region.EU_CENTRAL_1) - .endpointOverride(endpoint) - .credentialsProvider(credentialsProvider) - .build() - - def connectionFactory = new SQSConnectionFactory(new ProviderConfiguration(), client) - def connection = connectionFactory.createConnection() - def session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE) - def queue = session.createQueue('somequeue') - def consumer = session.createConsumer(queue) - - TEST_WRITER.clear() - - when: - def ddMsgAttribute = MessageAttributeValue.builder() - .dataType("Binary") - .binaryValue(SdkBytes.fromUtf8String("hello world")).build() - connection.start() - TraceUtils.runUnderTrace('parent') { - client.sendMessage(SendMessageRequest.builder() - .queueUrl(queue.queueUrl) - .messageBody('sometext') - .messageAttributes([_datadog: ddMsgAttribute]).build()) - } - def message = consumer.receive() - consumer.receiveNoWait() - - then: - def sendSpan - def timeInQueue = hasTimeInQueueSpan() - - assertTraces(4, SORT_TRACES_BY_START) { - trace(2) { - basicSpan(it, "parent") - span { - serviceName expectedService("Sqs", "SendMessage") - operationName expectedOperation("Sqs", "SendMessage") - resourceName "Sqs.SendMessage" - spanType DDSpanTypes.HTTP_CLIENT - errored false - measured true - childOf(span(0)) - tags { - "$Tags.COMPONENT" "java-aws-sdk" - "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT - "$Tags.HTTP_METHOD" "POST" - "$Tags.HTTP_STATUS" 200 - "$Tags.PEER_PORT" address.port - "$Tags.PEER_HOSTNAME" "localhost" - "aws.service" "Sqs" - "aws_service" "Sqs" - "aws.operation" "SendMessage" - "aws.agent" "java-aws-sdk" - "aws.queue.url" "http://localhost:${address.port}/000000000000/somequeue" - "aws.requestId" "00000000-0000-0000-0000-000000000000" - urlTags("http://localhost:${address.port}/", ExpectedQueryParams.getExpectedQueryParams("SendMessage")) - serviceNameSource("java-aws-sdk") - defaultTags() - } - } - sendSpan = span(1) - } - trace(timeInQueue ? 2 : 1) { - span { - serviceName expectedService("Sqs", "ReceiveMessage") - operationName expectedOperation("Sqs", "ReceiveMessage") - resourceName "Sqs.ReceiveMessage" - spanType DDSpanTypes.MESSAGE_CONSUMER - errored false - measured true - childOf(timeInQueue ? span(1): sendSpan) - tags { - "$Tags.COMPONENT" "java-aws-sdk" - "$Tags.SPAN_KIND" Tags.SPAN_KIND_CONSUMER - "aws.service" "Sqs" - "aws_service" "Sqs" - "aws.operation" "ReceiveMessage" - "aws.agent" "java-aws-sdk" - "aws.queue.url" "http://localhost:${address.port}/000000000000/somequeue" - "aws.requestId" "00000000-0000-0000-0000-000000000000" - defaultTags(!timeInQueue) - } - } - if (timeInQueue) { - // only v1 has this automatically without legacy disabled - span { - serviceName "sqs-queue" - operationName "aws.sqs.deliver" - resourceName "Sqs.DeliverMessage" - spanType DDSpanTypes.MESSAGE_BROKER - errored false - measured true - childOf(sendSpan) - tags { - "$Tags.COMPONENT" "java-aws-sdk" - "$Tags.SPAN_KIND" Tags.SPAN_KIND_BROKER - "aws.queue.url" "http://localhost:${address.port}/000000000000/somequeue" - "aws.requestId" "00000000-0000-0000-0000-000000000000" - defaultTags(true) - } - } - } - } - trace(1) { - span { - serviceName expectedService("Sqs", "DeleteMessage") - operationName expectedOperation("Sqs", "DeleteMessage") - resourceName "Sqs.DeleteMessage" - spanType DDSpanTypes.HTTP_CLIENT - errored false - measured true - parent() - tags { - "$Tags.COMPONENT" "java-aws-sdk" - "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT - "$Tags.HTTP_METHOD" "POST" - "$Tags.HTTP_STATUS" 200 - "$Tags.PEER_PORT" address.port - "$Tags.PEER_HOSTNAME" "localhost" - "aws.service" "Sqs" - "aws_service" "Sqs" - "aws.operation" "DeleteMessage" - "aws.agent" "java-aws-sdk" - "aws.queue.url" "http://localhost:${address.port}/000000000000/somequeue" - "aws.requestId" { it.trim() == "00000000-0000-0000-0000-000000000000" } // the test server seem messing with request id and insert \n - urlTags("http://localhost:${address.port}/", ExpectedQueryParams.getExpectedQueryParams("DeleteMessage")) - serviceNameSource("java-aws-sdk") - defaultTags() - } - } - } - trace(1) { - span { - serviceName SpanNaming.instance().namingSchema().messaging().inboundService("jms", Config.get().isJmsLegacyTracingEnabled()).get() ?: Config.get().getServiceName() - operationName SpanNaming.instance().namingSchema().messaging().inboundOperation("jms") - resourceName "Consumed from Queue somequeue" - spanType DDSpanTypes.MESSAGE_CONSUMER - errored false - measured true - childOf(sendSpan) - tags { - "$Tags.COMPONENT" "jms" - "$Tags.SPAN_KIND" Tags.SPAN_KIND_CONSUMER - "$InstrumentationTags.RECORD_QUEUE_TIME_MS" { it >= 0 } - defaultTags(true) - } - } - } - } - - def expectedTraceProperty = 'X-Amzn-Trace-Id'.toLowerCase(Locale.ENGLISH).replace('-', '__dash__') - assert message.getStringProperty(expectedTraceProperty) =~ - /Root=1-[0-9a-f]{8}-00000000${sendSpan.traceId.toHexStringPadded(16)};Parent=${DDSpanId.toHexStringPadded(sendSpan.spanId)};Sampled=1/ - assert !message.propertyExists("_datadog") - - cleanup: - session.close() - connection.stop() - client.close() - } -} - -class SqsClientV0Test extends SqsClientTest { - - @Override - String expectedOperation(String awsService, String awsOperation) { - "aws.http" - } - - @Override - String expectedService(String awsService, String awsOperation) { - if ("Sqs" == awsService) { - return "sqs" - } - return "java-aws-sdk" - } - - @Override - int version() { - 0 - } -} - -class SqsClientV1ForkedTest extends SqsClientTest { - - @Override - String expectedOperation(String awsService, String awsOperation) { - if (awsService == "Sqs") { - if (awsOperation == "ReceiveMessage") { - return "aws.sqs.process" - } else if (awsOperation == "SendMessage") { - return "aws.sqs.send" - } - } - return "aws.${awsService.toLowerCase()}.request" - } - - @Override - String expectedService(String awsService, String awsOperation) { - "A-service" - } - - @Override - int version() { - 1 - } -} - -class SqsClientV0DataStreamsTest extends SqsClientTest { - @Override - String expectedOperation(String awsService, String awsOperation) { - "aws.http" - } - - @Override - String expectedService(String awsService, String awsOperation) { - if ("Sqs" == awsService) { - return "sqs" - } - return "java-aws-sdk" - } - - @Override - boolean isDataStreamsEnabled() { - true - } - - - @Override - int version() { - 0 - } -} - -class SqsClientV1DataStreamsForkedTest extends SqsClientTest { - @Override - String expectedOperation(String awsService, String awsOperation) { - if (awsService == "Sqs") { - if (awsOperation == "ReceiveMessage") { - return "aws.sqs.process" - } else if (awsOperation == "SendMessage") { - return "aws.sqs.send" - } - } - return "aws.${awsService.toLowerCase()}.request" - } - - @Override - String expectedService(String awsService, String awsOperation) { - "A-service" - } - - @Override - boolean isDataStreamsEnabled() { - true - } - - @Override - int version() { - 1 - } -} - -class SqsClientV0ContextSwapForkedTest extends SqsClientV0Test { - @Override - protected void configurePreAgent() { - super.configurePreAgent() - injectSysConfig(TraceInstrumentationConfig.LEGACY_CONTEXT_MANAGER_ENABLED, "false") - } -} - - diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/test/java/SqsClientTest.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/test/java/SqsClientTest.java new file mode 100644 index 00000000000..33c17c887ff --- /dev/null +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/test/java/SqsClientTest.java @@ -0,0 +1,793 @@ +import static java.nio.charset.StandardCharsets.UTF_8; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assumptions.assumeFalse; + +import com.amazon.sqs.javamessaging.ProviderConfiguration; +import com.amazon.sqs.javamessaging.SQSConnectionFactory; +import datadog.trace.agent.test.AbstractInstrumentationTest; +import datadog.trace.agent.test.utils.TraceUtils; +import datadog.trace.api.Config; +import datadog.trace.api.DDSpanId; +import datadog.trace.api.DDSpanTypes; +import datadog.trace.api.config.GeneralConfig; +import datadog.trace.api.config.TraceInstrumentationConfig; +import datadog.trace.api.config.TracerConfig; +import datadog.trace.api.naming.SpanNaming; +import datadog.trace.bootstrap.instrumentation.api.AgentTracer; +import datadog.trace.bootstrap.instrumentation.api.InstrumentationTags; +import datadog.trace.bootstrap.instrumentation.api.Tags; +import datadog.trace.core.DDSpan; +import datadog.trace.instrumentation.aws.v2.sqs.TracingList; +import datadog.trace.junit.utils.config.WithConfig; +import java.net.InetSocketAddress; +import java.net.URI; +import java.nio.ByteBuffer; +import java.util.Collections; +import java.util.List; +import java.util.Locale; +import java.util.concurrent.atomic.AtomicInteger; +import javax.jms.Connection; +import javax.jms.MessageConsumer; +import javax.jms.Queue; +import javax.jms.Session; +import org.elasticmq.rest.sqs.SQSRestServer; +import org.elasticmq.rest.sqs.SQSRestServerBuilder; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import software.amazon.awssdk.auth.credentials.AnonymousCredentialsProvider; +import software.amazon.awssdk.core.SdkBytes; +import software.amazon.awssdk.core.SdkSystemSetting; +import software.amazon.awssdk.regions.Region; +import software.amazon.awssdk.services.sqs.SqsClient; +import software.amazon.awssdk.services.sqs.model.CreateQueueRequest; +import software.amazon.awssdk.services.sqs.model.Message; +import software.amazon.awssdk.services.sqs.model.MessageAttributeValue; +import software.amazon.awssdk.services.sqs.model.ReceiveMessageRequest; +import software.amazon.awssdk.services.sqs.model.SendMessageRequest; + +@WithConfig(key = GeneralConfig.SERVICE_NAME, value = "A-service") +abstract class SqsClientTestBase extends AbstractInstrumentationTest { + private static final AnonymousCredentialsProvider CREDENTIALS_PROVIDER = + AnonymousCredentialsProvider.create(); + private static final AtomicInteger QUEUE_COUNTER = new AtomicInteger(); + private static SQSRestServer server; + private static URI endpoint; + + @BeforeAll + static void startSqsServer() { + server = SQSRestServerBuilder.withInterface("localhost").withDynamicPort().start(); + InetSocketAddress address = server.waitUntilStarted().localAddress(); + endpoint = URI.create("http://localhost:" + address.getPort()); + } + + @AfterAll + static void stopSqsServer() { + if (server != null) { + server.stopAndWait(); + server = null; + } + } + + @BeforeEach + void setUpAwsCredentials() { + System.setProperty(SdkSystemSetting.AWS_ACCESS_KEY_ID.property(), "my-access-key"); + System.setProperty(SdkSystemSetting.AWS_SECRET_ACCESS_KEY.property(), "my-secret-key"); + } + + @Test + void traceDetailsPropagatedViaSqsSystemMessageAttributes() throws Exception { + try (SqsClient client = newClient()) { + String queueUrl = createQueue(client); + writer.clear(); + + TraceUtils.runUnderTrace( + "parent", + () -> { + client.sendMessage( + SendMessageRequest.builder().queueUrl(queueUrl).messageBody("sometext").build()); + return null; + }); + List messages = + client + .receiveMessage(ReceiveMessageRequest.builder().queueUrl(queueUrl).build()) + .messages(); + messages.forEach(message -> {}); + + DDSpan sendSpan = assertSqsSendReceiveTraces(queueUrl); + assertEquals(1, messages.size()); + + String awsTraceHeader = messages.get(0).attributesAsStrings().get("AWSTraceHeader"); + assertNotNull(awsTraceHeader); + assertTrue( + awsTraceHeader.matches( + "Root=1-[0-9a-f]{8}-00000000" + + sendSpan.getTraceId().toHexStringPadded(16) + + ";Parent=" + + DDSpanId.toHexStringPadded(sendSpan.getSpanId()) + + ";Sampled=1")); + } + } + + @Test + @WithConfig(key = "sqs.inject.datadog.attribute.enabled", value = "false") + void datadogContextIsNotInjectedIfSqsInjectDatadogAttributeIsDisabled() throws Exception { + try (SqsClient client = newClient()) { + String queueUrl = createQueue(client); + writer.clear(); + + client.sendMessage( + SendMessageRequest.builder().queueUrl(queueUrl).messageBody("sometext").build()); + List messages = + client + .receiveMessage(ReceiveMessageRequest.builder().queueUrl(queueUrl).build()) + .messages(); + + assertEquals(1, messages.size()); + assertFalse(messages.get(0).messageAttributes().containsKey("_datadog")); + } + } + + @Test + void apmTraceContextIsInjectedIntoDatadogMessageAttributeOnSend() throws Exception { + try (SqsClient client = newClient()) { + String queueUrl = createQueue(client); + writer.clear(); + + TraceUtils.runUnderTrace( + "parent", + () -> { + client.sendMessage( + SendMessageRequest.builder().queueUrl(queueUrl).messageBody("sometext").build()); + return null; + }); + List messages = + client + .receiveMessage(ReceiveMessageRequest.builder().queueUrl(queueUrl).build()) + .messages(); + messages.forEach(message -> {}); + + DDSpan sendSpan = assertSqsSendReceiveTraces(queueUrl); + MessageAttributeValue datadogAttribute = messages.get(0).messageAttributes().get("_datadog"); + assertNotNull(datadogAttribute); + assertEquals("String", datadogAttribute.dataType()); + assertTrue(datadogAttribute.stringValue().contains("\"x-datadog-trace-id\"")); + assertTrue(datadogAttribute.stringValue().contains(sendSpan.getTraceId().toString())); + assertTrue(datadogAttribute.stringValue().contains("\"x-datadog-parent-id\"")); + assertTrue( + datadogAttribute.stringValue().contains(Long.toUnsignedString(sendSpan.getSpanId()))); + } + } + + @Test + void traceDetailsPropagatedViaEmbeddedSqsMessageAttributeString() throws Exception { + assumeFalse(isDataStreamsEnabled()); + + writer.clear(); + Message message = + Message.builder() + .messageAttributes( + Collections.singletonMap( + "_datadog", + MessageAttributeValue.builder() + .dataType("String") + .stringValue( + "{\"x-datadog-trace-id\": \"4948377316357291421\", " + + "\"x-datadog-parent-id\": \"6746998015037429512\", " + + "\"x-datadog-sampling-priority\": \"1\"}") + .build())) + .build(); + List messages = + new TracingList( + Collections.singletonList(message), expectedQueueUrl("somequeue"), requestId()); + + messages.forEach(ignored -> {}); + + assertEmbeddedReceiveSpan("somequeue"); + } + + @Test + void traceDetailsPropagatedViaEmbeddedSqsMessageAttributeBinary() throws Exception { + assumeFalse(isDataStreamsEnabled()); + + assertEmbeddedBinaryHeader( + UTF_8.encode( + "{\"x-datadog-trace-id\":\"4948377316357291421\"," + + "\"x-datadog-parent-id\":\"6746998015037429512\"," + + "\"x-datadog-sampling-priority\":\"1\"}")); + assertEmbeddedBinaryHeader( + UTF_8.encode( + "eyJ4LWRhdGFkb2ctdHJhY2UtaWQiOiI0OTQ4Mzc3MzE2MzU3MjkxNDIxIiwieC1kYXRhZG9n" + + "LXBhcmVudC1pZCI6IjY3NDY5OTgwMTUwMzc0Mjk1MTIiLCJ4LWRhdGFkb2ctc2FtcGxpbmct" + + "cHJpb3JpdHkiOiIxIn0=")); + } + + @Test + void traceDetailsPropagatedFromSqsToJms() throws Exception { + assumeFalse(isDataStreamsEnabled()); + + try (SqsClient client = newClient()) { + String queueName = queueName(); + String queueUrl = + client.createQueue(CreateQueueRequest.builder().queueName(queueName).build()).queueUrl(); + SQSConnectionFactory connectionFactory = + new SQSConnectionFactory(new ProviderConfiguration(), client); + Connection connection = connectionFactory.createConnection(); + Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); + Queue queue = session.createQueue(queueName); + MessageConsumer consumer = session.createConsumer(queue); + + writer.clear(); + + MessageAttributeValue datadogAttribute = + MessageAttributeValue.builder() + .dataType("Binary") + .binaryValue(SdkBytes.fromUtf8String("hello world")) + .build(); + + try { + connection.start(); + TraceUtils.runUnderTrace( + "parent", + () -> { + client.sendMessage( + SendMessageRequest.builder() + .queueUrl(queueUrl) + .messageBody("sometext") + .messageAttributes(Collections.singletonMap("_datadog", datadogAttribute)) + .build()); + return null; + }); + javax.jms.Message message = consumer.receive(); + consumer.receiveNoWait(); + + writer.waitForTraces(4); + + DDSpan parentSpan = findSpanByResource("parent"); + DDSpan sendSpan = findSpanByResource("Sqs.SendMessage"); + DDSpan receiveSpan = findSpanByResource("Sqs.ReceiveMessage"); + DDSpan deleteSpan = findSpanByResource("Sqs.DeleteMessage"); + DDSpan jmsSpan = findSpanByResource("Consumed from Queue " + queue.getQueueName()); + + assertTestSpan(parentSpan, 0); + assertAwsSpan( + sendSpan, + expectedService("Sqs", "SendMessage"), + expectedOperation("Sqs", "SendMessage"), + "Sqs.SendMessage", + DDSpanTypes.HTTP_CLIENT, + Tags.SPAN_KIND_CLIENT, + "SendMessage", + parentSpan.getSpanId(), + queueUrl); + assertEquals(parentSpan.getTraceId(), sendSpan.getTraceId()); + + assertAwsSpan( + receiveSpan, + expectedService("Sqs", "ReceiveMessage"), + expectedOperation("Sqs", "ReceiveMessage"), + "Sqs.ReceiveMessage", + DDSpanTypes.MESSAGE_CONSUMER, + Tags.SPAN_KIND_CONSUMER, + "ReceiveMessage", + sendSpan.getSpanId(), + queueUrl); + assertEquals(sendSpan.getTraceId(), receiveSpan.getTraceId()); + + assertAwsSpan( + deleteSpan, + expectedService("Sqs", "DeleteMessage"), + expectedOperation("Sqs", "DeleteMessage"), + "Sqs.DeleteMessage", + DDSpanTypes.HTTP_CLIENT, + Tags.SPAN_KIND_CLIENT, + "DeleteMessage", + 0, + queueUrl); + + assertNotNull(jmsSpan); + assertEquals(expectedJmsService(), jmsSpan.getServiceName()); + assertEquals(expectedJmsOperation(), jmsSpan.getOperationName().toString()); + assertEquals(DDSpanTypes.MESSAGE_CONSUMER, jmsSpan.getSpanType()); + assertEquals(sendSpan.getSpanId(), jmsSpan.getParentId()); + assertEquals(sendSpan.getTraceId(), jmsSpan.getTraceId()); + assertEquals("jms", tagValue(jmsSpan, Tags.COMPONENT)); + assertEquals(Tags.SPAN_KIND_CONSUMER, tagValue(jmsSpan, Tags.SPAN_KIND)); + assertNotNull(jmsSpan.getTag(InstrumentationTags.RECORD_QUEUE_TIME_MS)); + + String expectedTraceProperty = + "X-Amzn-Trace-Id".toLowerCase(Locale.ENGLISH).replace("-", "__dash__"); + assertTrue( + message + .getStringProperty(expectedTraceProperty) + .matches( + "Root=1-[0-9a-f]{8}-00000000" + + sendSpan.getTraceId().toHexStringPadded(16) + + ";Parent=" + + DDSpanId.toHexStringPadded(sendSpan.getSpanId()) + + ";Sampled=1")); + assertFalse(message.propertyExists("_datadog")); + } finally { + session.close(); + connection.stop(); + } + } + } + + abstract String expectedOperation(String awsService, String awsOperation); + + abstract String expectedService(String awsService, String awsOperation); + + boolean isDataStreamsEnabled() { + return false; + } + + private SqsClient newClient() { + return SqsClient.builder() + .region(Region.EU_CENTRAL_1) + .endpointOverride(endpoint) + .credentialsProvider(CREDENTIALS_PROVIDER) + .build(); + } + + private static String createQueue(SqsClient client) { + return client + .createQueue(CreateQueueRequest.builder().queueName(queueName()).build()) + .queueUrl(); + } + + private static String queueName() { + return "somequeue" + QUEUE_COUNTER.incrementAndGet(); + } + + private DDSpan assertSqsSendReceiveTraces(String queueUrl) throws Exception { + writer.waitForTraces(2); + + DDSpan parentSpan = findSpanByResource("parent"); + DDSpan sendSpan = findSpanByResource("Sqs.SendMessage"); + DDSpan receiveSpan = findSpanByResource("Sqs.ReceiveMessage"); + + assertEquals(2, writer.size(), () -> "Unexpected traces: " + writer); + assertEquals(3, spanCount(), () -> "Unexpected spans: " + writer); + + assertTestSpan(parentSpan, 0); + assertAwsSpan( + sendSpan, + expectedService("Sqs", "SendMessage"), + expectedOperation("Sqs", "SendMessage"), + "Sqs.SendMessage", + DDSpanTypes.HTTP_CLIENT, + Tags.SPAN_KIND_CLIENT, + "SendMessage", + parentSpan.getSpanId(), + queueUrl); + assertEquals(parentSpan.getTraceId(), sendSpan.getTraceId()); + + assertAwsSpan( + receiveSpan, + expectedService("Sqs", "ReceiveMessage"), + expectedOperation("Sqs", "ReceiveMessage"), + "Sqs.ReceiveMessage", + DDSpanTypes.MESSAGE_CONSUMER, + Tags.SPAN_KIND_CONSUMER, + "ReceiveMessage", + sendSpan.getSpanId(), + queueUrl); + assertEquals(sendSpan.getTraceId(), receiveSpan.getTraceId()); + + return sendSpan; + } + + private void assertEmbeddedBinaryHeader(ByteBuffer headerValue) throws Exception { + writer.clear(); + Message message = + Message.builder() + .messageAttributes( + Collections.singletonMap( + "_datadog", + MessageAttributeValue.builder() + .dataType("Binary") + .binaryValue(SdkBytes.fromByteBuffer(headerValue)) + .build())) + .build(); + List messages = + new TracingList( + Collections.singletonList(message), expectedQueueUrl("somequeue"), requestId()); + + messages.forEach(ignored -> {}); + + assertEmbeddedReceiveSpan("somequeue"); + } + + private void assertEmbeddedReceiveSpan(String queueName) throws Exception { + writer.waitForTraces(1); + + DDSpan receiveSpan = findSpanByResource("Sqs.ReceiveMessage"); + assertEquals(1, writer.size(), () -> "Unexpected traces: " + writer); + assertEquals(1, spanCount(), () -> "Unexpected spans: " + writer); + assertAwsSpan( + receiveSpan, + expectedService("Sqs", "ReceiveMessage"), + expectedOperation("Sqs", "ReceiveMessage"), + "Sqs.ReceiveMessage", + DDSpanTypes.MESSAGE_CONSUMER, + Tags.SPAN_KIND_CONSUMER, + "ReceiveMessage", + 6746998015037429512L, + expectedQueueUrl(queueName)); + assertEquals(4948377316357291421L, receiveSpan.getTraceId().toLong()); + } + + private static void assertTestSpan(DDSpan span, long parentId) { + assertNotNull(span); + assertEquals(parentId, span.getParentId()); + assertFalse(span.isError()); + } + + private static void assertAwsSpan( + DDSpan span, + String serviceName, + String operationName, + String resourceName, + String spanType, + String spanKind, + String awsOperation, + long parentId, + String queueUrl) { + assertNotNull(span); + assertEquals(serviceName, span.getServiceName()); + assertEquals(operationName, span.getOperationName().toString()); + assertEquals(resourceName, span.getResourceName().toString()); + assertEquals(spanType, span.getSpanType()); + assertEquals(parentId, span.getParentId()); + assertFalse(span.isError()); + assertEquals("java-aws-sdk", tagValue(span, Tags.COMPONENT)); + assertEquals(spanKind, tagValue(span, Tags.SPAN_KIND)); + assertEquals("Sqs", tagValue(span, "aws.service")); + assertEquals("Sqs", tagValue(span, "aws_service")); + assertEquals(awsOperation, tagValue(span, "aws.operation")); + assertEquals("java-aws-sdk", tagValue(span, "aws.agent")); + assertEquals(queueUrl, tagValue(span, "aws.queue.url")); + assertEquals(requestId(), tagValue(span, "aws.requestId").trim()); + } + + private static String tagValue(DDSpan span, String tagName) { + Object value = span.getTag(tagName); + return value == null ? null : value.toString(); + } + + private static DDSpan findSpanByResource(String resourceName) { + for (List trace : writer) { + for (DDSpan span : trace) { + if (resourceName.equals(span.getResourceName().toString())) { + return span; + } + } + } + return null; + } + + private static int spanCount() { + int count = 0; + for (List trace : writer) { + count += trace.size(); + } + return count; + } + + private static String expectedQueueUrl(String queueName) { + return endpoint + "/000000000000/" + queueName; + } + + private static String requestId() { + return "00000000-0000-0000-0000-000000000000"; + } + + private static String expectedJmsService() { + String service = + SpanNaming.instance() + .namingSchema() + .messaging() + .inboundService("jms", Config.get().isJmsLegacyTracingEnabled()) + .get(); + return service == null ? Config.get().getServiceName() : service; + } + + private static String expectedJmsOperation() { + return SpanNaming.instance().namingSchema().messaging().inboundOperation("jms"); + } +} + +@WithConfig(key = TracerConfig.TRACE_SPAN_ATTRIBUTE_SCHEMA, value = "v0") +abstract class SqsClientV0TestBase extends SqsClientTestBase { + @Override + String expectedOperation(String awsService, String awsOperation) { + return "aws.http"; + } + + @Override + String expectedService(String awsService, String awsOperation) { + if ("Sqs".equals(awsService)) { + return "sqs"; + } + return "java-aws-sdk"; + } +} + +@WithConfig(key = GeneralConfig.DATA_STREAMS_ENABLED, value = "false") +class SqsClientV0Test extends SqsClientV0TestBase {} + +@WithConfig(key = GeneralConfig.DATA_STREAMS_ENABLED, value = "true") +class SqsClientV0DataStreamsTest extends SqsClientV0TestBase { + @Override + boolean isDataStreamsEnabled() { + return true; + } +} + +@WithConfig(key = GeneralConfig.DATA_STREAMS_ENABLED, value = "false") +@WithConfig(key = TraceInstrumentationConfig.LEGACY_CONTEXT_MANAGER_ENABLED, value = "false") +class SqsClientV0ContextSwapForkedTest extends SqsClientV0TestBase {} + +@WithConfig(key = TracerConfig.TRACE_SPAN_ATTRIBUTE_SCHEMA, value = "v1") +abstract class SqsClientV1TestBase extends SqsClientTestBase { + @Override + String expectedOperation(String awsService, String awsOperation) { + if ("Sqs".equals(awsService)) { + if ("ReceiveMessage".equals(awsOperation)) { + return "aws.sqs.process"; + } else if ("SendMessage".equals(awsOperation)) { + return "aws.sqs.send"; + } + } + return "aws." + awsService.toLowerCase(Locale.ROOT) + ".request"; + } + + @Override + String expectedService(String awsService, String awsOperation) { + return "A-service"; + } +} + +@WithConfig(key = GeneralConfig.DATA_STREAMS_ENABLED, value = "false") +class SqsClientV1ForkedTest extends SqsClientV1TestBase {} + +@WithConfig(key = GeneralConfig.DATA_STREAMS_ENABLED, value = "true") +class SqsClientV1DataStreamsForkedTest extends SqsClientV1TestBase { + @Override + boolean isDataStreamsEnabled() { + return true; + } +} + +@WithConfig(key = GeneralConfig.SERVICE_NAME, value = "A-service") +@WithConfig(key = TracerConfig.SCOPE_ITERATION_KEEP_ALIVE, value = "1") +abstract class SqsClientReceiveIterationTestBase extends AbstractInstrumentationTest { + private static final AnonymousCredentialsProvider CREDENTIALS_PROVIDER = + AnonymousCredentialsProvider.create(); + private static SQSRestServer server; + private static URI endpoint; + + @BeforeAll + static void startSqsServer() { + server = SQSRestServerBuilder.withInterface("localhost").withDynamicPort().start(); + InetSocketAddress address = server.waitUntilStarted().localAddress(); + endpoint = URI.create("http://localhost:" + address.getPort()); + } + + @AfterAll + static void stopSqsServer() { + if (server != null) { + server.stopAndWait(); + server = null; + } + } + + @BeforeEach + void setUpAwsCredentials() { + if (closePreviousBeforeTest()) { + AgentTracer.closePrevious(true); + } + System.setProperty(SdkSystemSetting.AWS_ACCESS_KEY_ID.property(), "my-access-key"); + System.setProperty(SdkSystemSetting.AWS_SECRET_ACCESS_KEY.property(), "my-secret-key"); + } + + @Test + void syncReceiveActivatesConsumerSpanForUserHandlerIteration() throws Exception { + try (SqsClient client = + SqsClient.builder() + .region(Region.EU_CENTRAL_1) + .endpointOverride(endpoint) + .credentialsProvider(CREDENTIALS_PROVIDER) + .build()) { + String queueUrl = + client + .createQueue(CreateQueueRequest.builder().queueName("somequeue").build()) + .queueUrl(); + writer.clear(); + + TraceUtils.runUnderTrace( + "parent", + () -> { + client.sendMessage( + SendMessageRequest.builder().queueUrl(queueUrl).messageBody("sometext").build()); + return null; + }); + + // The sync AWS SDK receive pipeline rebuilds the immutable response before user code sees it. + // Iterating the copied message list must still activate the consumer span for user handlers. + List messages = + client + .receiveMessage(ReceiveMessageRequest.builder().queueUrl(queueUrl).build()) + .messages(); + messages.forEach(message -> TraceUtils.runUnderTrace("handler", () -> null)); + + assertEquals(1, messages.size()); + writer.waitForTraces(2); + + DDSpan parentSpan = findSpanByResource("parent"); + DDSpan sendSpan = findSpanByResource("Sqs.SendMessage"); + DDSpan receiveSpan = findSpanByResource("Sqs.ReceiveMessage"); + DDSpan handlerSpan = findSpanByResource("handler"); + + assertEquals(2, writer.size(), () -> "Unexpected traces: " + writer); + assertEquals(4, spanCount(), () -> "Unexpected spans: " + writer); + + assertTestSpan(parentSpan, 0); + assertAwsSpan( + sendSpan, + expectedService("Sqs", "SendMessage"), + expectedOperation("Sqs", "SendMessage"), + "Sqs.SendMessage", + DDSpanTypes.HTTP_CLIENT, + Tags.SPAN_KIND_CLIENT, + "SendMessage", + parentSpan.getSpanId()); + assertEquals(parentSpan.getTraceId(), sendSpan.getTraceId()); + + assertAwsSpan( + receiveSpan, + expectedService("Sqs", "ReceiveMessage"), + expectedOperation("Sqs", "ReceiveMessage"), + "Sqs.ReceiveMessage", + DDSpanTypes.MESSAGE_CONSUMER, + Tags.SPAN_KIND_CONSUMER, + "ReceiveMessage", + sendSpan.getSpanId()); + assertEquals(sendSpan.getTraceId(), receiveSpan.getTraceId()); + + assertTestSpan(handlerSpan, receiveSpan.getSpanId()); + assertEquals(receiveSpan.getTraceId(), handlerSpan.getTraceId()); + } + } + + abstract String expectedOperation(String awsService, String awsOperation); + + abstract String expectedService(String awsService, String awsOperation); + + boolean closePreviousBeforeTest() { + return true; + } + + private static void assertTestSpan(DDSpan span, long parentId) { + assertNotNull(span); + assertEquals(parentId, span.getParentId()); + assertFalse(span.isError()); + } + + private static void assertAwsSpan( + DDSpan span, + String serviceName, + String operationName, + String resourceName, + String spanType, + String spanKind, + String awsOperation, + long parentId) { + assertNotNull(span); + assertEquals(serviceName, span.getServiceName()); + assertEquals(operationName, span.getOperationName().toString()); + assertEquals(resourceName, span.getResourceName().toString()); + assertEquals(spanType, span.getSpanType()); + assertEquals(parentId, span.getParentId()); + assertFalse(span.isError()); + assertEquals("java-aws-sdk", tagValue(span, Tags.COMPONENT)); + assertEquals(spanKind, tagValue(span, Tags.SPAN_KIND)); + assertEquals("Sqs", tagValue(span, "aws.service")); + assertEquals("Sqs", tagValue(span, "aws_service")); + assertEquals(awsOperation, tagValue(span, "aws.operation")); + assertEquals("java-aws-sdk", tagValue(span, "aws.agent")); + assertEquals(expectedQueueUrl(), tagValue(span, "aws.queue.url")); + assertEquals("00000000-0000-0000-0000-000000000000", tagValue(span, "aws.requestId")); + } + + private static String tagValue(DDSpan span, String tagName) { + Object value = span.getTag(tagName); + return value == null ? null : value.toString(); + } + + private static DDSpan findSpanByResource(String resourceName) { + for (List trace : writer) { + for (DDSpan span : trace) { + if (resourceName.equals(span.getResourceName().toString())) { + return span; + } + } + } + return null; + } + + private static int spanCount() { + int count = 0; + for (List trace : writer) { + count += trace.size(); + } + return count; + } + + private static String expectedQueueUrl() { + return endpoint + "/000000000000/somequeue"; + } +} + +@WithConfig(key = TracerConfig.TRACE_SPAN_ATTRIBUTE_SCHEMA, value = "v0") +abstract class SqsClientV0ReceiveIterationTestBase extends SqsClientReceiveIterationTestBase { + @Override + String expectedOperation(String awsService, String awsOperation) { + return "aws.http"; + } + + @Override + String expectedService(String awsService, String awsOperation) { + if ("Sqs".equals(awsService)) { + return "sqs"; + } + return "java-aws-sdk"; + } +} + +@WithConfig(key = GeneralConfig.DATA_STREAMS_ENABLED, value = "false") +class SqsClientV0ReceiveIterationTest extends SqsClientV0ReceiveIterationTestBase {} + +@WithConfig(key = GeneralConfig.DATA_STREAMS_ENABLED, value = "true") +class SqsClientV0DataStreamsReceiveIterationTest extends SqsClientV0ReceiveIterationTestBase {} + +@WithConfig(key = GeneralConfig.DATA_STREAMS_ENABLED, value = "false") +@WithConfig(key = TraceInstrumentationConfig.LEGACY_CONTEXT_MANAGER_ENABLED, value = "false") +class SqsClientV0ContextSwapReceiveIterationForkedTest extends SqsClientV0ReceiveIterationTestBase { + @Override + boolean closePreviousBeforeTest() { + return false; + } +} + +@WithConfig(key = TracerConfig.TRACE_SPAN_ATTRIBUTE_SCHEMA, value = "v1") +abstract class SqsClientV1ReceiveIterationTestBase extends SqsClientReceiveIterationTestBase { + @Override + String expectedOperation(String awsService, String awsOperation) { + if ("Sqs".equals(awsService)) { + if ("ReceiveMessage".equals(awsOperation)) { + return "aws.sqs.process"; + } else if ("SendMessage".equals(awsOperation)) { + return "aws.sqs.send"; + } + } + return "aws." + awsService.toLowerCase(Locale.ROOT) + ".request"; + } + + @Override + String expectedService(String awsService, String awsOperation) { + return "A-service"; + } +} + +@WithConfig(key = GeneralConfig.DATA_STREAMS_ENABLED, value = "false") +class SqsClientV1ReceiveIterationForkedTest extends SqsClientV1ReceiveIterationTestBase {} + +@WithConfig(key = GeneralConfig.DATA_STREAMS_ENABLED, value = "true") +class SqsClientV1DataStreamsReceiveIterationForkedTest + extends SqsClientV1ReceiveIterationTestBase {} From e292db64e0f3aabe651765d1c408f27a5f785125 Mon Sep 17 00:00:00 2001 From: Bruce Bujon Date: Mon, 29 Jun 2026 12:45:50 +0200 Subject: [PATCH 057/139] Revert "Add RxJava 3 instrumentation (#11506)" (#11761) Revert "Add RxJava 3 instrumentation (#11506)" This reverts commit 35096e2567144f56c0e56847ac281b9dffe59d0e. Co-authored-by: bruce.bujon --- ...veImageGeneratorRunnerInstrumentation.java | 1 - ...syncPropagatingDisableInstrumentation.java | 15 - .../rxjava/rxjava-3.0/build.gradle | 36 - .../rxjava3/CompletableInstrumentation.java | 73 -- .../rxjava3/FlowableInstrumentation.java | 72 -- .../rxjava3/MaybeInstrumentation.java | 70 -- .../rxjava3/ObservableInstrumentation.java | 71 -- .../rxjava3/RxJavaAsyncResultExtension.java | 68 -- .../instrumentation/rxjava3/RxJavaModule.java | 51 -- .../rxjava3/SingleInstrumentation.java | 71 -- .../rxjava3/TracingCompletableObserver.java | 38 - .../rxjava3/TracingMaybeObserver.java | 45 -- .../rxjava3/TracingObserver.java | 45 -- .../rxjava3/TracingSingleObserver.java | 38 - .../rxjava3/TracingSubscriber.java | 45 -- .../annotatedsample/RxJava3TracedMethods.java | 137 ---- .../rxjava3/RxJava3InteropTest.java | 162 ----- .../rxjava3/RxJava3ResultExtensionTest.java | 242 ------- .../instrumentation/rxjava3/RxJava3Test.java | 674 ------------------ .../rxjava3/SubscriptionTest.java | 162 ----- metadata/supported-configurations.json | 8 - settings.gradle.kts | 1 - 22 files changed, 2125 deletions(-) delete mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/build.gradle delete mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/CompletableInstrumentation.java delete mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/FlowableInstrumentation.java delete mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/MaybeInstrumentation.java delete mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/ObservableInstrumentation.java delete mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/RxJavaAsyncResultExtension.java delete mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/RxJavaModule.java delete mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/SingleInstrumentation.java delete mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingCompletableObserver.java delete mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingMaybeObserver.java delete mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingObserver.java delete mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingSingleObserver.java delete mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingSubscriber.java delete mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/annotatedsample/RxJava3TracedMethods.java delete mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3InteropTest.java delete mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3ResultExtensionTest.java delete mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3Test.java delete mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/SubscriptionTest.java diff --git a/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/NativeImageGeneratorRunnerInstrumentation.java b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/NativeImageGeneratorRunnerInstrumentation.java index 8ab84d9b8af..7fa0195e70e 100644 --- a/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/NativeImageGeneratorRunnerInstrumentation.java +++ b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/NativeImageGeneratorRunnerInstrumentation.java @@ -157,7 +157,6 @@ public static void onEnter(@Advice.Argument(value = 0, readOnly = false) String[ + "datadog.trace.instrumentation.reactivestreams.ReactiveStreamsAsyncResultExtension:build_time," + "datadog.trace.instrumentation.reactor.core.ReactorAsyncResultExtension:build_time," + "datadog.trace.instrumentation.rxjava2.RxJavaAsyncResultExtension:build_time," - + "datadog.trace.instrumentation.rxjava3.RxJavaAsyncResultExtension:build_time," + "datadog.trace.logging.ddlogger.DDLogger:build_time," + "datadog.trace.logging.ddlogger.DDLoggerFactory:build_time," + "datadog.trace.logging.ddlogger.DDLoggerFactory$HelperWrapper:build_time," diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/AsyncPropagatingDisableInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/AsyncPropagatingDisableInstrumentation.java index 5c4dcae8ea2..94c94573032 100644 --- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/AsyncPropagatingDisableInstrumentation.java +++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/AsyncPropagatingDisableInstrumentation.java @@ -47,17 +47,6 @@ public AsyncPropagatingDisableInstrumentation() { namedOneOf("reactor.core.scheduler.SchedulerTask", "reactor.core.scheduler.WorkerTask"); private static final ElementMatcher RXJAVA2_DISABLED_TYPE_INITIALIZERS = named("io.reactivex.internal.schedulers.AbstractDirectTask"); - - /** - * RxJava 3's AbstractDirectTask creates FINISHED/DISPOSED sentinel FutureTask instances in its - * static initializer. If that initializer runs while a trace is active (e.g. the first scheduled - * delay/timeout under a span), the executor instrumentation captures a continuation on those - * static singletons that is never cancelled, leaking the pending trace. Disable async propagation - * while the type initializer runs. - */ - private static final ElementMatcher RXJAVA3_DISABLED_TYPE_INITIALIZERS = - named("io.reactivex.rxjava3.internal.schedulers.AbstractDirectTask"); - private static final ElementMatcher NETTY_GLOBAL_EVENT_EXECUTOR = namedOneOf( "io.netty.util.concurrent.GlobalEventExecutor", @@ -101,7 +90,6 @@ public String[] knownMatchingTypes() { "org.apache.activemq.broker.TransactionBroker", "com.mongodb.internal.connection.DefaultConnectionPool$AsyncWorkManager", "io.reactivex.internal.schedulers.AbstractDirectTask", - "io.reactivex.rxjava3.internal.schedulers.AbstractDirectTask", "jdk.internal.net.http.HttpClientImpl", LETTUCE_HANDSHAKE_HANDLER, "io.netty.util.concurrent.GlobalEventExecutor", @@ -122,7 +110,6 @@ public ElementMatcher hierarchyMatcher() { .or(GRPC_MANAGED_CHANNEL) .or(REACTOR_DISABLED_TYPE_INITIALIZERS) .or(RXJAVA2_DISABLED_TYPE_INITIALIZERS) - .or(RXJAVA3_DISABLED_TYPE_INITIALIZERS) .or(JAVA_HTTP_CLIENT); } @@ -209,8 +196,6 @@ public void methodAdvice(MethodTransformer transformer) { isTypeInitializer().and(isDeclaredBy(REACTOR_DISABLED_TYPE_INITIALIZERS)), advice); transformer.applyAdvice( isTypeInitializer().and(isDeclaredBy(RXJAVA2_DISABLED_TYPE_INITIALIZERS)), advice); - transformer.applyAdvice( - isTypeInitializer().and(isDeclaredBy(RXJAVA3_DISABLED_TYPE_INITIALIZERS)), advice); transformer.applyAdvice( isTypeInitializer().and(isDeclaredBy(NETTY_GLOBAL_EVENT_EXECUTOR)), advice); transformer.applyAdvice(namedOneOf("sendAsync").and(isDeclaredBy(JAVA_HTTP_CLIENT)), advice); diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/build.gradle b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/build.gradle deleted file mode 100644 index 50d136149d4..00000000000 --- a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/build.gradle +++ /dev/null @@ -1,36 +0,0 @@ -muzzle { - pass { - group = "io.reactivex.rxjava3" - module = "rxjava" - versions = "[3.0.0,)" - } - // Assert the rxjava3 advice never resolves against rxjava2 — the two namespaces - // must not overlap. rxjava3 references io.reactivex.rxjava3.core.*, absent from the - // rxjava2 artifact, so muzzle must fail to match it. - fail { - name = "rxjava2-must-not-match" - group = "io.reactivex.rxjava2" - module = "rxjava" - versions = "[2.0.0,)" - } -} - -apply from: "$rootDir/gradle/java.gradle" - -addTestSuiteForDir('latestDepTest', 'test') - -dependencies { - compileOnly group: 'org.reactivestreams', name: 'reactive-streams', version: '1.0.3' - compileOnly group: 'io.reactivex.rxjava3', name: 'rxjava', version: '3.0.0' - - testImplementation project(':dd-java-agent:instrumentation:datadog:tracing:trace-annotation') - testImplementation project(':dd-java-agent:instrumentation:opentelemetry:opentelemetry-annotations-1.20') - testImplementation group: 'io.reactivex.rxjava3', name: 'rxjava', version: '3.0.0' - testImplementation group: 'io.opentelemetry.instrumentation', name: 'opentelemetry-instrumentation-annotations', version: '1.28.0' - - // Load the rxjava2 instrumenter at test runtime to prove the two versions coexist on - // the agent without interference (it stays dormant with only rxjava3 on the classpath). - testRuntimeOnly project(':dd-java-agent:instrumentation:rxjava:rxjava-2.0') - - latestDepTestImplementation group: 'io.reactivex.rxjava3', name: 'rxjava', version: '+' -} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/CompletableInstrumentation.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/CompletableInstrumentation.java deleted file mode 100644 index 3af41d89fa8..00000000000 --- a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/CompletableInstrumentation.java +++ /dev/null @@ -1,73 +0,0 @@ -package datadog.trace.instrumentation.rxjava3; - -import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; -import static net.bytebuddy.matcher.ElementMatchers.isConstructor; -import static net.bytebuddy.matcher.ElementMatchers.isMethod; -import static net.bytebuddy.matcher.ElementMatchers.takesArgument; -import static net.bytebuddy.matcher.ElementMatchers.takesArguments; - -import datadog.context.Context; -import datadog.context.ContextScope; -import datadog.trace.agent.tooling.Instrumenter; -import datadog.trace.bootstrap.InstrumentationContext; -import datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge; -import io.reactivex.rxjava3.core.Completable; -import io.reactivex.rxjava3.core.CompletableObserver; -import net.bytebuddy.asm.Advice; - -public final class CompletableInstrumentation - implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { - - @Override - public String instrumentedType() { - return "io.reactivex.rxjava3.core.Completable"; - } - - @Override - public void methodAdvice(MethodTransformer transformer) { - transformer.applyAdvice(isConstructor(), getClass().getName() + "$CaptureParentSpanAdvice"); - transformer.applyAdvice( - isMethod() - .and(named("subscribe")) - .and(takesArguments(1)) - .and(takesArgument(0, named("io.reactivex.rxjava3.core.CompletableObserver"))), - getClass().getName() + "$PropagateParentSpanAdvice"); - } - - public static class CaptureParentSpanAdvice { - @Advice.OnMethodExit(suppress = Throwable.class) - public static void onConstruct(@Advice.This final Completable completable) { - Context parentContext = Java8BytecodeBridge.getCurrentContext(); - if (parentContext != null && parentContext != Java8BytecodeBridge.getRootContext()) { - InstrumentationContext.get(Completable.class, Context.class) - .put(completable, parentContext); - } - } - } - - public static class PropagateParentSpanAdvice { - @Advice.OnMethodEnter(suppress = Throwable.class) - public static ContextScope onSubscribe( - @Advice.This final Completable completable, - @Advice.Argument(value = 0, readOnly = false) CompletableObserver observer) { - if (observer != null) { - Context parentContext = - InstrumentationContext.get(Completable.class, Context.class).get(completable); - if (parentContext != null) { - // wrap the observer so spans from its events treat the captured span as their parent - observer = new TracingCompletableObserver(observer, parentContext); - // attach the context here in case additional observers are created during subscribe - return parentContext.attach(); - } - } - return null; - } - - @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) - public static void closeScope(@Advice.Enter final ContextScope scope) { - if (scope != null) { - scope.close(); - } - } - } -} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/FlowableInstrumentation.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/FlowableInstrumentation.java deleted file mode 100644 index 3b4b8a5c53d..00000000000 --- a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/FlowableInstrumentation.java +++ /dev/null @@ -1,72 +0,0 @@ -package datadog.trace.instrumentation.rxjava3; - -import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; -import static net.bytebuddy.matcher.ElementMatchers.isConstructor; -import static net.bytebuddy.matcher.ElementMatchers.isMethod; -import static net.bytebuddy.matcher.ElementMatchers.takesArgument; -import static net.bytebuddy.matcher.ElementMatchers.takesArguments; - -import datadog.context.Context; -import datadog.context.ContextScope; -import datadog.trace.agent.tooling.Instrumenter; -import datadog.trace.bootstrap.InstrumentationContext; -import datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge; -import io.reactivex.rxjava3.core.Flowable; -import io.reactivex.rxjava3.core.FlowableSubscriber; -import net.bytebuddy.asm.Advice; - -public final class FlowableInstrumentation - implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { - - @Override - public String instrumentedType() { - return "io.reactivex.rxjava3.core.Flowable"; - } - - @Override - public void methodAdvice(MethodTransformer transformer) { - transformer.applyAdvice(isConstructor(), getClass().getName() + "$CaptureParentSpanAdvice"); - transformer.applyAdvice( - isMethod() - .and(named("subscribe")) - .and(takesArguments(1)) - .and(takesArgument(0, named("io.reactivex.rxjava3.core.FlowableSubscriber"))), - getClass().getName() + "$PropagateParentSpanAdvice"); - } - - public static class CaptureParentSpanAdvice { - @Advice.OnMethodExit(suppress = Throwable.class) - public static void onConstruct(@Advice.This final Flowable flowable) { - Context parentContext = Java8BytecodeBridge.getCurrentContext(); - if (parentContext != null && parentContext != Java8BytecodeBridge.getRootContext()) { - InstrumentationContext.get(Flowable.class, Context.class).put(flowable, parentContext); - } - } - } - - public static class PropagateParentSpanAdvice { - @Advice.OnMethodEnter(suppress = Throwable.class) - public static ContextScope onSubscribe( - @Advice.This final Flowable flowable, - @Advice.Argument(value = 0, readOnly = false) FlowableSubscriber subscriber) { - if (subscriber != null) { - Context parentContext = - InstrumentationContext.get(Flowable.class, Context.class).get(flowable); - if (parentContext != null) { - // wrap the subscriber so spans from its events treat the captured span as their parent - subscriber = new TracingSubscriber<>(subscriber, parentContext); - // attach the context here in case additional subscribers are created during subscribe - return parentContext.attach(); - } - } - return null; - } - - @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) - public static void closeScope(@Advice.Enter final ContextScope scope) { - if (scope != null) { - scope.close(); - } - } - } -} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/MaybeInstrumentation.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/MaybeInstrumentation.java deleted file mode 100644 index 49bf3e35acf..00000000000 --- a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/MaybeInstrumentation.java +++ /dev/null @@ -1,70 +0,0 @@ -package datadog.trace.instrumentation.rxjava3; - -import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; -import static net.bytebuddy.matcher.ElementMatchers.isConstructor; -import static net.bytebuddy.matcher.ElementMatchers.isMethod; -import static net.bytebuddy.matcher.ElementMatchers.takesArgument; -import static net.bytebuddy.matcher.ElementMatchers.takesArguments; - -import datadog.context.Context; -import datadog.context.ContextScope; -import datadog.trace.agent.tooling.Instrumenter; -import datadog.trace.bootstrap.InstrumentationContext; -import datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge; -import io.reactivex.rxjava3.core.Maybe; -import io.reactivex.rxjava3.core.MaybeObserver; -import net.bytebuddy.asm.Advice; - -public final class MaybeInstrumentation - implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { - @Override - public String instrumentedType() { - return "io.reactivex.rxjava3.core.Maybe"; - } - - @Override - public void methodAdvice(MethodTransformer transformer) { - transformer.applyAdvice(isConstructor(), getClass().getName() + "$CaptureParentSpanAdvice"); - transformer.applyAdvice( - isMethod() - .and(named("subscribe")) - .and(takesArguments(1)) - .and(takesArgument(0, named("io.reactivex.rxjava3.core.MaybeObserver"))), - getClass().getName() + "$PropagateParentSpanAdvice"); - } - - public static class CaptureParentSpanAdvice { - @Advice.OnMethodExit(suppress = Throwable.class) - public static void onConstruct(@Advice.This final Maybe maybe) { - Context parentContext = Java8BytecodeBridge.getCurrentContext(); - if (parentContext != null && parentContext != Java8BytecodeBridge.getRootContext()) { - InstrumentationContext.get(Maybe.class, Context.class).put(maybe, parentContext); - } - } - } - - public static class PropagateParentSpanAdvice { - @Advice.OnMethodEnter(suppress = Throwable.class) - public static ContextScope onSubscribe( - @Advice.This final Maybe maybe, - @Advice.Argument(value = 0, readOnly = false) MaybeObserver observer) { - if (observer != null) { - Context parentContext = InstrumentationContext.get(Maybe.class, Context.class).get(maybe); - if (parentContext != null) { - // wrap the observer so spans from its events treat the captured span as their parent - observer = new TracingMaybeObserver<>(observer, parentContext); - // attach the context here in case additional observers are created during subscribe - return parentContext.attach(); - } - } - return null; - } - - @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) - public static void closeScope(@Advice.Enter final ContextScope scope) { - if (scope != null) { - scope.close(); - } - } - } -} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/ObservableInstrumentation.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/ObservableInstrumentation.java deleted file mode 100644 index dd252cbfe07..00000000000 --- a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/ObservableInstrumentation.java +++ /dev/null @@ -1,71 +0,0 @@ -package datadog.trace.instrumentation.rxjava3; - -import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; -import static net.bytebuddy.matcher.ElementMatchers.isConstructor; -import static net.bytebuddy.matcher.ElementMatchers.isMethod; -import static net.bytebuddy.matcher.ElementMatchers.takesArgument; -import static net.bytebuddy.matcher.ElementMatchers.takesArguments; - -import datadog.context.Context; -import datadog.context.ContextScope; -import datadog.trace.agent.tooling.Instrumenter; -import datadog.trace.bootstrap.InstrumentationContext; -import datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge; -import io.reactivex.rxjava3.core.Observable; -import io.reactivex.rxjava3.core.Observer; -import net.bytebuddy.asm.Advice; - -public final class ObservableInstrumentation - implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { - @Override - public String instrumentedType() { - return "io.reactivex.rxjava3.core.Observable"; - } - - @Override - public void methodAdvice(MethodTransformer transformer) { - transformer.applyAdvice(isConstructor(), getClass().getName() + "$CaptureParentSpanAdvice"); - transformer.applyAdvice( - isMethod() - .and(named("subscribe")) - .and(takesArguments(1)) - .and(takesArgument(0, named("io.reactivex.rxjava3.core.Observer"))), - getClass().getName() + "$PropagateParentSpanAdvice"); - } - - public static class CaptureParentSpanAdvice { - @Advice.OnMethodExit(suppress = Throwable.class) - public static void onConstruct(@Advice.This final Observable observable) { - Context parentContext = Java8BytecodeBridge.getCurrentContext(); - if (parentContext != null && parentContext != Java8BytecodeBridge.getRootContext()) { - InstrumentationContext.get(Observable.class, Context.class).put(observable, parentContext); - } - } - } - - public static class PropagateParentSpanAdvice { - @Advice.OnMethodEnter(suppress = Throwable.class) - public static ContextScope onSubscribe( - @Advice.This final Observable observable, - @Advice.Argument(value = 0, readOnly = false) Observer observer) { - if (observer != null) { - Context parentContext = - InstrumentationContext.get(Observable.class, Context.class).get(observable); - if (parentContext != null) { - // wrap the observer so spans from its events treat the captured span as their parent - observer = new TracingObserver<>(observer, parentContext); - // attach the context here in case additional observers are created during subscribe - return parentContext.attach(); - } - } - return null; - } - - @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) - public static void closeScope(@Advice.Enter final ContextScope scope) { - if (scope != null) { - scope.close(); - } - } - } -} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/RxJavaAsyncResultExtension.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/RxJavaAsyncResultExtension.java deleted file mode 100644 index 26ad58cfcf3..00000000000 --- a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/RxJavaAsyncResultExtension.java +++ /dev/null @@ -1,68 +0,0 @@ -package datadog.trace.instrumentation.rxjava3; - -import datadog.trace.bootstrap.instrumentation.api.AgentSpan; -import datadog.trace.bootstrap.instrumentation.api.EagerHelper; -import datadog.trace.bootstrap.instrumentation.java.concurrent.AsyncResultExtension; -import datadog.trace.bootstrap.instrumentation.java.concurrent.AsyncResultExtensions; -import io.reactivex.rxjava3.core.Completable; -import io.reactivex.rxjava3.core.Flowable; -import io.reactivex.rxjava3.core.Maybe; -import io.reactivex.rxjava3.core.Observable; -import io.reactivex.rxjava3.core.Single; - -public class RxJavaAsyncResultExtension implements AsyncResultExtension, EagerHelper { - static { - AsyncResultExtensions.register(new RxJavaAsyncResultExtension()); - } - - /** - * Register the extension as an {@link AsyncResultExtension} using static class initialization. - *
- * It uses an empty static method call to ensure the class loading and the one-time-only static - * class initialization. This will ensure this extension will only be registered once under {@link - * AsyncResultExtensions}. - */ - public static void init() {} - - @Override - public boolean supports(Class result) { - return Completable.class.isAssignableFrom(result) - || Maybe.class.isAssignableFrom(result) - || Single.class.isAssignableFrom(result) - || Observable.class.isAssignableFrom(result) - || Flowable.class.isAssignableFrom(result); - } - - @Override - public Object apply(Object result, AgentSpan span) { - if (result instanceof Completable) { - return ((Completable) result) - .doOnEvent(throwable -> onError(span, throwable)) - .doOnDispose(span::finish); - } else if (result instanceof Maybe) { - return ((Maybe) result) - .doOnEvent((o, throwable) -> onError(span, throwable)) - .doOnDispose(span::finish); - } else if (result instanceof Single) { - return ((Single) result) - .doOnEvent((o, throwable) -> onError(span, throwable)) - .doOnDispose(span::finish); - } else if (result instanceof Observable) { - return ((Observable) result) - .doOnComplete(span::finish) - .doOnError(throwable -> onError(span, throwable)) - .doOnDispose(span::finish); - } else if (result instanceof Flowable) { - return ((Flowable) result) - .doOnComplete(span::finish) - .doOnError(throwable -> onError(span, throwable)) - .doOnCancel(span::finish); - } - return null; - } - - private static void onError(AgentSpan span, Throwable throwable) { - span.addThrowable(throwable); - span.finish(); - } -} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/RxJavaModule.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/RxJavaModule.java deleted file mode 100644 index 842bd3b703c..00000000000 --- a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/RxJavaModule.java +++ /dev/null @@ -1,51 +0,0 @@ -package datadog.trace.instrumentation.rxjava3; - -import static java.util.Arrays.asList; - -import com.google.auto.service.AutoService; -import datadog.context.Context; -import datadog.trace.agent.tooling.Instrumenter; -import datadog.trace.agent.tooling.InstrumenterModule; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@AutoService(InstrumenterModule.class) -public final class RxJavaModule extends InstrumenterModule.ContextTracking { - public RxJavaModule() { - super("rxjava", "rxjava-3"); - } - - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".TracingCompletableObserver", - packageName + ".TracingSubscriber", - packageName + ".TracingMaybeObserver", - packageName + ".TracingObserver", - packageName + ".RxJavaAsyncResultExtension", - packageName + ".TracingSingleObserver", - }; - } - - @Override - public Map contextStore() { - final Map store = new HashMap<>(); - store.put("io.reactivex.rxjava3.core.Flowable", Context.class.getName()); - store.put("io.reactivex.rxjava3.core.Completable", Context.class.getName()); - store.put("io.reactivex.rxjava3.core.Maybe", Context.class.getName()); - store.put("io.reactivex.rxjava3.core.Observable", Context.class.getName()); - store.put("io.reactivex.rxjava3.core.Single", Context.class.getName()); - return store; - } - - @Override - public List typeInstrumentations() { - return asList( - new CompletableInstrumentation(), - new FlowableInstrumentation(), - new MaybeInstrumentation(), - new ObservableInstrumentation(), - new SingleInstrumentation()); - } -} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/SingleInstrumentation.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/SingleInstrumentation.java deleted file mode 100644 index c7c93433ddb..00000000000 --- a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/SingleInstrumentation.java +++ /dev/null @@ -1,71 +0,0 @@ -package datadog.trace.instrumentation.rxjava3; - -import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; -import static net.bytebuddy.matcher.ElementMatchers.isConstructor; -import static net.bytebuddy.matcher.ElementMatchers.isMethod; -import static net.bytebuddy.matcher.ElementMatchers.takesArgument; -import static net.bytebuddy.matcher.ElementMatchers.takesArguments; - -import datadog.context.Context; -import datadog.context.ContextScope; -import datadog.trace.agent.tooling.Instrumenter; -import datadog.trace.bootstrap.InstrumentationContext; -import datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge; -import io.reactivex.rxjava3.core.Single; -import io.reactivex.rxjava3.core.SingleObserver; -import net.bytebuddy.asm.Advice; - -public final class SingleInstrumentation - implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { - - @Override - public String instrumentedType() { - return "io.reactivex.rxjava3.core.Single"; - } - - @Override - public void methodAdvice(MethodTransformer transformer) { - transformer.applyAdvice(isConstructor(), getClass().getName() + "$CaptureParentSpanAdvice"); - transformer.applyAdvice( - isMethod() - .and(named("subscribe")) - .and(takesArguments(1)) - .and(takesArgument(0, named("io.reactivex.rxjava3.core.SingleObserver"))), - getClass().getName() + "$PropagateParentSpanAdvice"); - } - - public static class CaptureParentSpanAdvice { - @Advice.OnMethodExit(suppress = Throwable.class) - public static void onConstruct(@Advice.This final Single single) { - Context parentContext = Java8BytecodeBridge.getCurrentContext(); - if (parentContext != null && parentContext != Java8BytecodeBridge.getRootContext()) { - InstrumentationContext.get(Single.class, Context.class).put(single, parentContext); - } - } - } - - public static class PropagateParentSpanAdvice { - @Advice.OnMethodEnter(suppress = Throwable.class) - public static ContextScope onSubscribe( - @Advice.This final Single single, - @Advice.Argument(value = 0, readOnly = false) SingleObserver observer) { - if (observer != null) { - Context parentContext = InstrumentationContext.get(Single.class, Context.class).get(single); - if (parentContext != null) { - // wrap the observer so spans from its events treat the captured span as their parent - observer = new TracingSingleObserver<>(observer, parentContext); - // attach the context here in case additional observers are created during subscribe - return parentContext.attach(); - } - } - return null; - } - - @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) - public static void closeScope(@Advice.Enter final ContextScope scope) { - if (scope != null) { - scope.close(); - } - } - } -} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingCompletableObserver.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingCompletableObserver.java deleted file mode 100644 index 8a0dd7254e1..00000000000 --- a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingCompletableObserver.java +++ /dev/null @@ -1,38 +0,0 @@ -package datadog.trace.instrumentation.rxjava3; - -import datadog.context.Context; -import datadog.context.ContextScope; -import io.reactivex.rxjava3.core.CompletableObserver; -import io.reactivex.rxjava3.disposables.Disposable; -import javax.annotation.Nonnull; - -/** Wrapper that makes sure spans from observer events treat the captured span as their parent. */ -public final class TracingCompletableObserver implements CompletableObserver { - private final CompletableObserver observer; - private final Context parentContext; - - public TracingCompletableObserver( - @Nonnull final CompletableObserver observer, @Nonnull final Context parentContext) { - this.observer = observer; - this.parentContext = parentContext; - } - - @Override - public void onSubscribe(final Disposable d) { - observer.onSubscribe(d); - } - - @Override - public void onError(final Throwable e) { - try (final ContextScope scope = parentContext.attach()) { - observer.onError(e); - } - } - - @Override - public void onComplete() { - try (final ContextScope scope = parentContext.attach()) { - observer.onComplete(); - } - } -} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingMaybeObserver.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingMaybeObserver.java deleted file mode 100644 index 0cbf34c61e4..00000000000 --- a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingMaybeObserver.java +++ /dev/null @@ -1,45 +0,0 @@ -package datadog.trace.instrumentation.rxjava3; - -import datadog.context.Context; -import datadog.context.ContextScope; -import io.reactivex.rxjava3.core.MaybeObserver; -import io.reactivex.rxjava3.disposables.Disposable; -import javax.annotation.Nonnull; - -/** Wrapper that makes sure spans from observer events treat the captured span as their parent. */ -public final class TracingMaybeObserver implements MaybeObserver { - private final MaybeObserver observer; - private final Context parentContext; - - public TracingMaybeObserver( - @Nonnull final MaybeObserver observer, @Nonnull final Context parentContext) { - this.observer = observer; - this.parentContext = parentContext; - } - - @Override - public void onSubscribe(final Disposable d) { - observer.onSubscribe(d); - } - - @Override - public void onSuccess(final T value) { - try (final ContextScope scope = parentContext.attach()) { - observer.onSuccess(value); - } - } - - @Override - public void onError(final Throwable e) { - try (final ContextScope scope = parentContext.attach()) { - observer.onError(e); - } - } - - @Override - public void onComplete() { - try (final ContextScope scope = parentContext.attach()) { - observer.onComplete(); - } - } -} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingObserver.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingObserver.java deleted file mode 100644 index 50bad4e92a1..00000000000 --- a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingObserver.java +++ /dev/null @@ -1,45 +0,0 @@ -package datadog.trace.instrumentation.rxjava3; - -import datadog.context.Context; -import datadog.context.ContextScope; -import io.reactivex.rxjava3.core.Observer; -import io.reactivex.rxjava3.disposables.Disposable; -import javax.annotation.Nonnull; - -/** Wrapper that makes sure spans from observer events treat the captured span as their parent. */ -public final class TracingObserver implements Observer { - private final Observer observer; - private final Context parentContext; - - public TracingObserver( - @Nonnull final Observer observer, @Nonnull final Context parentContext) { - this.observer = observer; - this.parentContext = parentContext; - } - - @Override - public void onSubscribe(final Disposable d) { - observer.onSubscribe(d); - } - - @Override - public void onNext(final T value) { - try (final ContextScope scope = parentContext.attach()) { - observer.onNext(value); - } - } - - @Override - public void onError(final Throwable e) { - try (final ContextScope scope = parentContext.attach()) { - observer.onError(e); - } - } - - @Override - public void onComplete() { - try (final ContextScope scope = parentContext.attach()) { - observer.onComplete(); - } - } -} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingSingleObserver.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingSingleObserver.java deleted file mode 100644 index 3e05d1124bc..00000000000 --- a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingSingleObserver.java +++ /dev/null @@ -1,38 +0,0 @@ -package datadog.trace.instrumentation.rxjava3; - -import datadog.context.Context; -import datadog.context.ContextScope; -import io.reactivex.rxjava3.core.SingleObserver; -import io.reactivex.rxjava3.disposables.Disposable; -import javax.annotation.Nonnull; - -/** Wrapper that makes sure spans from observer events treat the captured span as their parent. */ -public final class TracingSingleObserver implements SingleObserver { - private final SingleObserver observer; - private final Context parentContext; - - public TracingSingleObserver( - @Nonnull final SingleObserver observer, @Nonnull final Context parentContext) { - this.observer = observer; - this.parentContext = parentContext; - } - - @Override - public void onSubscribe(final Disposable d) { - observer.onSubscribe(d); - } - - @Override - public void onSuccess(final T value) { - try (final ContextScope scope = parentContext.attach()) { - observer.onSuccess(value); - } - } - - @Override - public void onError(final Throwable e) { - try (final ContextScope scope = parentContext.attach()) { - observer.onError(e); - } - } -} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingSubscriber.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingSubscriber.java deleted file mode 100644 index 49caa0e6ecf..00000000000 --- a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingSubscriber.java +++ /dev/null @@ -1,45 +0,0 @@ -package datadog.trace.instrumentation.rxjava3; - -import datadog.context.Context; -import datadog.context.ContextScope; -import io.reactivex.rxjava3.core.FlowableSubscriber; -import javax.annotation.Nonnull; -import org.reactivestreams.Subscription; - -/** Wrapper that makes sure spans from subscriber events treat the captured span as their parent. */ -public final class TracingSubscriber implements FlowableSubscriber { - private final FlowableSubscriber subscriber; - private final Context parentContext; - - public TracingSubscriber( - @Nonnull final FlowableSubscriber subscriber, @Nonnull final Context parentContext) { - this.subscriber = subscriber; - this.parentContext = parentContext; - } - - @Override - public void onSubscribe(final Subscription subscription) { - subscriber.onSubscribe(subscription); - } - - @Override - public void onNext(final T value) { - try (final ContextScope scope = parentContext.attach()) { - subscriber.onNext(value); - } - } - - @Override - public void onError(final Throwable e) { - try (final ContextScope scope = parentContext.attach()) { - subscriber.onError(e); - } - } - - @Override - public void onComplete() { - try (final ContextScope scope = parentContext.attach()) { - subscriber.onComplete(); - } - } -} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/annotatedsample/RxJava3TracedMethods.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/annotatedsample/RxJava3TracedMethods.java deleted file mode 100644 index 163f5fb4b69..00000000000 --- a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/annotatedsample/RxJava3TracedMethods.java +++ /dev/null @@ -1,137 +0,0 @@ -package annotatedsample; - -import static java.util.concurrent.TimeUnit.SECONDS; - -import io.opentelemetry.instrumentation.annotations.WithSpan; -import io.reactivex.rxjava3.core.Completable; -import io.reactivex.rxjava3.core.Flowable; -import io.reactivex.rxjava3.core.Maybe; -import io.reactivex.rxjava3.core.Observable; -import io.reactivex.rxjava3.core.Single; -import java.util.concurrent.CountDownLatch; - -public class RxJava3TracedMethods { - @WithSpan - public static Completable traceAsyncCompletable(CountDownLatch latch) { - return Completable.fromRunnable(() -> await(latch)); - } - - @WithSpan - public static Completable traceAsyncFailingCompletable( - CountDownLatch latch, Exception exception) { - return Completable.fromCallable( - () -> { - await(latch); - throw exception; - }); - } - - @WithSpan - public static Maybe traceAsyncMaybe(CountDownLatch latch) { - return Maybe.fromCallable( - () -> { - await(latch); - return "hello"; - }); - } - - @WithSpan - public static Maybe traceAsyncFailingMaybe(CountDownLatch latch, Exception exception) { - return Maybe.fromCallable( - () -> { - await(latch); - throw exception; - }); - } - - @WithSpan - public static Single traceAsyncSingle(CountDownLatch latch) { - return Single.fromCallable( - () -> { - await(latch); - return "hello"; - }); - } - - @WithSpan - public static Single traceAsyncFailingSingle(CountDownLatch latch, Exception exception) { - return Single.fromCallable( - () -> { - await(latch); - throw exception; - }); - } - - @WithSpan - public static Observable traceAsyncObservable(CountDownLatch latch) { - return Observable.fromCallable( - () -> { - await(latch); - return "hello"; - }); - } - - @WithSpan - public static Observable traceAsyncFailingObservable( - CountDownLatch latch, Exception exception) { - return Observable.fromCallable( - () -> { - await(latch); - throw exception; - }); - } - - @WithSpan - public static Flowable traceAsyncFlowable(CountDownLatch latch) { - return Flowable.fromCallable( - () -> { - await(latch); - return "hello"; - }); - } - - @WithSpan - public static Flowable traceAsyncFailingFlowable( - CountDownLatch latch, Exception exception) { - return Flowable.fromCallable( - () -> { - await(latch); - throw exception; - }); - } - - @WithSpan - public static Completable traceAsyncNeverCompletable() { - return Completable.never(); - } - - @WithSpan - public static Maybe traceAsyncNeverMaybe() { - return Maybe.never(); - } - - @WithSpan - public static Single traceAsyncNeverSingle() { - return Single.never(); - } - - @WithSpan - public static Observable traceAsyncNeverObservable() { - return Observable.never(); - } - - @WithSpan - public static Flowable traceAsyncNeverFlowable() { - return Flowable.never(); - } - - private static void await(CountDownLatch latch) { - try { - if (!latch.await(5, SECONDS)) { - throw new IllegalStateException("Latch still locked"); - } - } catch (InterruptedException e) { - throw new RuntimeException(e); - } - } -} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3InteropTest.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3InteropTest.java deleted file mode 100644 index a070dfb23ef..00000000000 --- a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3InteropTest.java +++ /dev/null @@ -1,162 +0,0 @@ -package testdog.trace.instrumentation.rxjava3; - -import static datadog.trace.agent.test.assertions.Matchers.validates; -import static datadog.trace.agent.test.assertions.SpanMatcher.span; -import static datadog.trace.agent.test.assertions.TagsMatcher.defaultTags; -import static datadog.trace.agent.test.assertions.TagsMatcher.tag; -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.activeSpan; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import datadog.trace.agent.test.AbstractInstrumentationTest; -import datadog.trace.agent.test.assertions.TagsMatcher; -import datadog.trace.api.Trace; -import datadog.trace.bootstrap.instrumentation.api.Tags; -import io.reactivex.rxjava3.core.Flowable; -import io.reactivex.rxjava3.core.Maybe; -import io.reactivex.rxjava3.core.Single; -import java.util.List; -import java.util.Optional; -import java.util.concurrent.CompletableFuture; -import java.util.function.Supplier; -import java.util.stream.Stream; -import org.junit.jupiter.api.Test; - -// NOTE: This test lives in the `testdog` package (not `datadog`) on purpose: the agent ignores -// `datadog.*` classes for instrumentation, so `@Trace`-annotated methods declared under `datadog.*` -// would never be instrumented. See RxJava3Test for the same convention. -// -// PURPOSE: investigate whether a Datadog trace context propagates through RxJava 3's Java 8 interop -// factory methods (fromCompletionStage / fromOptional / fromStream). There is no dedicated reactive -// instrumentation for these bridges; any propagation must come from the agent's -// concurrent/executor instrumentation. Each test asserts the ACTUAL observed behavior. -class RxJava3InteropTest extends AbstractInstrumentationTest { - - static { - // Async completion / scheduler hops can finish child spans after the local root is written, - // tripping strict trace write ordering checks. Mirror RxJava3Test. - testConfig.strictTraceWrites(false); - } - - // The component tag is stored as a UTF8BytesString, so compare by string content. - static TagsMatcher componentTrace() { - return tag(Tags.COMPONENT, validates(o -> "trace".equals(String.valueOf(o)))); - } - - static class Worker { - static long parentId; - - static int child(int i) { - return childTraced(i); - } - - @Trace(operationName = "child", resourceName = "child") - static int childTraced(int i) { - return i + 1; - } - - @Trace(operationName = "interop-parent", resourceName = "interop-parent") - static T runUnderParent(Supplier work) { - parentId = activeSpan().getSpanId(); - return work.get(); - } - } - - @Test - void fromCompletionStageSync() { - Integer result = - Worker.runUnderParent( - () -> - Single.fromCompletionStage(CompletableFuture.completedFuture(1)) - .map(Worker::child) - .blockingGet()); - assertEquals(2, result); - - assertTraces( - trace( - SORT_BY_START_TIME, - span().root().operationName("interop-parent").resourceName("interop-parent"), - span() - .childOf(Worker.parentId) - .operationName("child") - .resourceName("child") - .tags(componentTrace(), defaultTags()))); - } - - /** - * FINDING: context propagates even when the CompletableFuture is completed on another thread. - * There is no rxjava3 instrumentation for fromCompletionStage; propagation comes from the agent's - * concurrent/executor instrumentation, which carries the active context across the ForkJoinPool - * used by supplyAsync. blockingGet() runs the map() on the calling thread, where the - * interop-parent scope is still active, so the child span is a direct child of interop-parent. - */ - @Test - void fromCompletionStageAsync() { - Integer result = - Worker.runUnderParent( - () -> - Single.fromCompletionStage(CompletableFuture.supplyAsync(() -> 1)) - .map(Worker::child) - .blockingGet()); - assertEquals(2, result); - - assertTraces( - trace( - SORT_BY_START_TIME, - span().root().operationName("interop-parent").resourceName("interop-parent"), - span() - .childOf(Worker.parentId) - .operationName("child") - .resourceName("child") - .tags(componentTrace(), defaultTags()))); - } - - @Test - void fromOptional() { - Integer result = - Worker.runUnderParent( - () -> Maybe.fromOptional(Optional.of(1)).map(Worker::child).blockingGet()); - assertEquals(2, result); - - assertTraces( - trace( - SORT_BY_START_TIME, - span().root().operationName("interop-parent").resourceName("interop-parent"), - span() - .childOf(Worker.parentId) - .operationName("child") - .resourceName("child") - .tags(componentTrace(), defaultTags()))); - } - - /** - * FINDING: fromStream(2 elements) emits one child span per element (2 spans here), each a direct - * child of interop-parent. The map() runs synchronously on the subscribing thread under the - * active interop-parent scope, so no async/concurrent instrumentation is involved. - */ - @Test - void fromStream() { - List result = - Worker.runUnderParent( - () -> Flowable.fromStream(Stream.of(1, 2)).map(Worker::child).toList().blockingGet()); - assertEquals(2, result.size()); - assertEquals(2, result.get(0)); - assertEquals(3, result.get(1)); - - assertTraces( - trace( - SORT_BY_START_TIME, - span().root().operationName("interop-parent").resourceName("interop-parent"), - span() - .childOf(Worker.parentId) - .operationName("child") - .resourceName("child") - .tags(componentTrace(), defaultTags()), - span() - .childOf(Worker.parentId) - .operationName("child") - .resourceName("child") - .tags(componentTrace(), defaultTags()))); - } -} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3ResultExtensionTest.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3ResultExtensionTest.java deleted file mode 100644 index 8c10beac6d0..00000000000 --- a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3ResultExtensionTest.java +++ /dev/null @@ -1,242 +0,0 @@ -package testdog.trace.instrumentation.rxjava3; - -import static datadog.trace.agent.test.assertions.Matchers.validates; -import static datadog.trace.agent.test.assertions.SpanMatcher.span; -import static datadog.trace.agent.test.assertions.TagsMatcher.defaultTags; -import static datadog.trace.agent.test.assertions.TagsMatcher.error; -import static datadog.trace.agent.test.assertions.TagsMatcher.tag; -import static datadog.trace.agent.test.assertions.TraceMatcher.trace; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; - -import annotatedsample.RxJava3TracedMethods; -import datadog.trace.agent.test.AbstractInstrumentationTest; -import datadog.trace.agent.test.assertions.SpanMatcher; -import datadog.trace.agent.test.assertions.TagsMatcher; -import datadog.trace.bootstrap.instrumentation.api.Tags; -import datadog.trace.junit.utils.config.WithConfig; -import io.reactivex.rxjava3.core.Completable; -import io.reactivex.rxjava3.core.Flowable; -import io.reactivex.rxjava3.core.Maybe; -import io.reactivex.rxjava3.core.Observable; -import io.reactivex.rxjava3.core.Single; -import java.util.concurrent.CountDownLatch; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.EnumSource; - -@WithConfig(key = "trace.otel.enabled", value = "true") -@WithConfig(key = "integration.opentelemetry-annotations-1.20.enabled", value = "true") -class RxJava3ResultExtensionTest extends AbstractInstrumentationTest { - - static final String EXCEPTION_MESSAGE = "Test exception"; - - // The COMPONENT and SPAN_KIND tags are stored as UTF8BytesString, so we compare by string content - // rather than using is("...") which would fail the asymmetric String#equals(UTF8BytesString) - // check. - static TagsMatcher otelComponent() { - return tag(Tags.COMPONENT, validates(o -> "opentelemetry".equals(String.valueOf(o)))); - } - - static TagsMatcher internalSpanKind() { - return tag(Tags.SPAN_KIND, validates(o -> Tags.SPAN_KIND_INTERNAL.equals(String.valueOf(o)))); - } - - // The operation and resource names are stored as UTF8BytesString, so we compare by string content - // (CharSequence equality is asymmetric: String#equals(UTF8BytesString) is false). - static SpanMatcher otelSpan(String name) { - return span() - .operationName(java.util.regex.Pattern.compile(java.util.regex.Pattern.quote(name))) - .resourceName((CharSequence cs) -> name.contentEquals(cs)); - } - - /** - * The five reactive types exercised by the test, with their type-specific terminal operations. - */ - enum ReactiveType { - COMPLETABLE("Completable"), - MAYBE("Maybe"), - SINGLE("Single"), - OBSERVABLE("Observable"), - FLOWABLE("Flowable"); - - final String type; - - ReactiveType(String type) { - this.type = type; - } - - /** Runs the blocking terminal operation that drives the async result to completion. */ - void runTerminal(Object asyncType) { - switch (this) { - case COMPLETABLE: - ((Completable) asyncType).blockingAwait(); - break; - case MAYBE: - ((Maybe) asyncType).blockingGet(); - break; - case SINGLE: - ((Single) asyncType).blockingGet(); - break; - case OBSERVABLE: - ((Observable) asyncType).blockingLast(); - break; - case FLOWABLE: - ((Flowable) asyncType).blockingLast(); - break; - default: - throw new IllegalStateException("Unknown type: " + this); - } - } - - /** Subscribes and immediately disposes (cancels) the async result. */ - void subscribeAndDispose(Object asyncType) { - switch (this) { - case COMPLETABLE: - ((Completable) asyncType).subscribe().dispose(); - break; - case MAYBE: - ((Maybe) asyncType).subscribe().dispose(); - break; - case SINGLE: - ((Single) asyncType).subscribe().dispose(); - break; - case OBSERVABLE: - ((Observable) asyncType).subscribe().dispose(); - break; - case FLOWABLE: - ((Flowable) asyncType).subscribe().dispose(); - break; - default: - throw new IllegalStateException("Unknown type: " + this); - } - } - - Object traceAsync(CountDownLatch latch) { - switch (this) { - case COMPLETABLE: - return RxJava3TracedMethods.traceAsyncCompletable(latch); - case MAYBE: - return RxJava3TracedMethods.traceAsyncMaybe(latch); - case SINGLE: - return RxJava3TracedMethods.traceAsyncSingle(latch); - case OBSERVABLE: - return RxJava3TracedMethods.traceAsyncObservable(latch); - case FLOWABLE: - return RxJava3TracedMethods.traceAsyncFlowable(latch); - default: - throw new IllegalStateException("Unknown type: " + this); - } - } - - Object traceAsyncNever() { - switch (this) { - case COMPLETABLE: - return RxJava3TracedMethods.traceAsyncNeverCompletable(); - case MAYBE: - return RxJava3TracedMethods.traceAsyncNeverMaybe(); - case SINGLE: - return RxJava3TracedMethods.traceAsyncNeverSingle(); - case OBSERVABLE: - return RxJava3TracedMethods.traceAsyncNeverObservable(); - case FLOWABLE: - return RxJava3TracedMethods.traceAsyncNeverFlowable(); - default: - throw new IllegalStateException("Unknown type: " + this); - } - } - - Object traceAsyncFailing(CountDownLatch latch, Exception exception) { - switch (this) { - case COMPLETABLE: - return RxJava3TracedMethods.traceAsyncFailingCompletable(latch, exception); - case MAYBE: - return RxJava3TracedMethods.traceAsyncFailingMaybe(latch, exception); - case SINGLE: - return RxJava3TracedMethods.traceAsyncFailingSingle(latch, exception); - case OBSERVABLE: - return RxJava3TracedMethods.traceAsyncFailingObservable(latch, exception); - case FLOWABLE: - return RxJava3TracedMethods.traceAsyncFailingFlowable(latch, exception); - default: - throw new IllegalStateException("Unknown type: " + this); - } - } - } - - @ParameterizedTest(name = "test WithSpan annotated async method {0}") - @EnumSource(ReactiveType.class) - void success(ReactiveType type) { - CountDownLatch latch = new CountDownLatch(1); - Object asyncType = type.traceAsync(latch); - - // The span must not be finished before the async result completes. - assertEquals(0, writer.size()); - - latch.countDown(); - type.runTerminal(asyncType); - - String method = "traceAsync" + type.type; - assertTraces( - trace( - otelSpan("RxJava3TracedMethods." + method) - .tags(defaultTags(), otelComponent(), internalSpanKind()))); - } - - @ParameterizedTest(name = "test WithSpan annotated async method failing {0}") - @EnumSource(ReactiveType.class) - void failing(ReactiveType type) { - CountDownLatch latch = new CountDownLatch(1); - IllegalStateException expectedException = new IllegalStateException(EXCEPTION_MESSAGE); - Object asyncType = type.traceAsyncFailing(latch, expectedException); - - assertEquals(0, writer.size()); - - latch.countDown(); - assertThrows(IllegalStateException.class, () -> type.runTerminal(asyncType)); - - String method = "traceAsyncFailing" + type.type; - assertTraces( - trace( - otelSpan("RxJava3TracedMethods." + method) - .error() - .tags( - defaultTags(), - otelComponent(), - internalSpanKind(), - error(IllegalStateException.class, EXCEPTION_MESSAGE)))); - } - - @ParameterizedTest(name = "test WithSpan annotated async method cancelled {0}") - @EnumSource(ReactiveType.class) - void cancelled(ReactiveType type) { - CountDownLatch latch = new CountDownLatch(1); - Object asyncType = type.traceAsync(latch); - - assertEquals(0, writer.size()); - - latch.countDown(); - type.subscribeAndDispose(asyncType); - - String method = "traceAsync" + type.type; - assertTraces( - trace( - otelSpan("RxJava3TracedMethods." + method) - .tags(defaultTags(), otelComponent(), internalSpanKind()))); - } - - @ParameterizedTest(name = "test WithSpan annotated never async method cancelled {0}") - @EnumSource(ReactiveType.class) - void cancelledNever(ReactiveType type) { - Object asyncType = type.traceAsyncNever(); - - assertEquals(0, writer.size()); - - type.subscribeAndDispose(asyncType); - - String method = "traceAsyncNever" + type.type; - assertTraces( - trace( - otelSpan("RxJava3TracedMethods." + method) - .tags(defaultTags(), otelComponent(), internalSpanKind()))); - } -} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3Test.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3Test.java deleted file mode 100644 index 8e13387dc13..00000000000 --- a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3Test.java +++ /dev/null @@ -1,674 +0,0 @@ -package testdog.trace.instrumentation.rxjava3; - -import static datadog.trace.agent.test.assertions.Matchers.validates; -import static datadog.trace.agent.test.assertions.SpanMatcher.span; -import static datadog.trace.agent.test.assertions.TagsMatcher.defaultTags; -import static datadog.trace.agent.test.assertions.TagsMatcher.error; -import static datadog.trace.agent.test.assertions.TagsMatcher.tag; -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.activeSpan; -import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; -import static java.util.concurrent.TimeUnit.MILLISECONDS; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; - -import datadog.trace.agent.test.AbstractInstrumentationTest; -import datadog.trace.agent.test.assertions.SpanMatcher; -import datadog.trace.agent.test.assertions.TagsMatcher; -import datadog.trace.api.Trace; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; -import datadog.trace.bootstrap.instrumentation.api.AgentSpan; -import datadog.trace.bootstrap.instrumentation.api.Tags; -import io.reactivex.rxjava3.core.BackpressureStrategy; -import io.reactivex.rxjava3.core.Completable; -import io.reactivex.rxjava3.core.Flowable; -import io.reactivex.rxjava3.core.Maybe; -import io.reactivex.rxjava3.core.Observable; -import io.reactivex.rxjava3.core.Scheduler; -import io.reactivex.rxjava3.core.Single; -import io.reactivex.rxjava3.schedulers.Schedulers; -import java.util.Arrays; -import java.util.List; -import java.util.function.Supplier; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.MethodSource; -import org.reactivestreams.Subscriber; -import org.reactivestreams.Subscription; - -// NOTE: This test lives in the `testdog` package (not `datadog`) on purpose: the agent ignores -// `datadog.*` classes for instrumentation, so `@Trace`-annotated methods declared under `datadog.*` -// would never be instrumented. See the java-lang-21 tests for the same convention. -class RxJava3Test extends AbstractInstrumentationTest { - - static { - // The reactive chains in these scenarios can finish child spans after the local root has been - // written (e.g. delayed/scheduled work), which trips strict trace write ordering checks. This - // mirrors the Groovy RxJava2Test which also disables strict trace writes for the same reason. - testConfig.strictTraceWrites(false); - } - - static final String EXCEPTION_MESSAGE = "test exception"; - - // The component tag is stored as a UTF8BytesString, so we compare by string content rather than - // using is("trace") which would fail the asymmetric String#equals(UTF8BytesString) check. - static TagsMatcher componentTrace() { - return tag(Tags.COMPONENT, validates(o -> "trace".equals(String.valueOf(o)))); - } - - /** - * Holds the {@code @Trace}-annotated methods used by the scenarios. The captured span ids are - * stored in static fields and read back by the asserting test methods to express cross-span - * parent relationships. - */ - static class Worker { - static long traceParentId; - static long publisherParentId; - static long intermediateId; - - static int addOne(int i) { - return addOneTraced(i); - } - - @Trace(operationName = "addOne", resourceName = "addOne") - static int addOneTraced(int i) { - return i + 1; - } - - static int addTwo(int i) { - return addTwoTraced(i); - } - - @Trace(operationName = "addTwo", resourceName = "addTwo") - static int addTwoTraced(int i) { - return i + 2; - } - - static Object throwException() { - throw new RuntimeException(EXCEPTION_MESSAGE); - } - - @Trace(operationName = "trace-parent", resourceName = "trace-parent") - @SuppressWarnings("unchecked") - static Object assemblePublisherUnderTrace(Supplier publisherSupplier) { - traceParentId = activeSpan().getSpanId(); - AgentSpan span = startSpan("test", "publisher-parent"); - publisherParentId = span.getSpanId(); - // After this activation, the operations below should be children of this span - AgentScope scope = activateSpan(span); - - Object publisher = publisherSupplier.get(); - try { - // Read all data from publisher - if (publisher instanceof Maybe) { - return ((Maybe) publisher).blockingGet(); - } else if (publisher instanceof Flowable) { - List list = ((Flowable) publisher).toList().blockingGet(); - return list.toArray(new Object[0]); - } - throw new RuntimeException("Unknown publisher: " + publisher); - } finally { - span.finish(); - scope.close(); - } - } - - @Trace(operationName = "trace-parent", resourceName = "trace-parent") - static void cancelUnderTrace(Supplier publisherSupplier) { - traceParentId = activeSpan().getSpanId(); - AgentSpan span = startSpan("test", "publisher-parent"); - publisherParentId = span.getSpanId(); - AgentScope scope = activateSpan(span); - - // Normalize every reactive type to a Flowable so a single Subscriber can cancel the - // subscription right away, exercising the cancellation path of each instrumentation. - Object publisher = publisherSupplier.get(); - Flowable flowable; - if (publisher instanceof Maybe) { - flowable = ((Maybe) publisher).toFlowable(); - } else if (publisher instanceof Single) { - flowable = ((Single) publisher).toFlowable(); - } else if (publisher instanceof Observable) { - flowable = ((Observable) publisher).toFlowable(BackpressureStrategy.BUFFER); - } else if (publisher instanceof Completable) { - flowable = ((Completable) publisher).toFlowable(); - } else { - flowable = (Flowable) publisher; - } - - try { - flowable.subscribe( - new Subscriber() { - @Override - public void onSubscribe(Subscription subscription) { - subscription.cancel(); - } - - @Override - public void onNext(Object t) {} - - @Override - public void onError(Throwable error) {} - - @Override - public void onComplete() {} - }); - } finally { - scope.close(); - span.finish(); - } - } - - @Trace(operationName = "trace-parent", resourceName = "trace-parent") - static Object runUnderTraceParent(Supplier work) { - traceParentId = activeSpan().getSpanId(); - return work.get(); - } - } - - // --- Publisher success --------------------------------------------------- - - static List publisherSuccessArgs() { - return Arrays.asList( - Arguments.of( - "basic maybe", - new Object[] {2}, - 1, - (Supplier) () -> Maybe.just(1).map(Worker::addOne)), - Arguments.of( - "two operations maybe", - new Object[] {4}, - 2, - (Supplier) () -> Maybe.just(2).map(Worker::addOne).map(Worker::addOne)), - Arguments.of( - "delayed maybe", - new Object[] {4}, - 1, - (Supplier) () -> Maybe.just(3).delay(100, MILLISECONDS).map(Worker::addOne)), - Arguments.of( - "delayed twice maybe", - new Object[] {6}, - 2, - (Supplier) - () -> - Maybe.just(4) - .delay(100, MILLISECONDS) - .map(Worker::addOne) - .delay(100, MILLISECONDS) - .map(Worker::addOne)), - Arguments.of( - "basic flowable", - new Object[] {6, 7}, - 2, - (Supplier) - () -> Flowable.fromIterable(Arrays.asList(5, 6)).map(Worker::addOne)), - Arguments.of( - "two operations flowable", - new Object[] {8, 9}, - 4, - (Supplier) - () -> - Flowable.fromIterable(Arrays.asList(6, 7)) - .map(Worker::addOne) - .map(Worker::addOne)), - Arguments.of( - "delayed flowable", - new Object[] {8, 9}, - 2, - (Supplier) - () -> - Flowable.fromIterable(Arrays.asList(7, 8)) - .delay(100, MILLISECONDS) - .map(Worker::addOne)), - Arguments.of( - "delayed twice flowable", - new Object[] {10, 11}, - 4, - (Supplier) - () -> - Flowable.fromIterable(Arrays.asList(8, 9)) - .delay(100, MILLISECONDS) - .map(Worker::addOne) - .delay(100, MILLISECONDS) - .map(Worker::addOne)), - Arguments.of( - "maybe from callable", - new Object[] {12}, - 2, - (Supplier) - () -> Maybe.fromCallable(() -> Worker.addOne(10)).map(Worker::addOne))); - } - - @ParameterizedTest(name = "Publisher ''{0}'' test") - @MethodSource("publisherSuccessArgs") - void publisherSuccess(String name, Object[] expected, int workSpans, Supplier supplier) { - Object result = Worker.assemblePublisherUnderTrace(supplier); - - if (expected.length == 1) { - assertEquals(expected[0], result); - } else { - assertArrayEquals(expected, (Object[]) result); - } - - SpanMatcher[] matchers = new SpanMatcher[workSpans + 2]; - matchers[0] = - span() - .root() - .operationName("trace-parent") - .resourceName("trace-parent") - .tags(componentTrace(), defaultTags()); - matchers[1] = - span() - .id(Worker.publisherParentId) - .childOf(Worker.traceParentId) - .operationName("publisher-parent") - .resourceName("publisher-parent") - .tags(defaultTags()); - for (int i = 0; i < workSpans; i++) { - matchers[2 + i] = - span() - .childOf(Worker.publisherParentId) - .operationName("addOne") - .resourceName("addOne") - .tags(componentTrace(), defaultTags()); - } - - assertTraces(trace(SORT_BY_START_TIME, matchers)); - } - - // --- Publisher error ----------------------------------------------------- - - static List publisherErrorArgs() { - return Arrays.asList( - Arguments.of( - "maybe", (Supplier) () -> Maybe.error(new RuntimeException(EXCEPTION_MESSAGE))), - Arguments.of( - "flowable", - (Supplier) () -> Flowable.error(new RuntimeException(EXCEPTION_MESSAGE)))); - } - - @ParameterizedTest(name = "Publisher error ''{0}'' test") - @MethodSource("publisherErrorArgs") - void publisherError(String name, Supplier supplier) { - RuntimeException exception = - assertThrows(RuntimeException.class, () -> Worker.assemblePublisherUnderTrace(supplier)); - assertEquals(EXCEPTION_MESSAGE, exception.getMessage()); - - assertTraces( - trace( - SORT_BY_START_TIME, - span() - .root() - .operationName("trace-parent") - .resourceName("trace-parent") - .error() - .tags( - componentTrace(), - error(RuntimeException.class, EXCEPTION_MESSAGE), - defaultTags()), - // It's important that we don't attach errors at the reactive level so that we don't - // impact the spans on reactive integrations such as netty and lettuce. - span() - .id(Worker.publisherParentId) - .childOf(Worker.traceParentId) - .operationName("publisher-parent") - .resourceName("publisher-parent") - .tags(defaultTags()))); - } - - // --- Publisher step error ------------------------------------------------ - - static List publisherStepErrorArgs() { - return Arrays.asList( - Arguments.of( - "basic maybe failure", - 1, - (Supplier) - () -> Maybe.just(1).map(Worker::addOne).map(i -> Worker.throwException())), - Arguments.of( - "basic flowable failure", - 1, - (Supplier) - () -> - Flowable.fromIterable(Arrays.asList(5, 6)) - .map(Worker::addOne) - .map(i -> Worker.throwException()))); - } - - @ParameterizedTest(name = "Publisher step ''{0}'' test") - @MethodSource("publisherStepErrorArgs") - void publisherStepError(String name, int workSpans, Supplier supplier) { - RuntimeException exception = - assertThrows(RuntimeException.class, () -> Worker.assemblePublisherUnderTrace(supplier)); - assertEquals(EXCEPTION_MESSAGE, exception.getMessage()); - - SpanMatcher[] matchers = new SpanMatcher[workSpans + 2]; - matchers[0] = - span() - .root() - .operationName("trace-parent") - .resourceName("trace-parent") - .error() - .tags( - componentTrace(), error(RuntimeException.class, EXCEPTION_MESSAGE), defaultTags()); - matchers[1] = - span() - .id(Worker.publisherParentId) - .childOf(Worker.traceParentId) - .operationName("publisher-parent") - .resourceName("publisher-parent") - .tags(defaultTags()); - for (int i = 0; i < workSpans; i++) { - matchers[2 + i] = - span() - .childOf(Worker.publisherParentId) - .operationName("addOne") - .resourceName("addOne") - .tags(componentTrace(), defaultTags()); - } - - assertTraces(trace(SORT_BY_START_TIME, matchers)); - } - - // --- Cancel -------------------------------------------------------------- - - static List cancelArgs() { - return Arrays.asList( - Arguments.of("basic maybe", (Supplier) () -> Maybe.just(1)), - Arguments.of( - "basic flowable", (Supplier) () -> Flowable.fromIterable(Arrays.asList(5, 6))), - Arguments.of("basic single", (Supplier) () -> Single.just(1)), - Arguments.of( - "basic observable", - (Supplier) () -> Observable.fromIterable(Arrays.asList(5, 6))), - Arguments.of("basic completable", (Supplier) Completable::complete)); - } - - @ParameterizedTest(name = "Publisher ''{0}'' cancel") - @MethodSource("cancelArgs") - void cancel(String name, Supplier supplier) { - Worker.cancelUnderTrace(supplier); - - assertTraces( - trace( - SORT_BY_START_TIME, - span() - .root() - .operationName("trace-parent") - .resourceName("trace-parent") - .tags(componentTrace(), defaultTags()), - span() - .id(Worker.publisherParentId) - .childOf(Worker.traceParentId) - .operationName("publisher-parent") - .resourceName("publisher-parent") - .tags(defaultTags()))); - } - - // --- Chain spans correct parent ------------------------------------------ - - static List chainParentArgs() { - return Arrays.asList( - Arguments.of( - "basic maybe", - 3, - (Supplier) - () -> - Maybe.just(1) - .map(Worker::addOne) - .map(Worker::addOne) - .concatWith(Maybe.just(1).map(Worker::addOne))), - Arguments.of( - "basic flowable", - 5, - (Supplier) - () -> - Flowable.fromIterable(Arrays.asList(5, 6)) - .map(Worker::addOne) - .map(Worker::addOne) - .concatWith(Maybe.just(1).map(Worker::addOne).toFlowable()))); - } - - @ParameterizedTest(name = "Publisher chain spans have the correct parent for ''{0}''") - @MethodSource("chainParentArgs") - void chainParent(String name, int workSpans, Supplier supplier) { - Worker.assemblePublisherUnderTrace(supplier); - - SpanMatcher[] matchers = new SpanMatcher[workSpans + 2]; - matchers[0] = - span() - .root() - .operationName("trace-parent") - .resourceName("trace-parent") - .tags(componentTrace(), defaultTags()); - matchers[1] = - span() - .id(Worker.publisherParentId) - .childOf(Worker.traceParentId) - .operationName("publisher-parent") - .resourceName("publisher-parent") - .tags(defaultTags()); - for (int i = 0; i < workSpans; i++) { - matchers[2 + i] = - span() - .childOf(Worker.publisherParentId) - .operationName("addOne") - .resourceName("addOne") - .tags(componentTrace(), defaultTags()); - } - - assertTraces(trace(SORT_BY_START_TIME, matchers)); - } - - // --- Correct parents from subscription time (blockingGet) ---------------- - - @Test - void correctParentsFromSubscriptionTimeBlockingGet() { - Maybe maybe = Maybe.just(42).map(Worker::addOne).map(Worker::addTwo); - - Worker.runUnderTraceParent( - () -> { - maybe.blockingGet(); - return null; - }); - - assertTraces( - trace( - SORT_BY_START_TIME, - span().root().operationName("trace-parent").resourceName("trace-parent"), - span() - .childOf(Worker.traceParentId) - .operationName("addOne") - .tags(componentTrace(), defaultTags()), - span() - .childOf(Worker.traceParentId) - .operationName("addTwo") - .tags(componentTrace(), defaultTags()))); - } - - // --- Correct parents from subscription time (intermediate span) ---------- - - static List subscriptionTimeIntermediateArgs() { - return Arrays.asList( - Arguments.of("basic maybe", 1, (Supplier) () -> Maybe.just(1).map(Worker::addOne)), - Arguments.of( - "basic flowable", - 2, - (Supplier) - () -> Flowable.fromIterable(Arrays.asList(1, 2)).map(Worker::addOne))); - } - - @ParameterizedTest( - name = "Publisher chain spans have the correct parents from subscription time ''{0}''") - @MethodSource("subscriptionTimeIntermediateArgs") - @SuppressWarnings("unchecked") - void correctParentsFromSubscriptionTime(String name, int workItems, Supplier supplier) { - Worker.assemblePublisherUnderTrace( - () -> { - // The "add one" operations are assembled under publisher-parent and stay its children. - // The "add two" operations are assembled under intermediate, but intermediate is finished - // before subscription, so re-activating its context at delivery time is a no-op and - // addTwo falls back to the still-active publisher-parent as well. - Object publisher = supplier.get(); - - AgentSpan intermediate = startSpan("test", "intermediate"); - Worker.intermediateId = intermediate.getSpanId(); - AgentScope scope = activateSpan(intermediate); - try { - if (publisher instanceof Maybe) { - return ((Maybe) publisher).map(Worker::addTwo); - } else if (publisher instanceof Flowable) { - return ((Flowable) publisher).map(Worker::addTwo); - } - throw new IllegalStateException("Unknown publisher type"); - } finally { - intermediate.finish(); - scope.close(); - } - }); - - SpanMatcher[] matchers = new SpanMatcher[3 + 2 * workItems]; - matchers[0] = - span() - .root() - .operationName("trace-parent") - .resourceName("trace-parent") - .tags(componentTrace(), defaultTags()); - matchers[1] = - span() - .id(Worker.publisherParentId) - .childOf(Worker.traceParentId) - .operationName("publisher-parent") - .resourceName("publisher-parent") - .tags(defaultTags()); - matchers[2] = - span() - .id(Worker.intermediateId) - .childOf(Worker.publisherParentId) - .operationName("intermediate") - .resourceName("intermediate") - .tags(defaultTags()); - for (int i = 0; i < 2 * workItems; i += 2) { - matchers[3 + i] = - span() - .childOf(Worker.publisherParentId) - .operationName("addOne") - .tags(componentTrace(), defaultTags()); - matchers[4 + i] = - span() - .childOf(Worker.publisherParentId) - .operationName("addTwo") - .tags(componentTrace(), defaultTags()); - } - - assertTraces(trace(SORT_BY_START_TIME, matchers)); - } - - // --- Schedulers ---------------------------------------------------------- - - static List schedulerArgs() { - return Arrays.asList( - Arguments.of("new-thread", Schedulers.newThread()), - Arguments.of("computation", Schedulers.computation()), - Arguments.of("single", Schedulers.single()), - Arguments.of("trampoline", Schedulers.trampoline())); - } - - @ParameterizedTest(name = "Flowables produce the right number of results on ''{0}'' scheduler") - @MethodSource("schedulerArgs") - void schedulers(String schedulerName, Scheduler scheduler) { - List values = - Flowable.fromIterable(Arrays.asList(1, 2, 3, 4)) - .parallel() - .runOn(scheduler) - .flatMap( - num -> - Maybe.just(num.toString() + " on " + Thread.currentThread().getName()) - .toFlowable()) - .sequential() - .toList() - .blockingGet(); - - assertEquals(4, values.size()); - - // No trace-parent span is active while the chain is assembled, so the instrumentation must be - // non-intrusive: parallel scheduler hops must not synthesize any trace. Flushing makes sure - // any span that the instrumentation might have wrongly created on the scheduler threads is - // reported before we assert the writer is empty. - tracer.flush(); - assertEquals( - 0, - writer.getTraceCount(), - () -> "Unexpected traces emitted without active trace: " + writer); - } - - @ParameterizedTest(name = "Flowable propagates context on ''{0}'' scheduler") - @MethodSource("schedulerArgs") - void flowableParallelContextPropagation(String schedulerName, Scheduler scheduler) { - Worker.assemblePublisherUnderTrace( - () -> - Flowable.fromIterable(Arrays.asList(1, 2, 3, 4)) - .parallel() - .runOn(scheduler) - .flatMap(num -> Maybe.just(num).map(Worker::addOne).toFlowable()) - .sequential()); - - SpanMatcher[] matchers = new SpanMatcher[6]; - matchers[0] = - span() - .root() - .operationName("trace-parent") - .resourceName("trace-parent") - .tags(componentTrace(), defaultTags()); - matchers[1] = - span() - .id(Worker.publisherParentId) - .childOf(Worker.traceParentId) - .operationName("publisher-parent") - .resourceName("publisher-parent") - .tags(defaultTags()); - for (int i = 0; i < 4; i++) { - matchers[2 + i] = - span() - .childOf(Worker.publisherParentId) - .operationName("addOne") - .resourceName("addOne") - .tags(componentTrace(), defaultTags()); - } - - assertTraces(trace(SORT_BY_START_TIME, matchers)); - } - - // --- No spurious traces outside active trace -------------------------------- - - // Verifies that CaptureParentSpanAdvice and PropagateParentSpanAdvice are no-ops when there is - // no active trace: the instrumentation must not synthesize any spans of its own. - static List noSpuriousTracesArgs() { - return Arrays.asList( - Arguments.of( - "observable", - (Supplier) - () -> - Observable.fromIterable(Arrays.asList(1, 2, 3, 4)) - .map(i -> i + 1) - .toList() - .blockingGet()), - Arguments.of( - "single", (Supplier) () -> Single.just(1).map(i -> i + 1).blockingGet())); - } - - @ParameterizedTest(name = "No spurious traces for ''{0}'' assembled outside active trace") - @MethodSource("noSpuriousTracesArgs") - void noSpuriousTracesWhenAssembledOutsideTrace(String name, Supplier supplier) { - supplier.get(); - tracer.flush(); - assertEquals( - 0, - writer.getTraceCount(), - () -> "Unexpected traces emitted without active trace: " + writer); - } -} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/SubscriptionTest.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/SubscriptionTest.java deleted file mode 100644 index d2f76d17a9b..00000000000 --- a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/SubscriptionTest.java +++ /dev/null @@ -1,162 +0,0 @@ -package testdog.trace.instrumentation.rxjava3; - -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.startSpan; - -import datadog.trace.agent.test.AbstractInstrumentationTest; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; -import datadog.trace.bootstrap.instrumentation.api.AgentSpan; -import io.reactivex.rxjava3.core.BackpressureStrategy; -import io.reactivex.rxjava3.core.Completable; -import io.reactivex.rxjava3.core.Flowable; -import io.reactivex.rxjava3.core.Maybe; -import io.reactivex.rxjava3.core.Observable; -import io.reactivex.rxjava3.core.Single; -import java.util.Random; -import java.util.concurrent.CountDownLatch; -import org.junit.jupiter.api.Test; - -class SubscriptionTest extends AbstractInstrumentationTest { - - @Test - void maybeSubscriptionPropagatesParentSpan() throws InterruptedException { - CountDownLatch latch = new CountDownLatch(1); - - AgentSpan parent = startSpan("test", "parent"); - try (AgentScope scope = activateSpan(parent)) { - Maybe connection = Maybe.create(emitter -> emitter.onSuccess(new Connection())); - connection.subscribe( - c -> { - c.query(); - latch.countDown(); - }); - } finally { - parent.finish(); - } - latch.await(); - - assertTraces( - trace( - SORT_BY_START_TIME, - span().root().operationName("parent"), - span().childOfPrevious().operationName("Connection.query"))); - } - - @Test - void singleSubscriptionPropagatesParentSpan() throws InterruptedException { - CountDownLatch latch = new CountDownLatch(1); - - AgentSpan parent = startSpan("test", "parent"); - try (AgentScope scope = activateSpan(parent)) { - Single connection = Single.create(emitter -> emitter.onSuccess(new Connection())); - connection.subscribe( - c -> { - c.query(); - latch.countDown(); - }); - } finally { - parent.finish(); - } - latch.await(); - - assertTraces( - trace( - SORT_BY_START_TIME, - span().root().operationName("parent"), - span().childOfPrevious().operationName("Connection.query"))); - } - - @Test - void completableSubscriptionPropagatesParentSpan() throws InterruptedException { - CountDownLatch latch = new CountDownLatch(1); - - AgentSpan parent = startSpan("test", "parent"); - try (AgentScope scope = activateSpan(parent)) { - Completable action = Completable.create(emitter -> emitter.onComplete()); - action.subscribe( - () -> { - new Connection().query(); - latch.countDown(); - }); - } finally { - parent.finish(); - } - latch.await(); - - assertTraces( - trace( - SORT_BY_START_TIME, - span().root().operationName("parent"), - span().childOfPrevious().operationName("Connection.query"))); - } - - @Test - void observableSubscriptionPropagatesParentSpan() throws InterruptedException { - CountDownLatch latch = new CountDownLatch(1); - - AgentSpan parent = startSpan("test", "parent"); - try (AgentScope scope = activateSpan(parent)) { - Observable connection = - Observable.create( - emitter -> { - emitter.onNext(new Connection()); - emitter.onComplete(); - }); - connection.subscribe( - c -> { - c.query(); - latch.countDown(); - }); - } finally { - parent.finish(); - } - latch.await(); - - assertTraces( - trace( - SORT_BY_START_TIME, - span().root().operationName("parent"), - span().childOfPrevious().operationName("Connection.query"))); - } - - @Test - void flowableSubscriptionPropagatesParentSpan() throws InterruptedException { - CountDownLatch latch = new CountDownLatch(1); - - AgentSpan parent = startSpan("test", "parent"); - try (AgentScope scope = activateSpan(parent)) { - Flowable connection = - Flowable.create( - emitter -> { - emitter.onNext(new Connection()); - emitter.onComplete(); - }, - BackpressureStrategy.BUFFER); - connection.subscribe( - c -> { - c.query(); - latch.countDown(); - }); - } finally { - parent.finish(); - } - latch.await(); - - assertTraces( - trace( - SORT_BY_START_TIME, - span().root().operationName("parent"), - span().childOfPrevious().operationName("Connection.query"))); - } - - static class Connection { - int query() { - AgentSpan span = startSpan("test", "Connection.query"); - span.finish(); - return new Random().nextInt(); - } - } -} diff --git a/metadata/supported-configurations.json b/metadata/supported-configurations.json index de18c9b39aa..ae081138b71 100644 --- a/metadata/supported-configurations.json +++ b/metadata/supported-configurations.json @@ -9585,14 +9585,6 @@ "aliases": ["DD_TRACE_INTEGRATION_RXJAVA_ENABLED", "DD_INTEGRATION_RXJAVA_ENABLED"] } ], - "DD_TRACE_RXJAVA_3_ENABLED": [ - { - "version": "A", - "type": "boolean", - "default": "true", - "aliases": ["DD_TRACE_INTEGRATION_RXJAVA_3_ENABLED", "DD_INTEGRATION_RXJAVA_3_ENABLED"] - } - ], "DD_TRACE_S3_ENABLED": [ { "version": "A", diff --git a/settings.gradle.kts b/settings.gradle.kts index 12858c6c38d..0647382920a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -559,7 +559,6 @@ include( ":dd-java-agent:instrumentation:rs:jax-rs:jax-rs-client:jax-rs-client-2.0", ":dd-java-agent:instrumentation:rxjava:rxjava-1.0", ":dd-java-agent:instrumentation:rxjava:rxjava-2.0", - ":dd-java-agent:instrumentation:rxjava:rxjava-3.0", ":dd-java-agent:instrumentation:scala:scala-concurrent-2.8", ":dd-java-agent:instrumentation:scala:scala-promise:scala-promise-2.10", ":dd-java-agent:instrumentation:scala:scala-promise:scala-promise-2.13", From 5243e522a28bd12a85f99452f548edc984aab505 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Mon, 29 Jun 2026 09:18:26 -0400 Subject: [PATCH 058/139] Fix gradle-debug failing on configuration resolution (#11755) Fix gradle-debug failing on configuration resolution Inspect tasks at taskGraph.whenReady instead of force-realizing every task in projectsEvaluated, which resolved configurations without an exclusive lock. Co-Authored-By: Claude Opus 4.8 (1M context) Co-authored-by: alexey.kuznetsov --- .../dd-trace-java.gradle-debug.gradle.kts | 47 +++++++++++-------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/buildSrc/src/main/kotlin/dd-trace-java.gradle-debug.gradle.kts b/buildSrc/src/main/kotlin/dd-trace-java.gradle-debug.gradle.kts index 22e509ea755..86e8f463ff9 100644 --- a/buildSrc/src/main/kotlin/dd-trace-java.gradle-debug.gradle.kts +++ b/buildSrc/src/main/kotlin/dd-trace-java.gradle-debug.gradle.kts @@ -1,7 +1,27 @@ /* * Gradle debugging plugin for dd-trace-java builds. + * + * Logs the JDK used by each scheduled task to diagnose unexpected Java versions. + * + * Usage: + * ./gradlew -PddGradleDebug e.g. ./gradlew assemble -PddGradleDebug + * + * Only tasks in the execution graph of the requested command are reported, so run it + * against a real task (e.g. `build`, `:module:test`); `help` reports almost nothing. + * + * Output: build/datadog.gradle-debug.log (one JSON object per task), e.g. + * {"task":":dd-trace-api:compileJava", "jdk":"8"} + * {"task":":dd-trace-api:test", "jdk":"11"} + * + * "jdk":"unknown" means the task type carries no JVM (e.g. lifecycle/aggregate tasks like + * `classes` or `assemble`, copy/`Sync` tasks); only Java/Groovy/Scala compile, Test, JavaExec, + * Javadoc and Exec tasks report a version. */ +import org.gradle.api.Action +import org.gradle.api.Task +import org.gradle.api.execution.TaskExecutionGraph + val ddGradleDebugEnabled = project.hasProperty("ddGradleDebug") val logPath = rootProject.layout.buildDirectory.file("datadog.gradle-debug.log") @@ -38,8 +58,8 @@ fun getJdkFromCompilerOptions(co: CompileOptions): String? { return null } -fun printJdkForProjectTasks(project: Project, logFile: File) { - project.tasks.forEach { task -> +fun printJdkForTasks(tasks: Iterable, logFile: File) { + tasks.forEach { task -> val data = mutableMapOf() data["task"] = task.path if (task is JavaExec) { @@ -83,23 +103,12 @@ fun printJdkForProjectTasks(project: Project, logFile: File) { } } -class DebugBuildListener : org.gradle.BuildListener { - override fun settingsEvaluated(settings: Settings) = Unit - - override fun projectsLoaded(gradle: Gradle) = Unit - - override fun buildFinished(result: BuildResult) = Unit - - override fun projectsEvaluated(gradle: Gradle) { - val logFile = logPath.get().asFile - logFile.writeText("") - gradle.rootProject.allprojects.forEach { project -> - printJdkForProjectTasks(project, logFile) - } - } -} - if (ddGradleDebugEnabled) { logger.lifecycle("datadog.gradle-debug plugin is enabled") - gradle.addListener(DebugBuildListener()) + // Inspect tasks once the execution graph is ready, when scheduled tasks are fully configured. + gradle.taskGraph.whenReady(Action { + val logFile = logPath.get().asFile + logFile.writeText("") + printJdkForTasks(allTasks, logFile) + }) } From c2dec5bf94529af827ad7f27475fb437cb95142a Mon Sep 17 00:00:00 2001 From: Douglas Q Hawkins Date: Mon, 29 Jun 2026 10:45:41 -0400 Subject: [PATCH 059/139] Migrate SQLCommenterTest from Groovy/Spock to JUnit 5 Java (#11735) Migrate SQLCommenterTest from Groovy/Spock to JUnit 5 Java Faithful 1:1 migration of the jdbc SQLCommenterTest: all 91 cases preserved (8 getFirstWord + 68 inject + 12 base-hash + 3 peer-service). Spock `where:` tables become @ParameterizedTest + @MethodSource (the data carries embedded quotes, whitespace-significant, and null cells that @TableTest can't represent), each row led by a human-readable scenario for the display name. Config injection uses the imperative WithConfigExtension.injectSysConfig (values are parameterized). Co-Authored-By: Claude Opus 4.8 Merge branch 'master' into dougqh/migrate-sqlcommenter-test Make the redundant optimizer-hint case a real idempotency test The migration faithfully copied a duplicate row that already existed in the Groovy (two identical leading-hint append cases). Per review, repurpose it to verify the intended behavior: re-injecting already-commented SQL is a no-op (hasDDComment skips it). Co-Authored-By: Claude Opus 4.8 Merge branch 'master' into dougqh/migrate-sqlcommenter-test Co-authored-by: devflow.devflow-routing-intake --- .../src/test/groovy/SQLCommenterTest.groovy | 175 --- .../jdbc/SQLCommenterTest.java | 1136 +++++++++++++++++ 2 files changed, 1136 insertions(+), 175 deletions(-) delete mode 100644 dd-java-agent/instrumentation/jdbc/src/test/groovy/SQLCommenterTest.groovy create mode 100644 dd-java-agent/instrumentation/jdbc/src/test/java/datadog/trace/instrumentation/jdbc/SQLCommenterTest.java diff --git a/dd-java-agent/instrumentation/jdbc/src/test/groovy/SQLCommenterTest.groovy b/dd-java-agent/instrumentation/jdbc/src/test/groovy/SQLCommenterTest.groovy deleted file mode 100644 index eb250f761f2..00000000000 --- a/dd-java-agent/instrumentation/jdbc/src/test/groovy/SQLCommenterTest.groovy +++ /dev/null @@ -1,175 +0,0 @@ -import datadog.trace.agent.test.InstrumentationSpecification -import datadog.trace.api.BaseHash -import datadog.trace.api.Config -import datadog.trace.api.ProcessTags -import datadog.trace.bootstrap.instrumentation.api.AgentSpan -import datadog.trace.bootstrap.instrumentation.api.AgentTracer -import datadog.trace.bootstrap.instrumentation.api.Tags -import datadog.trace.bootstrap.instrumentation.dbm.SharedDBCommenter -import datadog.trace.instrumentation.jdbc.SQLCommenter - -import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace - -class SQLCommenterTest extends InstrumentationSpecification { - - def "test find first word"() { - setup: - - when: - String word = SQLCommenter.getFirstWord(sql) - - then: - word == firstWord - - where: - sql | firstWord - "SELECT *" | "SELECT" - " { " | "{" - "{" | "{" - "{call" | "{call" - "{ call" | "{" - "CALL ( ? )" | "CALL" - "" | "" - " " | "" - } - - def "test encode Sql Comment"() { - setup: - injectSysConfig("dd.service", ddService) - injectSysConfig("dd.env", ddEnv) - injectSysConfig("dd.version", ddVersion) - SharedDBCommenter.resetStaticPrefixForTesting() - - when: - String sqlWithComment = SQLCommenter.inject(query, dbService, dbType, host, dbName, traceParent, append) - - then: - sqlWithComment == expected - - where: - query | ddService | ddEnv | dbService | dbType | host | dbName | ddVersion | append | traceParent | expected - "SELECT * FROM foo" | "SqlCommenter" | "Test" | "my-service" | "mysql" | "h" | "n" | "TestVersion" | true | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/" - "SELECT * FROM foo;" | "SqlCommenter" | "Test" | "my-service" | "mysql" | "h" | "n" | "TestVersion" | true | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/;" - "SELECT * FROM foo; \t\n\r" | "SqlCommenter" | "Test" | "my-service" | "mysql" | "h" | "n" | "TestVersion" | true | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/;" - "SELECT * FROM foo; SELECT * FROM bar" | "SqlCommenter" | "Test" | "my-service" | "mysql" | "h" | "n" | "TestVersion" | true | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "SELECT * FROM foo; SELECT * FROM bar /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/" - "SELECT * FROM foo; SELECT * FROM bar; " | "SqlCommenter" | "Test" | "my-service" | "mysql" | "h" | "n" | "TestVersion" | true | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "SELECT * FROM foo; SELECT * FROM bar /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/;" - "SELECT * FROM foo" | "SqlCommenter" | "Test" | "my-service" | "postgres" | "h" | "n" | "TestVersion" | true | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/" - "{call dogshelterProc(?, ?)}" | "SqlCommenter" | "Test" | "my-service" | "mysql" | "h" | "n" | "TestVersion" | true | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "{call dogshelterProc(?, ?)} /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/" - "{call dogshelterProc(?, ?)}" | "SqlCommenter" | "Test" | "my-service" | "mysql" | "h" | "n" | "TestVersion" | false | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "{call dogshelterProc(?, ?)} /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/" - "{call dogshelterProc(?, ?)}" | "SqlCommenter" | "Test" | "my-service" | "postgres" | "h" | "n" | "TestVersion" | true | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "{call dogshelterProc(?, ?)}" - "CALL dogshelterProc(?, ?)" | "SqlCommenter" | "Test" | "my-service" | "postgres" | "h" | "n" | "TestVersion" | false | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "CALL dogshelterProc(?, ?) /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/" - "CALL dogshelterProc(?, ?)" | "SqlCommenter" | "Test" | "my-service" | "mysql" | "h" | "n" | "TestVersion" | false | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "CALL dogshelterProc(?, ?) /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/" - "SELECT * FROM foo" | "" | "Test" | "" | "mysql" | "h" | "n" | "TestVersion" | true | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "SELECT * FROM foo /*dde='Test',ddpv='TestVersion',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/" - "SELECT * FROM foo" | "" | "Test" | "my-service" | "mysql" | "h" | "n" | "TestVersion" | true | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "SELECT * FROM foo /*dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/" - "SELECT * FROM foo" | "SqlCommenter" | "Test" | "my-service" | "mysql" | "" | "" | "TestVersion" | true | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/" - "SELECT * FROM foo" | "" | "Test" | "" | "" | "h" | "n" | "" | true | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "SELECT * FROM foo /*dde='Test',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/" - "SELECT * FROM foo" | "" | "" | "" | "" | "h" | "n" | "" | true | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "SELECT * FROM foo /*ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/" - "SELECT * FROM foo" | "" | "" | "" | "" | "" | "" | "" | true | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "SELECT * FROM foo /*traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/" - "SELECT * from FOO -- test query" | "SqlCommenter" | "Test" | "my-service" | "mysql" | "h" | "n" | "TestVersion" | true | "00-00000000000000007fffffffffffffff-000000024cb016ea-01" | "SELECT * from FOO -- test query /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/" - "SELECT /* customer-comment */ * FROM foo" | "SqlCommenter" | "Test" | "my-service" | "mysql" | "h" | "n" | "TestVersion" | true | "00-00000000000000007fffffffffffffff-000000024cb016ea-01" | "SELECT /* customer-comment */ * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/" - "SELECT * FROM foo" | "SqlCommenter" | "Test" | "my-service" | "mysql" | "h" | "n" | "TestVersion" | true | null | "SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/" - "SELECT * FROM DUAL" | "SqlCommenter" | "Test" | "my-service" | "oracle" | "h" | "n" | "TestVersion" | true | null | "SELECT * FROM DUAL /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/" - "SELECT * FROM sys.tables" | "SqlCommenter" | "Test" | "my-service" | "sqlserver"| "h" | "n" | "TestVersion" | true | null | "SELECT * FROM sys.tables /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/" - "SELECT /* customer-comment */ * FROM foo" | "SqlCommenter" | "Test" | "my-service" | "mysql" | "h" | "n" | "TestVersion" | true | null | "SELECT /* customer-comment */ * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/" - "SELECT * from FOO -- test query" | "SqlCommenter" | "Test" | "my-service" | "mysql" | "h" | "n" | "TestVersion" | true | null | "SELECT * from FOO -- test query /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/" - "" | "SqlCommenter" | "Test" | "my-service" | "mysql" | "h" | "n" | "TestVersion" | true | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "" - " " | "SqlCommenter" | "Test" | "my-service" | "mysql" | "h" | "n" | "TestVersion" | true | "00-00000000000000007fffffffffffffff-000000024cb016ea-01" | " /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/" - "" | "SqlCommenter" | "Test" | "postgres" | "mysql" | "h" | "n" | "TestVersion" | true | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "" - " " | "SqlCommenter" | "Test" | "postgres" | "mysql" | "h" | "n" | "TestVersion" | true | "00-00000000000000007fffffffffffffff-000000024cb016ea-01" | " /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='postgres',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/" - "SELECT * FROM foo /*dddbs='my-service',ddh='h',dddb='n',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/" | "SqlCommenter" | "Test" | "my-service" | "mysql" | "h" | "n" | "TestVersion" | true | null | "SELECT * FROM foo /*dddbs='my-service',ddh='h',dddb='n',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/" - "SELECT * FROM foo /*ddh='h',dddb='n',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/" | "SqlCommenter" | "Test" | "my-service" | "mysql" | "h" | "n" | "TestVersion" | true | null | "SELECT * FROM foo /*ddh='h',dddb='n',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/" - "SELECT * FROM foo /*dddb='n',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/" | "SqlCommenter" | "Test" | "my-service" | "mysql" | "h" | "n" | "TestVersion" | true | null | "SELECT * FROM foo /*dddb='n',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/" - "SELECT * FROM foo /*dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/" | "SqlCommenter" | "Test" | "my-service" | "mysql" | "h" | "n" | "TestVersion" | true | null | "SELECT * FROM foo /*dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/" - "SELECT * FROM foo /*ddps='SqlCommenter',ddpv='TestVersion'*/" | "SqlCommenter" | "Test" | "my-service" | "mysql" | "h" | "n" | "TestVersion" | true | null | "SELECT * FROM foo /*ddps='SqlCommenter',ddpv='TestVersion'*/" - "SELECT * FROM foo /*ddpv='TestVersion'*/" | "SqlCommenter" | "Test" | "my-service" | "mysql" | "h" | "n" | "TestVersion" | true | null | "SELECT * FROM foo /*ddpv='TestVersion'*/" - "/*ddjk its a customer */ SELECT * FROM foo" | "SqlCommenter" | "Test" | "my-service" | "mysql" | "h" | "n" | "TestVersion" | true | null | "/*ddjk its a customer */ SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/" - "SELECT * FROM foo /*traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/" | "SqlCommenter" | "Test" | "my-service" | "mysql" | "h" | "n" | "TestVersion" | true | null | "SELECT * FROM foo /*traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/" - "/*customer-comment*/ SELECT * FROM foo" | "SqlCommenter" | "Test" | "my-service" | "mysql" | "h" | "n" | "TestVersion" | true | null | "/*customer-comment*/ SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/" - "/*traceparent" | "SqlCommenter" | "Test" | "my-service" | "mysql" | "h" | "n" | "TestVersion" | true | null | "/*traceparent /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/" - "SELECT * FROM foo" | "SqlCommenter" | "Test" | "my-service" | "mysql" | "h" | "n" | "TestVersion" | false | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "/*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/ SELECT * FROM foo" - "SELECT * FROM foo" | "" | "Test" | "" | "mysql" | "h" | "n" | "TestVersion" | false | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "/*dde='Test',ddpv='TestVersion',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/ SELECT * FROM foo" - "SELECT * FROM foo" | "" | "Test" | "my-service" | "mysql" | "h" | "n" | "TestVersion" | false | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "/*dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/ SELECT * FROM foo" - "SELECT * FROM foo" | "" | "Test" | "" | "" | "h" | "n" | "" | false | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "/*dde='Test',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/ SELECT * FROM foo" - "SELECT * FROM foo" | "" | "" | "" | "" | "" | "" | "" | false | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "/*traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/ SELECT * FROM foo" - "SELECT * from FOO -- test query" | "SqlCommenter" | "Test" | "my-service" | "mysql" | "h" | "n" | "TestVersion" | false | "00-00000000000000007fffffffffffffff-000000024cb016ea-01" | "/*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/ SELECT * from FOO -- test query" - "SELECT /* customer-comment */ * FROM foo" | "SqlCommenter" | "Test" | "my-service" | "mysql" | "h" | "n" | "TestVersion" | false | "00-00000000000000007fffffffffffffff-000000024cb016ea-01" | "/*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/ SELECT /* customer-comment */ * FROM foo" - "SELECT * FROM foo" | "SqlCommenter" | "Test" | "my-service" | "mysql" | "h" | "n" | "TestVersion" | false | null | "/*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/ SELECT * FROM foo" - "SELECT /* customer-comment */ * FROM foo" | "SqlCommenter" | "Test" | "my-service" | "mysql" | "h" | "n" | "TestVersion" | false | null | "/*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/ SELECT /* customer-comment */ * FROM foo" - "SELECT * from FOO -- test query" | "SqlCommenter" | "Test" | "my-service" | "mysql" | "h" | "n" | "TestVersion" | false | null | "/*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/ SELECT * from FOO -- test query" - "" | "SqlCommenter" | "Test" | "my-service" | "mysql" | "h" | "n" | "TestVersion" | false | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "" - " " | "SqlCommenter" | "Test" | "my-service" | "mysql" | "h" | "n" | "TestVersion" | false | "00-00000000000000007fffffffffffffff-000000024cb016ea-01" | "/*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/ " - "/*dddbs='my-service',ddh='h',dddb='n',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo" | "SqlCommenter" | "Test" | "my-service" | "mysql" | "h" | "n" | "TestVersion" | false | null | "/*dddbs='my-service',ddh='h',dddb='n',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo" - "/*ddh='h',dddb='n',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo" | "SqlCommenter" | "Test" | "my-service" | "mysql" | "h" | "n" | "TestVersion" | false | null | "/*ddh='h',dddb='n',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo" - "/*dddb='n',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo" | "SqlCommenter" | "Test" | "my-service" | "mysql" | "h" | "n" | "TestVersion" | false | null | "/*dddb='n',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo" - "/*dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo" | "SqlCommenter" | "Test" | "my-service" | "mysql" | "h" | "n" | "TestVersion" | false | null | "/*dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo" - "/*ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo" | "SqlCommenter" | "Test" | "my-service" | "mysql" | "h" | "n" | "TestVersion" | false | null | "/*ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo" - "/*ddpv='TestVersion'*/ SELECT * FROM foo" | "SqlCommenter" | "Test" | "my-service" | "mysql" | "h" | "n" | "TestVersion" | false | null | "/*ddpv='TestVersion'*/ SELECT * FROM foo" - "/*ddjk its a customer */ SELECT * FROM foo" | "SqlCommenter" | "Test" | "my-service" | "mysql" | "h" | "n" | "TestVersion" | false | null | "/*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/ /*ddjk its a customer */ SELECT * FROM foo" - "/*traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/ SELECT * FROM foo" | "SqlCommenter" | "Test" | "my-service" | "mysql" | "h" | "n" | "TestVersion" | false | null | "/*traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/ SELECT * FROM foo" - "/*customer-comment*/ SELECT * FROM foo" | "SqlCommenter" | "Test" | "my-service" | "mysql" | "h" | "n" | "TestVersion" | false | null | "/*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/ /*customer-comment*/ SELECT * FROM foo" - "/*traceparent" | "SqlCommenter" | "Test" | "my-service" | "mysql" | "h" | "n" | "TestVersion" | false | null | "/*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/ /*traceparent" - "SELECT /*+ SeqScan(foo) */ * FROM foo" | "SqlCommenter" | "Test" | "my-service" | "postgres" | "h" | "n" | "TestVersion" | true | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "SELECT /*+ SeqScan(foo) */ * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/" - "/*+ SeqScan(foo) */ SELECT * FROM foo" | "SqlCommenter" | "Test" | "my-service" | "postgres" | "h" | "n" | "TestVersion" | true | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "/*+ SeqScan(foo) */ SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/" - "/*+ SeqScan(foo) */ SELECT * FROM foo" | "SqlCommenter" | "Test" | "my-service" | "postgres" | "h" | "n" | "TestVersion" | true | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "/*+ SeqScan(foo) */ SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/" - "/*+ SeqScan(foo) */ SELECT * FROM foo" | "SqlCommenter" | "Test" | "my-service" | "postgres" | "h" | "n" | "TestVersion" | false | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "/*+ SeqScan(foo) */ SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/" - "/*+ SeqScan(foo) */ SELECT * FROM foo /*ddps=''*/" | "SqlCommenter" | "Test" | "my-service" | "postgres" | "h" | "n" | "TestVersion" | false | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "/*+ SeqScan(foo) */ SELECT * FROM foo /*ddps=''*/" - "/*+ SeqScan(foo) */ SELECT * FROM foo /*ddps=''*/" | "SqlCommenter" | "Test" | "my-service" | "postgres" | "h" | "n" | "TestVersion" | true | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "/*+ SeqScan(foo) */ SELECT * FROM foo /*ddps=''*/" - "CALL dogshelterProc(?, ?) /*ddps=''*/" | "SqlCommenter" | "Test" | "my-service" | "postgres" | "h" | "n" | "TestVersion" | false | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "CALL dogshelterProc(?, ?) /*ddps=''*/" - "CALL dogshelterProc(?, ?) /*ddps=''*/" | "SqlCommenter" | "Test" | "my-service" | "postgres" | "h" | "n" | "TestVersion" | true | "00-00000000000000007fffffffffffffff-000000024cb016ea-00" | "CALL dogshelterProc(?, ?) /*ddps=''*/" - } - - def "inject base hash"() { - setup: - injectSysConfig("dd.service", srv) - injectSysConfig("dd.env", "") - injectSysConfig("dbm.inject.sql.basehash", Boolean.toString(injectHash)) - injectSysConfig("dd.experimental.propagate.process.tags.enabled", Boolean.toString(processTagsEnabled)) - ProcessTags.reset() - BaseHash.updateBaseHash(baseHash) - SharedDBCommenter.resetStaticPrefixForTesting() - - expect: - Config.get().isExperimentalPropagateProcessTagsEnabled() == processTagsEnabled - and: - SQLCommenter.inject(query, "", "", "", "", "", false) == result - - where: - query | injectHash | baseHash | processTagsEnabled | srv | result - "SELECT *" | true | 234563 | false | "" | "SELECT *" - "SELECT *" | true | 234563 | true | "" | "/*ddsh='234563'*/ SELECT *" - "SELECT *" | true | 345342 | false | "" | "SELECT *" - "SELECT *" | true | 345342 | true | "" | "/*ddsh='345342'*/ SELECT *" - "SELECT *" | true | 234563 | false | "srv" | "/*ddps='srv'*/ SELECT *" - "SELECT *" | true | 234563 | true | "srv" | "/*ddps='srv',ddsh='234563'*/ SELECT *" - "SELECT *" | true | 345342 | false | "srv" | "/*ddps='srv'*/ SELECT *" - "SELECT *" | true | 345342 | true | "srv" | "/*ddps='srv',ddsh='345342'*/ SELECT *" - "SELECT *" | false | 234563 | true | "" | "SELECT *" - "SELECT *" | false | 234563 | true | "srv" | "/*ddps='srv'*/ SELECT *" - "SELECT *" | false | 345342 | true | "srv" | "/*ddps='srv'*/ SELECT *" - "/*ddsh='-3750763034362895579'*/ SELECT *" | true | 234563 | true | "" | "/*ddsh='-3750763034362895579'*/ SELECT *" - } - - def "test encode Sql Comment with peer service"() { - setup: - injectSysConfig("dd.service", "SqlCommenter") - injectSysConfig("dd.env", "Test") - injectSysConfig("dd.version", "TestVersion") - SharedDBCommenter.resetStaticPrefixForTesting() - - when: - String sqlWithComment = runUnderTrace("testTrace") { - AgentSpan currSpan = AgentTracer.activeSpan() - currSpan.setTag(Tags.PEER_SERVICE, peerService) - return SQLCommenter.inject("SELECT * FROM foo", "my-service", dbType, "h", "n", "00-00000000000000007fffffffffffffff-000000024cb016ea-00", true) - } - - then: - sqlWithComment == expected - - where: - dbType | peerService | expected - "mysql" | null | "SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/" - "postgres" | "" | "SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/" - "postgres" | "testPeer" | "SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',ddprs='testPeer',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/" - } -} diff --git a/dd-java-agent/instrumentation/jdbc/src/test/java/datadog/trace/instrumentation/jdbc/SQLCommenterTest.java b/dd-java-agent/instrumentation/jdbc/src/test/java/datadog/trace/instrumentation/jdbc/SQLCommenterTest.java new file mode 100644 index 00000000000..5383bf03921 --- /dev/null +++ b/dd-java-agent/instrumentation/jdbc/src/test/java/datadog/trace/instrumentation/jdbc/SQLCommenterTest.java @@ -0,0 +1,1136 @@ +package datadog.trace.instrumentation.jdbc; + +import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace; +import static datadog.trace.junit.utils.config.WithConfigExtension.injectSysConfig; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.params.provider.Arguments.arguments; + +import datadog.trace.agent.test.AbstractInstrumentationTest; +import datadog.trace.api.BaseHash; +import datadog.trace.api.Config; +import datadog.trace.api.ProcessTags; +import datadog.trace.bootstrap.instrumentation.api.AgentSpan; +import datadog.trace.bootstrap.instrumentation.api.AgentTracer; +import datadog.trace.bootstrap.instrumentation.api.Tags; +import datadog.trace.bootstrap.instrumentation.dbm.SharedDBCommenter; +import java.util.stream.Stream; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + +class SQLCommenterTest extends AbstractInstrumentationTest { + + private static final String TRACE_PARENT = + "00-00000000000000007fffffffffffffff-000000024cb016ea-00"; + private static final String TRACE_PARENT_SAMPLED = + "00-00000000000000007fffffffffffffff-000000024cb016ea-01"; + + @ParameterizedTest(name = "{0}") + @MethodSource("testFindFirstWordArguments") + void testFindFirstWord(String scenario, String sql, String firstWord) { + // when + String word = SQLCommenter.getFirstWord(sql); + + // then + assertEquals(firstWord, word); + } + + static Stream testFindFirstWordArguments() { + return Stream.of( + arguments("SELECT *", "SELECT *", "SELECT"), + arguments("leading spaces brace", " { ", "{"), + arguments("brace", "{", "{"), + arguments("brace call", "{call", "{call"), + arguments("brace space call", "{ call", "{"), + arguments("CALL with args", "CALL ( ? )", "CALL"), + arguments("empty", "", ""), + arguments("blank", " ", "")); + } + + @ParameterizedTest(name = "{0}") + @MethodSource("testEncodeSqlCommentArguments") + void testEncodeSqlComment( + String scenario, + String query, + String ddService, + String ddEnv, + String dbService, + String dbType, + String host, + String dbName, + String ddVersion, + boolean append, + String traceParent, + String expected) { + // setup + injectSysConfig("service", ddService); + injectSysConfig("env", ddEnv); + injectSysConfig("version", ddVersion); + SharedDBCommenter.resetStaticPrefixForTesting(); + + // when + String sqlWithComment = + SQLCommenter.inject(query, dbService, dbType, host, dbName, traceParent, append); + + // then + assertEquals(expected, sqlWithComment); + } + + static Stream testEncodeSqlCommentArguments() { + return Stream.of( + arguments( + "append mysql simple", + "SELECT * FROM foo", + "SqlCommenter", + "Test", + "my-service", + "mysql", + "h", + "n", + "TestVersion", + true, + TRACE_PARENT, + "SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"), + arguments( + "append mysql trailing semicolon", + "SELECT * FROM foo;", + "SqlCommenter", + "Test", + "my-service", + "mysql", + "h", + "n", + "TestVersion", + true, + TRACE_PARENT, + "SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/;"), + arguments( + "append mysql trailing semicolon and whitespace", + "SELECT * FROM foo; \t\n\r", + "SqlCommenter", + "Test", + "my-service", + "mysql", + "h", + "n", + "TestVersion", + true, + TRACE_PARENT, + "SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/;"), + arguments( + "append mysql two statements", + "SELECT * FROM foo; SELECT * FROM bar", + "SqlCommenter", + "Test", + "my-service", + "mysql", + "h", + "n", + "TestVersion", + true, + TRACE_PARENT, + "SELECT * FROM foo; SELECT * FROM bar /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"), + arguments( + "append mysql two statements trailing semicolon", + "SELECT * FROM foo; SELECT * FROM bar; ", + "SqlCommenter", + "Test", + "my-service", + "mysql", + "h", + "n", + "TestVersion", + true, + TRACE_PARENT, + "SELECT * FROM foo; SELECT * FROM bar /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/;"), + arguments( + "append postgres simple", + "SELECT * FROM foo", + "SqlCommenter", + "Test", + "my-service", + "postgres", + "h", + "n", + "TestVersion", + true, + TRACE_PARENT, + "SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"), + arguments( + "append mysql stored proc braces", + "{call dogshelterProc(?, ?)}", + "SqlCommenter", + "Test", + "my-service", + "mysql", + "h", + "n", + "TestVersion", + true, + TRACE_PARENT, + "{call dogshelterProc(?, ?)} /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"), + arguments( + "prepend mysql stored proc braces", + "{call dogshelterProc(?, ?)}", + "SqlCommenter", + "Test", + "my-service", + "mysql", + "h", + "n", + "TestVersion", + false, + TRACE_PARENT, + "{call dogshelterProc(?, ?)} /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"), + arguments( + "append postgres stored proc braces unchanged", + "{call dogshelterProc(?, ?)}", + "SqlCommenter", + "Test", + "my-service", + "postgres", + "h", + "n", + "TestVersion", + true, + TRACE_PARENT, + "{call dogshelterProc(?, ?)}"), + arguments( + "prepend postgres CALL proc", + "CALL dogshelterProc(?, ?)", + "SqlCommenter", + "Test", + "my-service", + "postgres", + "h", + "n", + "TestVersion", + false, + TRACE_PARENT, + "CALL dogshelterProc(?, ?) /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"), + arguments( + "prepend mysql CALL proc", + "CALL dogshelterProc(?, ?)", + "SqlCommenter", + "Test", + "my-service", + "mysql", + "h", + "n", + "TestVersion", + false, + TRACE_PARENT, + "CALL dogshelterProc(?, ?) /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"), + arguments( + "append empty service drops ddps and dddbs", + "SELECT * FROM foo", + "", + "Test", + "", + "mysql", + "h", + "n", + "TestVersion", + true, + TRACE_PARENT, + "SELECT * FROM foo /*dde='Test',ddpv='TestVersion',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"), + arguments( + "append empty service keeps dddbs", + "SELECT * FROM foo", + "", + "Test", + "my-service", + "mysql", + "h", + "n", + "TestVersion", + true, + TRACE_PARENT, + "SELECT * FROM foo /*dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"), + arguments( + "append empty host and dbName drops ddh and dddb", + "SELECT * FROM foo", + "SqlCommenter", + "Test", + "my-service", + "mysql", + "", + "", + "TestVersion", + true, + TRACE_PARENT, + "SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"), + arguments( + "append only env host dbName", + "SELECT * FROM foo", + "", + "Test", + "", + "", + "h", + "n", + "", + true, + TRACE_PARENT, + "SELECT * FROM foo /*dde='Test',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"), + arguments( + "append only host dbName", + "SELECT * FROM foo", + "", + "", + "", + "", + "h", + "n", + "", + true, + TRACE_PARENT, + "SELECT * FROM foo /*ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"), + arguments( + "append only traceparent", + "SELECT * FROM foo", + "", + "", + "", + "", + "", + "", + "", + true, + TRACE_PARENT, + "SELECT * FROM foo /*traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"), + arguments( + "append with line comment sampled", + "SELECT * from FOO -- test query", + "SqlCommenter", + "Test", + "my-service", + "mysql", + "h", + "n", + "TestVersion", + true, + TRACE_PARENT_SAMPLED, + "SELECT * from FOO -- test query /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/"), + arguments( + "append with inline customer comment sampled", + "SELECT /* customer-comment */ * FROM foo", + "SqlCommenter", + "Test", + "my-service", + "mysql", + "h", + "n", + "TestVersion", + true, + TRACE_PARENT_SAMPLED, + "SELECT /* customer-comment */ * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/"), + arguments( + "append null traceparent omits traceparent", + "SELECT * FROM foo", + "SqlCommenter", + "Test", + "my-service", + "mysql", + "h", + "n", + "TestVersion", + true, + null, + "SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/"), + arguments( + "append oracle null traceparent", + "SELECT * FROM DUAL", + "SqlCommenter", + "Test", + "my-service", + "oracle", + "h", + "n", + "TestVersion", + true, + null, + "SELECT * FROM DUAL /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/"), + arguments( + "append sqlserver null traceparent", + "SELECT * FROM sys.tables", + "SqlCommenter", + "Test", + "my-service", + "sqlserver", + "h", + "n", + "TestVersion", + true, + null, + "SELECT * FROM sys.tables /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/"), + arguments( + "append inline customer comment null traceparent", + "SELECT /* customer-comment */ * FROM foo", + "SqlCommenter", + "Test", + "my-service", + "mysql", + "h", + "n", + "TestVersion", + true, + null, + "SELECT /* customer-comment */ * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/"), + arguments( + "append line comment null traceparent", + "SELECT * from FOO -- test query", + "SqlCommenter", + "Test", + "my-service", + "mysql", + "h", + "n", + "TestVersion", + true, + null, + "SELECT * from FOO -- test query /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/"), + arguments( + "append empty query stays empty", + "", + "SqlCommenter", + "Test", + "my-service", + "mysql", + "h", + "n", + "TestVersion", + true, + TRACE_PARENT, + ""), + arguments( + "append blank query sampled", + " ", + "SqlCommenter", + "Test", + "my-service", + "mysql", + "h", + "n", + "TestVersion", + true, + TRACE_PARENT_SAMPLED, + " /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/"), + arguments( + "append empty query dbService postgres", + "", + "SqlCommenter", + "Test", + "postgres", + "mysql", + "h", + "n", + "TestVersion", + true, + TRACE_PARENT, + ""), + arguments( + "append blank query dbService postgres sampled", + " ", + "SqlCommenter", + "Test", + "postgres", + "mysql", + "h", + "n", + "TestVersion", + true, + TRACE_PARENT_SAMPLED, + " /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='postgres',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/"), + arguments( + "append idempotent full existing comment", + "SELECT * FROM foo /*dddbs='my-service',ddh='h',dddb='n',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/", + "SqlCommenter", + "Test", + "my-service", + "mysql", + "h", + "n", + "TestVersion", + true, + null, + "SELECT * FROM foo /*dddbs='my-service',ddh='h',dddb='n',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/"), + arguments( + "append idempotent existing comment no dddbs", + "SELECT * FROM foo /*ddh='h',dddb='n',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/", + "SqlCommenter", + "Test", + "my-service", + "mysql", + "h", + "n", + "TestVersion", + true, + null, + "SELECT * FROM foo /*ddh='h',dddb='n',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/"), + arguments( + "append idempotent existing comment no ddh", + "SELECT * FROM foo /*dddb='n',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/", + "SqlCommenter", + "Test", + "my-service", + "mysql", + "h", + "n", + "TestVersion", + true, + null, + "SELECT * FROM foo /*dddb='n',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/"), + arguments( + "append idempotent existing comment no dddb", + "SELECT * FROM foo /*dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/", + "SqlCommenter", + "Test", + "my-service", + "mysql", + "h", + "n", + "TestVersion", + true, + null, + "SELECT * FROM foo /*dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/"), + arguments( + "append idempotent existing comment no dde", + "SELECT * FROM foo /*ddps='SqlCommenter',ddpv='TestVersion'*/", + "SqlCommenter", + "Test", + "my-service", + "mysql", + "h", + "n", + "TestVersion", + true, + null, + "SELECT * FROM foo /*ddps='SqlCommenter',ddpv='TestVersion'*/"), + arguments( + "append idempotent existing comment only ddpv", + "SELECT * FROM foo /*ddpv='TestVersion'*/", + "SqlCommenter", + "Test", + "my-service", + "mysql", + "h", + "n", + "TestVersion", + true, + null, + "SELECT * FROM foo /*ddpv='TestVersion'*/"), + arguments( + "append leading customer comment null traceparent", + "/*ddjk its a customer */ SELECT * FROM foo", + "SqlCommenter", + "Test", + "my-service", + "mysql", + "h", + "n", + "TestVersion", + true, + null, + "/*ddjk its a customer */ SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/"), + arguments( + "append existing traceparent comment unchanged", + "SELECT * FROM foo /*traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/", + "SqlCommenter", + "Test", + "my-service", + "mysql", + "h", + "n", + "TestVersion", + true, + null, + "SELECT * FROM foo /*traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/"), + arguments( + "append leading customer block comment", + "/*customer-comment*/ SELECT * FROM foo", + "SqlCommenter", + "Test", + "my-service", + "mysql", + "h", + "n", + "TestVersion", + true, + null, + "/*customer-comment*/ SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/"), + arguments( + "append unterminated traceparent comment", + "/*traceparent", + "SqlCommenter", + "Test", + "my-service", + "mysql", + "h", + "n", + "TestVersion", + true, + null, + "/*traceparent /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/"), + arguments( + "prepend mysql simple", + "SELECT * FROM foo", + "SqlCommenter", + "Test", + "my-service", + "mysql", + "h", + "n", + "TestVersion", + false, + TRACE_PARENT, + "/*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/ SELECT * FROM foo"), + arguments( + "prepend empty service drops ddps and dddbs", + "SELECT * FROM foo", + "", + "Test", + "", + "mysql", + "h", + "n", + "TestVersion", + false, + TRACE_PARENT, + "/*dde='Test',ddpv='TestVersion',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/ SELECT * FROM foo"), + arguments( + "prepend empty service keeps dddbs", + "SELECT * FROM foo", + "", + "Test", + "my-service", + "mysql", + "h", + "n", + "TestVersion", + false, + TRACE_PARENT, + "/*dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/ SELECT * FROM foo"), + arguments( + "prepend only env host dbName", + "SELECT * FROM foo", + "", + "Test", + "", + "", + "h", + "n", + "", + false, + TRACE_PARENT, + "/*dde='Test',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/ SELECT * FROM foo"), + arguments( + "prepend only traceparent", + "SELECT * FROM foo", + "", + "", + "", + "", + "", + "", + "", + false, + TRACE_PARENT, + "/*traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/ SELECT * FROM foo"), + arguments( + "prepend line comment sampled", + "SELECT * from FOO -- test query", + "SqlCommenter", + "Test", + "my-service", + "mysql", + "h", + "n", + "TestVersion", + false, + TRACE_PARENT_SAMPLED, + "/*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/ SELECT * from FOO -- test query"), + arguments( + "prepend inline customer comment sampled", + "SELECT /* customer-comment */ * FROM foo", + "SqlCommenter", + "Test", + "my-service", + "mysql", + "h", + "n", + "TestVersion", + false, + TRACE_PARENT_SAMPLED, + "/*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/ SELECT /* customer-comment */ * FROM foo"), + arguments( + "prepend mysql null traceparent", + "SELECT * FROM foo", + "SqlCommenter", + "Test", + "my-service", + "mysql", + "h", + "n", + "TestVersion", + false, + null, + "/*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/ SELECT * FROM foo"), + arguments( + "prepend inline customer comment null traceparent", + "SELECT /* customer-comment */ * FROM foo", + "SqlCommenter", + "Test", + "my-service", + "mysql", + "h", + "n", + "TestVersion", + false, + null, + "/*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/ SELECT /* customer-comment */ * FROM foo"), + arguments( + "prepend line comment null traceparent", + "SELECT * from FOO -- test query", + "SqlCommenter", + "Test", + "my-service", + "mysql", + "h", + "n", + "TestVersion", + false, + null, + "/*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/ SELECT * from FOO -- test query"), + arguments( + "prepend empty query stays empty", + "", + "SqlCommenter", + "Test", + "my-service", + "mysql", + "h", + "n", + "TestVersion", + false, + TRACE_PARENT, + ""), + arguments( + "prepend blank query sampled", + " ", + "SqlCommenter", + "Test", + "my-service", + "mysql", + "h", + "n", + "TestVersion", + false, + TRACE_PARENT_SAMPLED, + "/*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/ "), + arguments( + "prepend idempotent full existing comment", + "/*dddbs='my-service',ddh='h',dddb='n',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo", + "SqlCommenter", + "Test", + "my-service", + "mysql", + "h", + "n", + "TestVersion", + false, + null, + "/*dddbs='my-service',ddh='h',dddb='n',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo"), + arguments( + "prepend idempotent existing comment no dddbs", + "/*ddh='h',dddb='n',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo", + "SqlCommenter", + "Test", + "my-service", + "mysql", + "h", + "n", + "TestVersion", + false, + null, + "/*ddh='h',dddb='n',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo"), + arguments( + "prepend idempotent existing comment no ddh", + "/*dddb='n',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo", + "SqlCommenter", + "Test", + "my-service", + "mysql", + "h", + "n", + "TestVersion", + false, + null, + "/*dddb='n',dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo"), + arguments( + "prepend idempotent existing comment no dddb", + "/*dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo", + "SqlCommenter", + "Test", + "my-service", + "mysql", + "h", + "n", + "TestVersion", + false, + null, + "/*dde='Test',ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo"), + arguments( + "prepend idempotent existing comment no dde", + "/*ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo", + "SqlCommenter", + "Test", + "my-service", + "mysql", + "h", + "n", + "TestVersion", + false, + null, + "/*ddps='SqlCommenter',ddpv='TestVersion'*/ SELECT * FROM foo"), + arguments( + "prepend idempotent existing comment only ddpv", + "/*ddpv='TestVersion'*/ SELECT * FROM foo", + "SqlCommenter", + "Test", + "my-service", + "mysql", + "h", + "n", + "TestVersion", + false, + null, + "/*ddpv='TestVersion'*/ SELECT * FROM foo"), + arguments( + "prepend leading customer comment null traceparent", + "/*ddjk its a customer */ SELECT * FROM foo", + "SqlCommenter", + "Test", + "my-service", + "mysql", + "h", + "n", + "TestVersion", + false, + null, + "/*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/ /*ddjk its a customer */ SELECT * FROM foo"), + arguments( + "prepend existing traceparent comment unchanged", + "/*traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/ SELECT * FROM foo", + "SqlCommenter", + "Test", + "my-service", + "mysql", + "h", + "n", + "TestVersion", + false, + null, + "/*traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-01'*/ SELECT * FROM foo"), + arguments( + "prepend leading customer block comment", + "/*customer-comment*/ SELECT * FROM foo", + "SqlCommenter", + "Test", + "my-service", + "mysql", + "h", + "n", + "TestVersion", + false, + null, + "/*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/ /*customer-comment*/ SELECT * FROM foo"), + arguments( + "prepend unterminated traceparent comment", + "/*traceparent", + "SqlCommenter", + "Test", + "my-service", + "mysql", + "h", + "n", + "TestVersion", + false, + null, + "/*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n'*/ /*traceparent"), + arguments( + "append postgres optimizer hint inline", + "SELECT /*+ SeqScan(foo) */ * FROM foo", + "SqlCommenter", + "Test", + "my-service", + "postgres", + "h", + "n", + "TestVersion", + true, + TRACE_PARENT, + "SELECT /*+ SeqScan(foo) */ * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"), + arguments( + "append postgres optimizer hint leading", + "/*+ SeqScan(foo) */ SELECT * FROM foo", + "SqlCommenter", + "Test", + "my-service", + "postgres", + "h", + "n", + "TestVersion", + true, + TRACE_PARENT, + "/*+ SeqScan(foo) */ SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"), + arguments( + "postgres optimizer hint leading -- re-injecting already-commented SQL is a no-op", + "/*+ SeqScan(foo) */ SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/", + "SqlCommenter", + "Test", + "my-service", + "postgres", + "h", + "n", + "TestVersion", + true, + TRACE_PARENT, + "/*+ SeqScan(foo) */ SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"), + arguments( + "prepend postgres optimizer hint leading", + "/*+ SeqScan(foo) */ SELECT * FROM foo", + "SqlCommenter", + "Test", + "my-service", + "postgres", + "h", + "n", + "TestVersion", + false, + TRACE_PARENT, + "/*+ SeqScan(foo) */ SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"), + arguments( + "prepend postgres optimizer hint with empty ddps unchanged", + "/*+ SeqScan(foo) */ SELECT * FROM foo /*ddps=''*/", + "SqlCommenter", + "Test", + "my-service", + "postgres", + "h", + "n", + "TestVersion", + false, + TRACE_PARENT, + "/*+ SeqScan(foo) */ SELECT * FROM foo /*ddps=''*/"), + arguments( + "append postgres optimizer hint with empty ddps unchanged", + "/*+ SeqScan(foo) */ SELECT * FROM foo /*ddps=''*/", + "SqlCommenter", + "Test", + "my-service", + "postgres", + "h", + "n", + "TestVersion", + true, + TRACE_PARENT, + "/*+ SeqScan(foo) */ SELECT * FROM foo /*ddps=''*/"), + arguments( + "prepend postgres CALL proc with empty ddps unchanged", + "CALL dogshelterProc(?, ?) /*ddps=''*/", + "SqlCommenter", + "Test", + "my-service", + "postgres", + "h", + "n", + "TestVersion", + false, + TRACE_PARENT, + "CALL dogshelterProc(?, ?) /*ddps=''*/"), + arguments( + "append postgres CALL proc with empty ddps unchanged", + "CALL dogshelterProc(?, ?) /*ddps=''*/", + "SqlCommenter", + "Test", + "my-service", + "postgres", + "h", + "n", + "TestVersion", + true, + TRACE_PARENT, + "CALL dogshelterProc(?, ?) /*ddps=''*/")); + } + + @ParameterizedTest(name = "{0}") + @MethodSource("injectBaseHashArguments") + void injectBaseHash( + String scenario, + String query, + boolean injectHash, + long baseHash, + boolean processTagsEnabled, + String srv, + String result) { + // setup + injectSysConfig("service", srv); + injectSysConfig("env", ""); + injectSysConfig("dbm.inject.sql.basehash", Boolean.toString(injectHash)); + injectSysConfig( + "experimental.propagate.process.tags.enabled", Boolean.toString(processTagsEnabled)); + ProcessTags.reset(Config.get()); + BaseHash.updateBaseHash(baseHash); + SharedDBCommenter.resetStaticPrefixForTesting(); + + // expect + assertEquals(processTagsEnabled, Config.get().isExperimentalPropagateProcessTagsEnabled()); + // and + assertEquals(result, SQLCommenter.inject(query, "", "", "", "", "", false)); + } + + static Stream injectBaseHashArguments() { + return Stream.of( + arguments( + "hash on, no process tags, no service", + "SELECT *", + true, + 234563L, + false, + "", + "SELECT *"), + arguments( + "hash on, process tags, no service", + "SELECT *", + true, + 234563L, + true, + "", + "/*ddsh='234563'*/ SELECT *"), + arguments( + "hash on alt base, no process tags, no service", + "SELECT *", + true, + 345342L, + false, + "", + "SELECT *"), + arguments( + "hash on alt base, process tags, no service", + "SELECT *", + true, + 345342L, + true, + "", + "/*ddsh='345342'*/ SELECT *"), + arguments( + "hash on, no process tags, with service", + "SELECT *", + true, + 234563L, + false, + "srv", + "/*ddps='srv'*/ SELECT *"), + arguments( + "hash on, process tags, with service", + "SELECT *", + true, + 234563L, + true, + "srv", + "/*ddps='srv',ddsh='234563'*/ SELECT *"), + arguments( + "hash on alt base, no process tags, with service", + "SELECT *", + true, + 345342L, + false, + "srv", + "/*ddps='srv'*/ SELECT *"), + arguments( + "hash on alt base, process tags, with service", + "SELECT *", + true, + 345342L, + true, + "srv", + "/*ddps='srv',ddsh='345342'*/ SELECT *"), + arguments( + "hash off, process tags, no service", "SELECT *", false, 234563L, true, "", "SELECT *"), + arguments( + "hash off, process tags, with service", + "SELECT *", + false, + 234563L, + true, + "srv", + "/*ddps='srv'*/ SELECT *"), + arguments( + "hash off alt base, process tags, with service", + "SELECT *", + false, + 345342L, + true, + "srv", + "/*ddps='srv'*/ SELECT *"), + arguments( + "hash on, process tags, existing ddsh unchanged", + "/*ddsh='-3750763034362895579'*/ SELECT *", + true, + 234563L, + true, + "", + "/*ddsh='-3750763034362895579'*/ SELECT *")); + } + + @ParameterizedTest(name = "{0}") + @MethodSource("testEncodeSqlCommentWithPeerServiceArguments") + void testEncodeSqlCommentWithPeerService( + String scenario, String dbType, String peerService, String expected) throws Exception { + // setup + injectSysConfig("service", "SqlCommenter"); + injectSysConfig("env", "Test"); + injectSysConfig("version", "TestVersion"); + SharedDBCommenter.resetStaticPrefixForTesting(); + + // when + String sqlWithComment = + runUnderTrace( + "testTrace", + () -> { + AgentSpan currSpan = AgentTracer.activeSpan(); + currSpan.setTag(Tags.PEER_SERVICE, peerService); + return SQLCommenter.inject( + "SELECT * FROM foo", + "my-service", + dbType, + "h", + "n", + "00-00000000000000007fffffffffffffff-000000024cb016ea-00", + true); + }); + + // then + assertEquals(expected, sqlWithComment); + } + + static Stream testEncodeSqlCommentWithPeerServiceArguments() { + return Stream.of( + arguments( + "mysql null peer service", + "mysql", + null, + "SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"), + arguments( + "postgres empty peer service", + "postgres", + "", + "SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/"), + arguments( + "postgres with peer service", + "postgres", + "testPeer", + "SELECT * FROM foo /*ddps='SqlCommenter',dde='Test',ddpv='TestVersion',dddbs='my-service',ddh='h',dddb='n',ddprs='testPeer',traceparent='00-00000000000000007fffffffffffffff-000000024cb016ea-00'*/")); + } +} From a60bbe2a232ed21c1b101b89556acc5ece0ca70b Mon Sep 17 00:00:00 2001 From: Andrea Marziali Date: Mon, 29 Jun 2026 16:46:10 +0200 Subject: [PATCH 060/139] Exclude ServiceNameSources from coverage (#11769) Exclude ServiceNameSources from coverage Co-authored-by: devflow.devflow-routing-intake --- internal-api/build.gradle.kts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/internal-api/build.gradle.kts b/internal-api/build.gradle.kts index c6e03a03883..50a4d7fa02e 100644 --- a/internal-api/build.gradle.kts +++ b/internal-api/build.gradle.kts @@ -234,6 +234,8 @@ extra["excludedClassesCoverage"] = listOf( "datadog.trace.bootstrap.instrumentation.api.SpanPostProcessor.NoOpSpanPostProcessor", "datadog.trace.util.TempLocationManager", "datadog.trace.util.TempLocationManager.*", + // constants only + "datadog.trace.bootstrap.instrumentation.api.ServiceNameSources", ) extra["excludedClassesBranchCoverage"] = listOf( From 4b5b0cfba058f69a801ce6406057783a55d50794 Mon Sep 17 00:00:00 2001 From: Stuart McCulloch Date: Mon, 29 Jun 2026 15:49:38 +0100 Subject: [PATCH 061/139] Exclude patched OkHttp classes and trivial I/O classes from coverage (#11770) Exclude patched OkHttp classes and trivial I/O classes from coverage Remove unused matches(CacheEntry) method Co-authored-by: devflow.devflow-routing-intake --- communication/build.gradle.kts | 6 ++++++ .../communication/serialization/SimpleUtf8Cache.java | 4 ---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/communication/build.gradle.kts b/communication/build.gradle.kts index 8a4285843b0..afa25ef5a99 100644 --- a/communication/build.gradle.kts +++ b/communication/build.gradle.kts @@ -39,7 +39,12 @@ dependencies { extra["minimumBranchCoverage"] = 0.5 extra["minimumInstructionCoverage"] = 0.8 extra["excludedClassesCoverage"] = listOf( + "okhttp3.internal.PatchUtil", + "okhttp3.internal.PatchUtil.1", + "okhttp3.internal.PatchUtil.2", + "okhttp3.internal.platform.PatchPlatform", "datadog.communication.ddagent.ExternalAgentLauncher", + "datadog.communication.ddagent.NoopFeaturesDiscovery", "datadog.communication.ddagent.ExternalAgentLauncher.NamedPipeHealthCheck", "datadog.communication.ddagent.SharedCommunicationObjects.FixedConfigUrlSupplier", "datadog.communication.ddagent.SharedCommunicationObjects.RetryConfigUrlSupplier", @@ -56,6 +61,7 @@ extra["excludedClassesCoverage"] = listOf( "datadog.communication.IntakeApi", "datadog.communication.util.IOUtils", "datadog.communication.util.IOUtils.1", + "datadog.communication.http.SocketUtils", ) extra["excludedClassesBranchCoverage"] = listOf( "datadog.communication.ddagent.TracerVersion", diff --git a/communication/src/main/java/datadog/communication/serialization/SimpleUtf8Cache.java b/communication/src/main/java/datadog/communication/serialization/SimpleUtf8Cache.java index 93e6c92bb9b..eb227d1385e 100644 --- a/communication/src/main/java/datadog/communication/serialization/SimpleUtf8Cache.java +++ b/communication/src/main/java/datadog/communication/serialization/SimpleUtf8Cache.java @@ -179,10 +179,6 @@ public CacheEntry(int adjHash, String value) { this.valueUtf8 = utf8(value); } - boolean matches(CacheEntry thatEntry) { - return (this == thatEntry) || this.matches(thatEntry.adjHash, thatEntry.value); - } - boolean matches(int adjHash, String value) { return (this.adjHash == adjHash) && value.equals(this.value); } From 52c3c442c19d3e51f224f49f583f85804a8b0780 Mon Sep 17 00:00:00 2001 From: Andrea Marziali Date: Mon, 29 Jun 2026 16:51:40 +0200 Subject: [PATCH 062/139] Add coverage for ForeignMemoryWriterFactory (#11772) * Add coverage for ForeignMemoryWriterFactoryTest * test on 22+ --- .../ForeignMemoryWriterFactoryTest.java | 51 +++++++++++++++++++ .../org.mockito.plugins.MockMaker | 1 + 2 files changed, 52 insertions(+) create mode 100644 dd-trace-core/src/test/java/datadog/trace/core/servicediscovery/ForeignMemoryWriterFactoryTest.java create mode 100644 dd-trace-core/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker diff --git a/dd-trace-core/src/test/java/datadog/trace/core/servicediscovery/ForeignMemoryWriterFactoryTest.java b/dd-trace-core/src/test/java/datadog/trace/core/servicediscovery/ForeignMemoryWriterFactoryTest.java new file mode 100644 index 00000000000..ff41ce694ff --- /dev/null +++ b/dd-trace-core/src/test/java/datadog/trace/core/servicediscovery/ForeignMemoryWriterFactoryTest.java @@ -0,0 +1,51 @@ +package datadog.trace.core.servicediscovery; + +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.mockStatic; + +import datadog.environment.JavaVirtualMachine; +import datadog.environment.OperatingSystem; +import org.junit.jupiter.api.Assumptions; +import org.mockito.MockedStatic; +import org.tabletest.junit.TableTest; + +class ForeignMemoryWriterFactoryTest { + + @TableTest({ + "scenario | osType | architecture | javaAtLeast22 | expectedClassFragment", + "macOS | MACOS | X64 | false | ", + "Windows | WINDOWS | X64 | false | ", + "Linux unknown arch | LINUX | UNKNOWN | false | ", + "Linux pre-Java22 | LINUX | X64 | false | JNA ", + "Linux Java22+ | LINUX | X64 | true | FFM " + }) + void get( + String scenario, + String osType, + String architecture, + boolean javaAtLeast22, + String expectedClassFragment) { + // MemFDUnixWriterFFM uses java.lang.foreign and will fail to load on pre-22 JVMs + boolean realJavaAtLeast22 = JavaVirtualMachine.isJavaVersionAtLeast(22); + Assumptions.assumeTrue(!javaAtLeast22 || realJavaAtLeast22, "FFM writer requires Java 22+"); + try (MockedStatic osMock = mockStatic(OperatingSystem.class); + MockedStatic jvmMock = mockStatic(JavaVirtualMachine.class)) { + osMock.when(OperatingSystem::type).thenReturn(OperatingSystem.Type.valueOf(osType)); + osMock + .when(OperatingSystem::architecture) + .thenReturn(OperatingSystem.Architecture.valueOf(architecture)); + jvmMock.when(() -> JavaVirtualMachine.isJavaVersionAtLeast(22)).thenReturn(javaAtLeast22); + + ForeignMemoryWriter writer = new ForeignMemoryWriterFactory().get(); + + if (expectedClassFragment == null) { + assertNull(writer, scenario); + } else { + assertNotNull(writer, scenario); + assertTrue(writer.getClass().getName().contains(expectedClassFragment), scenario); + } + } + } +} diff --git a/dd-trace-core/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/dd-trace-core/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker new file mode 100644 index 00000000000..ca6ee9cea8e --- /dev/null +++ b/dd-trace-core/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker @@ -0,0 +1 @@ +mock-maker-inline \ No newline at end of file From 673986ec09909ea308510cdbf526bbc1e5c4f0f1 Mon Sep 17 00:00:00 2001 From: "dd-octo-sts[bot]" <200755185+dd-octo-sts[bot]@users.noreply.github.com> Date: Mon, 29 Jun 2026 15:13:59 +0000 Subject: [PATCH 063/139] chore: Update Gradle dependencies (#11766) chore: Update Gradle dependencies Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: alexey.kuznetsov --- dd-java-agent/agent-bootstrap/gradle.lockfile | 8 ++++++-- .../gradle.lockfile | 7 ++++++- .../civisibility-test-fixtures/gradle.lockfile | 7 ++++++- dd-java-agent/agent-ci-visibility/gradle.lockfile | 7 ++++++- .../agent-iast/iast-test-fixtures/gradle.lockfile | 7 ++++++- dd-java-agent/agent-installer/gradle.lockfile | 7 ++++++- dd-java-agent/agent-llmobs/gradle.lockfile | 7 ++++++- .../agent-profiling/profiling-uploader/gradle.lockfile | 7 ++++++- dd-java-agent/agent-tooling/gradle.lockfile | 8 ++++++-- dd-java-agent/appsec/appsec-test-fixtures/gradle.lockfile | 7 ++++++- dd-java-agent/cws-tls/gradle.lockfile | 7 ++++++- dd-trace-core/gradle.lockfile | 8 ++++++-- dd-trace-ot/gradle.lockfile | 8 ++++++-- internal-api/internal-api-9/gradle.lockfile | 7 ++++++- .../feature-flagging-agent/gradle.lockfile | 3 ++- .../feature-flagging-bootstrap/gradle.lockfile | 3 ++- .../feature-flagging/feature-flagging-lib/gradle.lockfile | 7 ++++++- 17 files changed, 94 insertions(+), 21 deletions(-) diff --git a/dd-java-agent/agent-bootstrap/gradle.lockfile b/dd-java-agent/agent-bootstrap/gradle.lockfile index dbdbcabbca8..8387c0537dd 100644 --- a/dd-java-agent/agent-bootstrap/gradle.lockfile +++ b/dd-java-agent/agent-bootstrap/gradle.lockfile @@ -27,10 +27,13 @@ com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs -com.google.errorprone:error_prone_annotations:2.0.12=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava-testlib:20.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.guava:guava:20.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=jmhRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -82,6 +85,7 @@ org.jacoco:org.jacoco.core:0.8.14=jacocoAnt org.jacoco:org.jacoco.report:0.8.14=jacocoAnt org.jctools:jctools-core-jdk11:4.0.6=jmhRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=jmhRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=jmhRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-ci-visibility/civisibility-instrumentation-test-fixtures/gradle.lockfile b/dd-java-agent/agent-ci-visibility/civisibility-instrumentation-test-fixtures/gradle.lockfile index 732423bf8c3..32553c9440e 100644 --- a/dd-java-agent/agent-ci-visibility/civisibility-instrumentation-test-fixtures/gradle.lockfile +++ b/dd-java-agent/agent-ci-visibility/civisibility-instrumentation-test-fixtures/gradle.lockfile @@ -32,7 +32,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=runtimeClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.8.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -86,6 +90,7 @@ org.jacoco:org.jacoco.core:0.8.14=jacocoAnt,runtimeClasspath,testRuntimeClasspat org.jacoco:org.jacoco.report:0.8.14=jacocoAnt,runtimeClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=runtimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=runtimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=runtimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/gradle.lockfile b/dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/gradle.lockfile index 2c871d587fc..bd03b9135ad 100644 --- a/dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/gradle.lockfile +++ b/dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/gradle.lockfile @@ -32,7 +32,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=runtimeClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.8.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -86,6 +90,7 @@ org.jacoco:org.jacoco.core:0.8.14=jacocoAnt,runtimeClasspath,testRuntimeClasspat org.jacoco:org.jacoco.report:0.8.14=jacocoAnt,runtimeClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=runtimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=runtimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=runtimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-ci-visibility/gradle.lockfile b/dd-java-agent/agent-ci-visibility/gradle.lockfile index f022869ba4b..82eaa1676c9 100644 --- a/dd-java-agent/agent-ci-visibility/gradle.lockfile +++ b/dd-java-agent/agent-ci-visibility/gradle.lockfile @@ -36,7 +36,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,compileOnlyDependenciesMetadata,spotbugs,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:18.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.jimfs:jimfs:1.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc @@ -118,6 +122,7 @@ org.jline:jline-native:3.27.1=zinc org.jline:jline-terminal-jni:3.27.1=zinc org.jline:jline-terminal:3.27.1=zinc org.jline:jline:3.27.1=zinc +org.jspecify:jspecify:1.0.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath diff --git a/dd-java-agent/agent-iast/iast-test-fixtures/gradle.lockfile b/dd-java-agent/agent-iast/iast-test-fixtures/gradle.lockfile index 892fc053b2b..3e99d88ca46 100644 --- a/dd-java-agent/agent-iast/iast-test-fixtures/gradle.lockfile +++ b/dd-java-agent/agent-iast/iast-test-fixtures/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=runtimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -77,6 +81,7 @@ org.jacoco:org.jacoco.core:0.8.14=jacocoAnt org.jacoco:org.jacoco.report:0.8.14=jacocoAnt org.jctools:jctools-core-jdk11:4.0.6=runtimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=runtimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=runtimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-installer/gradle.lockfile b/dd-java-agent/agent-installer/gradle.lockfile index 236ed9e9216..7787d953a56 100644 --- a/dd-java-agent/agent-installer/gradle.lockfile +++ b/dd-java-agent/agent-installer/gradle.lockfile @@ -36,7 +36,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,main_java25CompileClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -85,6 +89,7 @@ org.jacoco:org.jacoco.core:0.8.14=jacocoAnt org.jacoco:org.jacoco.report:0.8.14=jacocoAnt org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-llmobs/gradle.lockfile b/dd-java-agent/agent-llmobs/gradle.lockfile index fd3dda254bf..d8f37163155 100644 --- a/dd-java-agent/agent-llmobs/gradle.lockfile +++ b/dd-java-agent/agent-llmobs/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -77,6 +81,7 @@ org.jacoco:org.jacoco.core:0.8.14=jacocoAnt org.jacoco:org.jacoco.report:0.8.14=jacocoAnt org.jctools:jctools-core-jdk11:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-profiling/profiling-uploader/gradle.lockfile b/dd-java-agent/agent-profiling/profiling-uploader/gradle.lockfile index 56378b85980..cb11eb12120 100644 --- a/dd-java-agent/agent-profiling/profiling-uploader/gradle.lockfile +++ b/dd-java-agent/agent-profiling/profiling-uploader/gradle.lockfile @@ -31,7 +31,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:mockwebserver:3.12.12=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -76,6 +80,7 @@ org.jacoco:org.jacoco.ant:0.8.14=jacocoAnt org.jacoco:org.jacoco.core:0.8.14=jacocoAnt org.jacoco:org.jacoco.report:0.8.14=jacocoAnt org.javadelight:delight-fileupload:0.0.5=testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-tooling/gradle.lockfile b/dd-java-agent/agent-tooling/gradle.lockfile index 4298677339b..58ba0c07e33 100644 --- a/dd-java-agent/agent-tooling/gradle.lockfile +++ b/dd-java-agent/agent-tooling/gradle.lockfile @@ -35,10 +35,13 @@ com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath,test_java11CompileClasspath,test_java11RuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs -com.google.errorprone:error_prone_annotations:2.0.12=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_java11CompileClasspath,test_java11RuntimeClasspath com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_java11CompileClasspath,test_java11RuntimeClasspath +com.google.guava:failureaccess:1.0.3=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_java11CompileClasspath,test_java11RuntimeClasspath com.google.guava:guava-testlib:20.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_java11CompileClasspath,test_java11RuntimeClasspath -com.google.guava:guava:20.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_java11CompileClasspath,test_java11RuntimeClasspath +com.google.guava:guava:33.6.0-jre=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_java11CompileClasspath,test_java11RuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_java11CompileClasspath,test_java11RuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_java11CompileClasspath,test_java11RuntimeClasspath com.google.re2j:re2j:1.8=jmhRuntimeClasspath,testRuntimeClasspath,test_java11RuntimeClasspath com.squareup.moshi:moshi:1.11.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_java11CompileClasspath,test_java11RuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_java11CompileClasspath,test_java11RuntimeClasspath @@ -96,6 +99,7 @@ org.jacoco:org.jacoco.core:0.8.14=jacocoAnt org.jacoco:org.jacoco.report:0.8.14=jacocoAnt org.jctools:jctools-core-jdk11:4.0.6=jmhRuntimeClasspath,testRuntimeClasspath,test_java11RuntimeClasspath org.jctools:jctools-core:4.0.6=jmhRuntimeClasspath,testRuntimeClasspath,test_java11RuntimeClasspath +org.jspecify:jspecify:1.0.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_java11CompileClasspath,test_java11RuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_java11CompileClasspath,test_java11RuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=jmhRuntimeClasspath,testRuntimeClasspath,test_java11RuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_java11CompileClasspath,test_java11RuntimeClasspath diff --git a/dd-java-agent/appsec/appsec-test-fixtures/gradle.lockfile b/dd-java-agent/appsec/appsec-test-fixtures/gradle.lockfile index cae9cc84acb..f217773965d 100644 --- a/dd-java-agent/appsec/appsec-test-fixtures/gradle.lockfile +++ b/dd-java-agent/appsec/appsec-test-fixtures/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=runtimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -77,6 +81,7 @@ org.jacoco:org.jacoco.core:0.8.14=jacocoAnt org.jacoco:org.jacoco.report:0.8.14=jacocoAnt org.jctools:jctools-core-jdk11:4.0.6=runtimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=runtimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=runtimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/cws-tls/gradle.lockfile b/dd-java-agent/cws-tls/gradle.lockfile index 08727e79336..4393d921a67 100644 --- a/dd-java-agent/cws-tls/gradle.lockfile +++ b/dd-java-agent/cws-tls/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -77,6 +81,7 @@ org.jacoco:org.jacoco.core:0.8.14=jacocoAnt org.jacoco:org.jacoco.report:0.8.14=jacocoAnt org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-trace-core/gradle.lockfile b/dd-trace-core/gradle.lockfile index 3f8ca4cfc08..ec9efb1da58 100644 --- a/dd-trace-core/gradle.lockfile +++ b/dd-trace-core/gradle.lockfile @@ -39,11 +39,14 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,jmhCompileClasspath,jmhRu com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=testAnnotationProcessor,traceAgentTestAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,traceAgentTestCompileClasspath,traceAgentTestRuntimeClasspath com.google.guava:failureaccess:1.0.1=testAnnotationProcessor,traceAgentTestAnnotationProcessor -com.google.guava:guava:20.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,traceAgentTestCompileClasspath,traceAgentTestRuntimeClasspath +com.google.guava:failureaccess:1.0.3=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,traceAgentTestCompileClasspath,traceAgentTestRuntimeClasspath com.google.guava:guava:32.0.1-jre=testAnnotationProcessor,traceAgentTestAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testAnnotationProcessor,traceAgentTestAnnotationProcessor +com.google.guava:guava:33.6.0-jre=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,traceAgentTestCompileClasspath,traceAgentTestRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=jmhRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath,traceAgentTestAnnotationProcessor,traceAgentTestCompileClasspath,traceAgentTestRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=testAnnotationProcessor,traceAgentTestAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,traceAgentTestCompileClasspath,traceAgentTestRuntimeClasspath com.google.protobuf:protobuf-java:3.14.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,traceAgentTestCompileClasspath,traceAgentTestRuntimeClasspath com.google.re2j:re2j:1.8=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,traceAgentTestCompileClasspath,traceAgentTestRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,traceAgentTestCompileClasspath,traceAgentTestRuntimeClasspath @@ -100,6 +103,7 @@ org.jacoco:org.jacoco.report:0.8.14=jacocoAnt org.jctools:jctools-core-jdk11:4.0.6=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,traceAgentTestCompileClasspath,traceAgentTestRuntimeClasspath org.jctools:jctools-core:4.0.6=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,traceAgentTestCompileClasspath,traceAgentTestRuntimeClasspath org.jetbrains:annotations:17.0.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,traceAgentTestCompileClasspath,traceAgentTestRuntimeClasspath +org.jspecify:jspecify:1.0.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,traceAgentTestCompileClasspath,traceAgentTestRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,traceAgentTestCompileClasspath,traceAgentTestRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=jmhRuntimeClasspath,testRuntimeClasspath,traceAgentTestRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,traceAgentTestCompileClasspath,traceAgentTestRuntimeClasspath diff --git a/dd-trace-ot/gradle.lockfile b/dd-trace-ot/gradle.lockfile index 983305d1d53..0b0a10d8acf 100644 --- a/dd-trace-ot/gradle.lockfile +++ b/dd-trace-ot/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,jmhCo com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=jmhRuntimeClasspath,ot31CompatibilityTestCompileClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestCompileClasspath,ot33CompatibilityTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor -com.google.guava:guava:20.0=jmhRuntimeClasspath,ot31CompatibilityTestCompileClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestCompileClasspath,ot33CompatibilityTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=jmhRuntimeClasspath,ot31CompatibilityTestCompileClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestCompileClasspath,ot33CompatibilityTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor +com.google.guava:guava:33.6.0-jre=jmhRuntimeClasspath,ot31CompatibilityTestCompileClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestCompileClasspath,ot33CompatibilityTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,jmhRuntimeClasspath,ot31CompatibilityTestCompileClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestCompileClasspath,ot33CompatibilityTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor +com.google.j2objc:j2objc-annotations:3.1=jmhRuntimeClasspath,ot31CompatibilityTestCompileClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestCompileClasspath,ot33CompatibilityTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=jmhRuntimeClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,ot31CompatibilityTestCompileClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestCompileClasspath,ot33CompatibilityTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=jmhRuntimeClasspath,ot31CompatibilityTestCompileClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestCompileClasspath,ot33CompatibilityTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -97,6 +100,7 @@ org.jacoco:org.jacoco.core:0.8.14=jacocoAnt org.jacoco:org.jacoco.report:0.8.14=jacocoAnt org.jctools:jctools-core-jdk11:4.0.6=jmhRuntimeClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=jmhRuntimeClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=jmhRuntimeClasspath,ot31CompatibilityTestCompileClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestCompileClasspath,ot33CompatibilityTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=jmhRuntimeClasspath,ot31CompatibilityTestCompileClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestCompileClasspath,ot33CompatibilityTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=jmhRuntimeClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=jmhRuntimeClasspath,ot31CompatibilityTestCompileClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestCompileClasspath,ot33CompatibilityTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/internal-api/internal-api-9/gradle.lockfile b/internal-api/internal-api-9/gradle.lockfile index 048c951b733..0ef8a2e6954 100644 --- a/internal-api/internal-api-9/gradle.lockfile +++ b/internal-api/internal-api-9/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=jmhRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -79,6 +83,7 @@ org.jacoco:org.jacoco.core:0.8.14=jacocoAnt org.jacoco:org.jacoco.report:0.8.14=jacocoAnt org.jctools:jctools-core-jdk11:4.0.6=jmhRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=jmhRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=jmhRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/products/feature-flagging/feature-flagging-agent/gradle.lockfile b/products/feature-flagging/feature-flagging-agent/gradle.lockfile index 233b8c888fb..a27441ac912 100644 --- a/products/feature-flagging/feature-flagging-agent/gradle.lockfile +++ b/products/feature-flagging/feature-flagging-agent/gradle.lockfile @@ -75,7 +75,8 @@ org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntime org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.0=spotbugs org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.mockito:mockito-core:4.4.0=testRuntimeClasspath +org.mockito:mockito-core:4.4.0=testCompileClasspath,testRuntimeClasspath +org.mockito:mockito-junit-jupiter:4.4.0=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:9.7.1=runtimeClasspath,testRuntimeClasspath diff --git a/products/feature-flagging/feature-flagging-bootstrap/gradle.lockfile b/products/feature-flagging/feature-flagging-bootstrap/gradle.lockfile index 429ee95712a..27fd7af54b1 100644 --- a/products/feature-flagging/feature-flagging-bootstrap/gradle.lockfile +++ b/products/feature-flagging/feature-flagging-bootstrap/gradle.lockfile @@ -56,7 +56,8 @@ org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntime org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.0=spotbugs org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.mockito:mockito-core:4.4.0=testRuntimeClasspath +org.mockito:mockito-core:4.4.0=testCompileClasspath,testRuntimeClasspath +org.mockito:mockito-junit-jupiter:4.4.0=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:9.9=spotbugs diff --git a/products/feature-flagging/feature-flagging-lib/gradle.lockfile b/products/feature-flagging/feature-flagging-lib/gradle.lockfile index 038e19e2c68..2bf69a9593e 100644 --- a/products/feature-flagging/feature-flagging-lib/gradle.lockfile +++ b/products/feature-flagging/feature-flagging-lib/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -77,6 +81,7 @@ org.jacoco:org.jacoco.core:0.8.14=jacocoAnt org.jacoco:org.jacoco.report:0.8.14=jacocoAnt org.jctools:jctools-core-jdk11:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath From 2f0dcd63a6f34a5f4db8905a71cad39fe273426a Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Mon, 29 Jun 2026 17:16:05 +0200 Subject: [PATCH 064/139] Improve test coverage for CiVis classes (#11768) fix: ExecutionAggregation coverage fix: TestExecutionPolicy coverage Co-authored-by: devflow.devflow-routing-intake --- internal-api/build.gradle.kts | 1 + .../execution/ExecutionAggregationTest.java | 54 +++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 internal-api/src/test/java/datadog/trace/api/civisibility/execution/ExecutionAggregationTest.java diff --git a/internal-api/build.gradle.kts b/internal-api/build.gradle.kts index 50a4d7fa02e..7ccc744f1a8 100644 --- a/internal-api/build.gradle.kts +++ b/internal-api/build.gradle.kts @@ -197,6 +197,7 @@ extra["excludedClassesCoverage"] = listOf( "datadog.trace.api.cache.FixedSizeCache.IdentityHash", "datadog.trace.api.cache.FixedSizeWeakKeyCache", // Interface with default method + "datadog.trace.api.civisibility.execution.TestExecutionPolicy", "datadog.trace.api.iast.Taintable", "datadog.trace.api.Stateful", "datadog.trace.api.Stateful.1", diff --git a/internal-api/src/test/java/datadog/trace/api/civisibility/execution/ExecutionAggregationTest.java b/internal-api/src/test/java/datadog/trace/api/civisibility/execution/ExecutionAggregationTest.java new file mode 100644 index 00000000000..a97badb0712 --- /dev/null +++ b/internal-api/src/test/java/datadog/trace/api/civisibility/execution/ExecutionAggregationTest.java @@ -0,0 +1,54 @@ +package datadog.trace.api.civisibility.execution; + +import static datadog.trace.api.civisibility.execution.ExecutionAggregation.MIXED; +import static datadog.trace.api.civisibility.execution.ExecutionAggregation.NONE; +import static datadog.trace.api.civisibility.execution.ExecutionAggregation.ONLY_FAILED; +import static datadog.trace.api.civisibility.execution.ExecutionAggregation.ONLY_PASSED; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; + +class ExecutionAggregationTest { + + @Test + void noneAfterFailIsOnlyFailed() { + assertEquals(ONLY_FAILED, NONE.withExecution(TestStatus.fail)); + } + + @Test + void noneAfterPassIsOnlyPassed() { + assertEquals(ONLY_PASSED, NONE.withExecution(TestStatus.pass)); + } + + @Test + void noneAfterSkipIsOnlyPassed() { + assertEquals(ONLY_PASSED, NONE.withExecution(TestStatus.skip)); + } + + @Test + void onlyFailedAfterFailStaysOnlyFailed() { + assertEquals(ONLY_FAILED, ONLY_FAILED.withExecution(TestStatus.fail)); + } + + @Test + void onlyFailedAfterPassIsMixed() { + assertEquals(MIXED, ONLY_FAILED.withExecution(TestStatus.pass)); + } + + @Test + void onlyPassedAfterPassStaysOnlyPassed() { + assertEquals(ONLY_PASSED, ONLY_PASSED.withExecution(TestStatus.pass)); + } + + @Test + void onlyPassedAfterFailIsMixed() { + assertEquals(MIXED, ONLY_PASSED.withExecution(TestStatus.fail)); + } + + @Test + void mixedAfterAnyStatusStaysMixed() { + assertEquals(MIXED, MIXED.withExecution(TestStatus.pass)); + assertEquals(MIXED, MIXED.withExecution(TestStatus.fail)); + assertEquals(MIXED, MIXED.withExecution(TestStatus.skip)); + } +} From eb16bbe3c6380de956322e9897f66f6eed908f08 Mon Sep 17 00:00:00 2001 From: Stuart McCulloch Date: Mon, 29 Jun 2026 16:27:49 +0100 Subject: [PATCH 065/139] Extend OTLP HTTP coverage to GRPC (#11771) Extend OTLP HTTP coverage to GRPC Co-authored-by: devflow.devflow-routing-intake --- dd-trace-core/build.gradle | 7 +- .../otlp/common/OtlpGrpcRequestBodyTest.java | 91 +++++++++++++++++++ 2 files changed, 97 insertions(+), 1 deletion(-) create mode 100644 dd-trace-core/src/test/java/datadog/trace/core/otlp/common/OtlpGrpcRequestBodyTest.java diff --git a/dd-trace-core/build.gradle b/dd-trace-core/build.gradle index ee8ef78ee16..0da1ae17470 100644 --- a/dd-trace-core/build.gradle +++ b/dd-trace-core/build.gradle @@ -54,7 +54,12 @@ excludedClassesCoverage += [ // TODO CorePropagation will be removed during context refactoring 'datadog.trace.core.propagation.CorePropagation', // TODO DSM propagator will be tested once fully migrated - 'datadog.trace.core.datastreams.DataStreamPropagator' + 'datadog.trace.core.datastreams.DataStreamPropagator', + // send() requires live HTTP/2 server + 'datadog.trace.core.otlp.common.OtlpGrpcSender', + // covered by OTLP system-tests + 'datadog.trace.core.otlp.logs.OtlpLogsService', + 'datadog.trace.core.otlp.metrics.OtlpMetricsService' ] addTestSuite('traceAgentTest') diff --git a/dd-trace-core/src/test/java/datadog/trace/core/otlp/common/OtlpGrpcRequestBodyTest.java b/dd-trace-core/src/test/java/datadog/trace/core/otlp/common/OtlpGrpcRequestBodyTest.java new file mode 100644 index 00000000000..702be21873c --- /dev/null +++ b/dd-trace-core/src/test/java/datadog/trace/core/otlp/common/OtlpGrpcRequestBodyTest.java @@ -0,0 +1,91 @@ +package datadog.trace.core.otlp.common; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.nio.ByteBuffer; +import java.util.zip.GZIPInputStream; +import okhttp3.MediaType; +import okio.Buffer; +import org.junit.jupiter.api.Test; + +class OtlpGrpcRequestBodyTest { + + @Test + void contentTypeIsApplicationGrpc() { + OtlpGrpcRequestBody body = + new OtlpGrpcRequestBody( + new OtlpPayload(ByteBuffer.wrap(new byte[] {1, 2, 3}), "application/grpc+proto"), + false); + + assertEquals(MediaType.get("application/grpc"), body.contentType()); + } + + @Test + void contentLengthIsHeaderPlusPayloadWhenUncompressed() { + OtlpGrpcRequestBody body = + new OtlpGrpcRequestBody( + new OtlpPayload(ByteBuffer.wrap(new byte[] {1, 2, 3, 4}), "application/grpc+proto"), + false); + + // 5-byte header (1 flag + 4 length) + 4-byte payload = 9 + assertEquals(9, body.contentLength()); + } + + @Test + void contentLengthIsNegativeOneWhenGzipped() { + OtlpGrpcRequestBody body = + new OtlpGrpcRequestBody( + new OtlpPayload(ByteBuffer.wrap(new byte[] {1, 2, 3, 4}), "application/grpc+proto"), + true); + + assertEquals(-1, body.contentLength()); + } + + @Test + void writeToProducesGrpcFrameWithUncompressedFlagWhenNotGzipped() throws IOException { + byte[] data = {10, 20, 30, 40, 50}; + OtlpGrpcRequestBody body = + new OtlpGrpcRequestBody( + new OtlpPayload(ByteBuffer.wrap(data), "application/grpc+proto"), false); + Buffer sink = new Buffer(); + + body.writeTo(sink); + + assertEquals(0, sink.readByte()); // uncompressed flag + assertEquals(data.length, sink.readInt()); // 4-byte big-endian length + assertArrayEquals(data, sink.readByteArray()); // payload + } + + @Test + void writeToProducesGrpcFrameWithCompressedFlagAndGzipDataWhenGzipped() throws IOException { + byte[] data = "the quick brown fox jumps over the lazy dog".getBytes(); + OtlpGrpcRequestBody body = + new OtlpGrpcRequestBody( + new OtlpPayload(ByteBuffer.wrap(data), "application/grpc+proto"), true); + Buffer sink = new Buffer(); + + body.writeTo(sink); + + assertEquals(1, sink.readByte()); // compressed flag + int gzipLength = sink.readInt(); // 4-byte big-endian gzip content length + byte[] gzipped = sink.readByteArray(gzipLength); + assertArrayEquals(data, gunzip(gzipped)); + } + + private static byte[] gunzip(byte[] gzipped) throws IOException { + ByteArrayOutputStream out = new ByteArrayOutputStream(); + try (InputStream gz = new GZIPInputStream(new ByteArrayInputStream(gzipped))) { + byte[] buf = new byte[256]; + int n; + while ((n = gz.read(buf)) > 0) { + out.write(buf, 0, n); + } + } + return out.toByteArray(); + } +} From a8eff3420ca65cbd1b076fa9638027f4bf6fc337 Mon Sep 17 00:00:00 2001 From: Douglas Q Hawkins Date: Mon, 29 Jun 2026 11:28:02 -0400 Subject: [PATCH 066/139] Overhaul set benchmarks: split Immutable / SingleThreaded, add Set.copyOf (#11721) Overhaul set benchmarks: split Immutable / SingleThreaded, add Set.copyOf Mirror the map-benchmark overhaul for sets. Replace the single SetBenchmark (shared mutable counter under @Threads(8); contains_treeSet bug that queried HASH_SET) with two classes that each pick the right threading model: - ImmutableSetBenchmark: fixed read-only membership shared across threads (@State(Scope.Benchmark)); array / sortedArray / HashSet / TreeSet / Set.copyOf (the JDK compact SetN the agent actually uses for config sets, via CollectionUtils.tryMakeImmutableSet). hit/miss split, per-thread cursor. - SingleThreadedSetBenchmark: per-thread mutable lifecycle (@State(Scope.Thread)); create/clone + contains/iterate, plus a Collections.synchronizedSet case for the uncontended synchronization tax (per-thread => bias never revoked; biased-locking story across JVMs). StringIndex rows fold in later. Result blocks empty pending a fresh multi-JVM run. Co-Authored-By: Claude Opus 4.8 (1M context) Add Java 17 results to set benchmark Javadocs ImmutableSetBenchmark: HashSet fastest; Set.copyOf (SetN) ~10% behind on hit, the compact form the agent uses for fixed config sets. SingleThreadedSetBenchmark: uncontended synchronizedSet tax ~37% on contains (biased locking off, Java 17), near-zero on iterate. Co-Authored-By: Claude Opus 4.8 (1M context) Rename copyOf -> tracerImmutableSet in ImmutableSetBenchmark Per bric3 review: copyOf named the mechanism; tracerImmutableSet names the role (the agent's fixed-config-set representation, i.e. Set.copyOf / SetN). Prose keeps the Set#copyOf reference for the mechanism. Co-Authored-By: Claude Opus 4.8 (1M context) Fix clone_synchronizedSet to clone the synchronized set (not the plain one) Per Codex review: it copied `hashSet`, unlike the other clone_* methods which copy their own structure. Copy `synchronizedSet` so it faithfully measures cloning the synchronized variant. Co-Authored-By: Claude Opus 4.8 (1M context) Merge branch 'master' into dougqh/set-benchmark Co-authored-by: devflow.devflow-routing-intake --- .../trace/util/ImmutableSetBenchmark.java | 187 +++++++++++++++++ .../java/datadog/trace/util/SetBenchmark.java | 128 ----------- .../util/SingleThreadedSetBenchmark.java | 198 ++++++++++++++++++ 3 files changed, 385 insertions(+), 128 deletions(-) create mode 100644 internal-api/src/jmh/java/datadog/trace/util/ImmutableSetBenchmark.java delete mode 100644 internal-api/src/jmh/java/datadog/trace/util/SetBenchmark.java create mode 100644 internal-api/src/jmh/java/datadog/trace/util/SingleThreadedSetBenchmark.java diff --git a/internal-api/src/jmh/java/datadog/trace/util/ImmutableSetBenchmark.java b/internal-api/src/jmh/java/datadog/trace/util/ImmutableSetBenchmark.java new file mode 100644 index 00000000000..54b27604f3d --- /dev/null +++ b/internal-api/src/jmh/java/datadog/trace/util/ImmutableSetBenchmark.java @@ -0,0 +1,187 @@ +package datadog.trace.util; + +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; +import java.util.TreeSet; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.Fork; +import org.openjdk.jmh.annotations.Level; +import org.openjdk.jmh.annotations.Measurement; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.Threads; +import org.openjdk.jmh.annotations.Warmup; + +/** + * Membership over a small, fixed, read-only string set shared across threads — split into hit and + * miss lookups (different cost shapes per structure). + * + *

The set is built once and only read, so a single shared instance ({@link Scope#Benchmark}) + * read by all {@code @Threads} is realistic and contention-free. This is the read-mostly + * counterpart to the per-thread mutable {@link SingleThreadedSetBenchmark}, and mirrors {@link + * ImmutableMapBenchmark} on the set side. Sets in the tracer skew strongly toward this fixed, + * read-only shape. + * + *

Strategies compared: + * + *

    + *
  • {@code array} / {@code sortedArray} — linear scan / binary search; slow on miss. + *
  • {@link HashSet} — idiomatic, fast; node-based, allocates per element. + *
  • {@link TreeSet} — comparator-ordered; worth it only for a custom comparator, not speed. + *
  • {@code tracerImmutableSet} — {@link java.util.Set#copyOf} (via {@link + * CollectionUtils#tryMakeImmutableSet}), the JDK's compact, array-backed immutable set + * ({@code ImmutableCollections.SetN}), which is what the agent actually uses for fixed config + * sets. Java 10+; falls back to {@code HashSet} pre-10. The realistic baseline for any + * flat/immutable set comparison. + *
+ * + *

Lookups are interned (the {@code ==} fast path where a structure has one); misses are short + * and never present. + * + *

Java 17 results (Apple M1, {@code @Fork(2)}, {@code @Threads(8)}; M ops/s = millions): + * + * 

{@code
+ * Structure              hit     miss
+ * hashSet               2159     1751    (fastest)
+ * tracerImmutableSet    1946     1633    (Set.copyOf / SetN)
+ * array                  926      584
+ * sortedArray            664      588
+ * treeSet                642      593
+ * }
+ * + *

Key findings: + * + *

    + *
  • {@code HashSet} is fastest; {@link java.util.Set#copyOf} ({@code SetN}) trails by only ~10% + * on hit and ~7% on miss — and it's the compact, array-backed form the agent already uses for + * fixed config sets, so it's a strong default when the set is immutable. + *
  • {@code array} / {@code sortedArray} / {@code treeSet} cluster at ~0.6–0.9B — they scan, + * binary-search, or tree-walk per lookup, so they trail the hashed structures, most visibly + * on the miss path. + *
+ */ +@Fork(2) +@Warmup(iterations = 2) +@Measurement(iterations = 3) +@Threads(8) +@State(Scope.Benchmark) +public class ImmutableSetBenchmark { + static final String[] STRINGS = { + "foo", "bar", "baz", "quux", "hello", "world", + "service", "queryString", "lorem", "ipsum", "dolem", "sit" + }; + + /** Distinct String instances that are never present, for the miss path. */ + static final String[] MISSES = newMisses(); + + static String[] newMisses() { + String[] misses = new String[STRINGS.length * 4]; + for (int i = 0; i < misses.length; ++i) { + misses[i] = "dne-" + i; + } + return misses; + } + + // Built once, never mutated -- safe to share across the reader threads. + String[] array; + String[] sortedArray; + HashSet hashSet; + TreeSet treeSet; + Set tracerImmutableSet; + + @Setup(Level.Trial) + public void setUp() { + array = STRINGS; + sortedArray = Arrays.copyOf(STRINGS, STRINGS.length); + Arrays.sort(sortedArray); + hashSet = new HashSet<>(Arrays.asList(STRINGS)); + treeSet = new TreeSet<>(Arrays.asList(STRINGS)); + tracerImmutableSet = CollectionUtils.tryMakeImmutableSet(Arrays.asList(STRINGS)); + } + + /** Per-thread lookup cursor so each reader thread cycles keys independently. */ + @State(Scope.Thread) + public static class Cursor { + int hitIndex = 0; + int missIndex = 0; + + String nextHit() { + int i = hitIndex + 1; + if (i >= STRINGS.length) { + i = 0; + } + hitIndex = i; + return STRINGS[i]; + } + + String nextMiss() { + int i = missIndex + 1; + if (i >= MISSES.length) { + i = 0; + } + missIndex = i; + return MISSES[i]; + } + } + + static boolean arrayContains(String[] array, String needle) { + for (String s : array) { + if (needle.equals(s)) { + return true; + } + } + return false; + } + + @Benchmark + public boolean array_hit(Cursor cursor) { + return arrayContains(array, cursor.nextHit()); + } + + @Benchmark + public boolean array_miss(Cursor cursor) { + return arrayContains(array, cursor.nextMiss()); + } + + @Benchmark + public boolean sortedArray_hit(Cursor cursor) { + return Arrays.binarySearch(sortedArray, cursor.nextHit()) >= 0; + } + + @Benchmark + public boolean sortedArray_miss(Cursor cursor) { + return Arrays.binarySearch(sortedArray, cursor.nextMiss()) >= 0; + } + + @Benchmark + public boolean hashSet_hit(Cursor cursor) { + return hashSet.contains(cursor.nextHit()); + } + + @Benchmark + public boolean hashSet_miss(Cursor cursor) { + return hashSet.contains(cursor.nextMiss()); + } + + @Benchmark + public boolean treeSet_hit(Cursor cursor) { + return treeSet.contains(cursor.nextHit()); + } + + @Benchmark + public boolean treeSet_miss(Cursor cursor) { + return treeSet.contains(cursor.nextMiss()); + } + + @Benchmark + public boolean tracerImmutableSet_hit(Cursor cursor) { + return tracerImmutableSet.contains(cursor.nextHit()); + } + + @Benchmark + public boolean tracerImmutableSet_miss(Cursor cursor) { + return tracerImmutableSet.contains(cursor.nextMiss()); + } +} diff --git a/internal-api/src/jmh/java/datadog/trace/util/SetBenchmark.java b/internal-api/src/jmh/java/datadog/trace/util/SetBenchmark.java deleted file mode 100644 index 144e4748400..00000000000 --- a/internal-api/src/jmh/java/datadog/trace/util/SetBenchmark.java +++ /dev/null @@ -1,128 +0,0 @@ -package datadog.trace.util; - -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; -import java.util.TreeSet; -import java.util.concurrent.ThreadLocalRandom; -import java.util.function.Supplier; -import org.openjdk.jmh.annotations.Benchmark; -import org.openjdk.jmh.annotations.Fork; -import org.openjdk.jmh.annotations.Measurement; -import org.openjdk.jmh.annotations.Threads; -import org.openjdk.jmh.annotations.Warmup; - -/** - * - * - *
    - * Benchmark showing possible ways to represent and check if a set includes an elememt... - *
  • (RECOMMENDED) HashSet - on par with TreeSet - idiomatic - *
  • (RECOMMENDED) TreeMap - on par with HashSet - better solution if custom comparator is - * needed (see CaseInsensitiveMapBenchmark) - *
  • array - slower than HashSet - *
  • sortedArray - slowest - slower than array for common case of small arrays - *
- * - * - * MacBook M1 - 8 threads - Java 21 - * 1/3 not found rate - * - * Benchmark Mode Cnt Score Error Units - * SetBenchmark.contains_array thrpt 6 645561886.327 ± 100781717.494 ops/s - * SetBenchmark.contains_hashSet thrpt 6 1536236680.235 ± 114966961.506 ops/s - * SetBenchmark.contains_sortedArray thrpt 6 571476939.441 ± 21334620.460 ops/s - * SetBenchmark.contains_treeSet thrpt 6 1557663759.411 ± 95343683.124 ops/s - * - */ -@Fork(2) -@Warmup(iterations = 2) -@Measurement(iterations = 3) -@Threads(8) -public class SetBenchmark { - static final String[] STRINGS = - new String[] { - "foo", - "bar", - "baz", - "quux", - "hello", - "world", - "service", - "queryString", - "lorem", - "ipsum", - "dolem", - "sit" - }; - - static T init(Supplier supplier) { - return supplier.get(); - } - - static final String[] LOOKUPS = - init( - () -> { - String[] lookups = Arrays.copyOf(STRINGS, STRINGS.length * 10); - - for (int i = 0; i < STRINGS.length; ++i) { - lookups[STRINGS.length + i] = new String(STRINGS[i]); - } - - // 2 / 3 of the key look-ups miss the set - for (int i = STRINGS.length * 2; i < lookups.length; ++i) { - lookups[i] = "dne-" + ThreadLocalRandom.current().nextInt(); - } - - Collections.shuffle(Arrays.asList(lookups)); - return lookups; - }); - - static int sharedLookupIndex = 0; - - static String nextString() { - int localIndex = ++sharedLookupIndex; - if (localIndex >= LOOKUPS.length) { - sharedLookupIndex = localIndex = 0; - } - return LOOKUPS[localIndex]; - } - - static final String[] ARRAY = STRINGS; - - @Benchmark - public boolean contains_array() { - String needle = nextString(); - for (String str : ARRAY) { - if (needle.equals(str)) return true; - } - return false; - } - - static final String[] SORTED_ARRAY = - init( - () -> { - String[] sorted = Arrays.copyOf(STRINGS, STRINGS.length); - Arrays.sort(sorted); - return sorted; - }); - - @Benchmark - public boolean contains_sortedArray() { - return (Arrays.binarySearch(SORTED_ARRAY, nextString()) != -1); - } - - static final HashSet HASH_SET = new HashSet<>(Arrays.asList(STRINGS)); - - @Benchmark - public boolean contains_hashSet() { - return HASH_SET.contains(nextString()); - } - - static final TreeSet TREE_SET = new TreeSet<>(Arrays.asList(STRINGS)); - - @Benchmark - public boolean contains_treeSet() { - return HASH_SET.contains(nextString()); - } -} diff --git a/internal-api/src/jmh/java/datadog/trace/util/SingleThreadedSetBenchmark.java b/internal-api/src/jmh/java/datadog/trace/util/SingleThreadedSetBenchmark.java new file mode 100644 index 00000000000..e145e6bbe8b --- /dev/null +++ b/internal-api/src/jmh/java/datadog/trace/util/SingleThreadedSetBenchmark.java @@ -0,0 +1,198 @@ +package datadog.trace.util; + +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.LinkedHashSet; +import java.util.Set; +import java.util.TreeSet; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.Fork; +import org.openjdk.jmh.annotations.Level; +import org.openjdk.jmh.annotations.Measurement; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.Threads; +import org.openjdk.jmh.annotations.Warmup; +import org.openjdk.jmh.infra.Blackhole; + +/** + * Single-threaded (uncontended) set usage: each thread builds, reads, and discards its own + * sets. Per-thread state ({@link Scope#Thread}); mirrors {@link SingleThreadedMapBenchmark} on the + * set side. Running at {@code @Threads(8)} keeps allocation / GC interactions visible without lock + * contention. + * + *

Sets in the tracer skew read-only/fixed (see {@link ImmutableSetBenchmark}); this covers the + * mutable-lifecycle case for completeness and — via {@link Collections#synchronizedSet} — the + * uncontended synchronization tax. Because each thread owns its synchronized set, the + * monitor is only ever locked by one thread: biased locking ≈ free on Java ≤ 11, full uncontended + * CAS on Java 15+ (biased locking disabled by default, JEP 374). The unsynchronized {@code hashSet} + * {@code contains}/{@code iterate} methods are the in-harness baseline; the tax is the delta. + * + *

Java 17 results (Apple M1, {@code @Fork(2)}, {@code @Threads(8)}; M ops/s = millions): + * + * 

{@code
+ * contains_hashSet            1291
+ * contains_synchronizedSet     808    (~37% slower — the uncontended sync tax)
+ * iterate_hashSet              91
+ * iterate_synchronizedSet      90    (one monitor acquire amortized over the walk)
+ *
+ * create_hashSet         81    clone_hashSet          48
+ * create_hashSet_sized   78    clone_synchronizedSet  47
+ * create_linkedHashSet   61    clone_linkedHashSet    59
+ * create_synchronizedSet 41    clone_treeSet          83
+ * create_treeSet         36
+ * }
+ * + *

Key findings: + * + *

    + *
  • Uncontended synchronization tax on {@code contains} is ~37% (1291 → 808M ops/s) even + * with no contention and biased locking disabled (Java 17, JEP 374) — the full per-lock CAS + * cost. On {@code iterate} it nearly vanishes: a single monitor acquire amortized over the + * traversal. + *
  • Construction: {@code TreeSet} is the slowest to build (~36M); the {@code synchronizedSet} + * wrapper adds a modest cost over plain {@code HashSet}. (Allocation-path numbers carry more + * run-to-run variance than the read paths.) + *
+ */ +@Fork(2) +@Warmup(iterations = 2) +@Measurement(iterations = 3) +@Threads(8) +@State(Scope.Thread) +public class SingleThreadedSetBenchmark { + static final String[] ELEMENTS = { + "foo", "bar", "baz", "quux", "hello", "world", + "service", "queryString", "lorem", "ipsum", "dolem", "sit" + }; + + // Distinct String instances so lookups exercise equals(), not identity. + static final String[] EQUAL_ELEMENTS = newEqualElements(); + + static String[] newEqualElements() { + String[] copies = new String[ELEMENTS.length]; + for (int i = 0; i < ELEMENTS.length; ++i) { + copies[i] = new String(ELEMENTS[i]); + } + return copies; + } + + static void fill(Set set) { + for (String s : ELEMENTS) { + set.add(s); + } + } + + // Per-thread prebuilt sets for the read + clone benchmarks (built once per trial, per thread). + HashSet hashSet; + Set synchronizedSet; + TreeSet treeSet; + LinkedHashSet linkedHashSet; + int index = 0; + + @Setup(Level.Trial) + public void setUp() { + hashSet = new HashSet<>(Arrays.asList(ELEMENTS)); + synchronizedSet = Collections.synchronizedSet(new HashSet<>(hashSet)); + treeSet = new TreeSet<>(Arrays.asList(ELEMENTS)); + linkedHashSet = new LinkedHashSet<>(Arrays.asList(ELEMENTS)); + } + + String nextLookup() { + if (++index >= EQUAL_ELEMENTS.length) { + index = 0; + } + return EQUAL_ELEMENTS[index]; + } + + // ---- construction: build cost + allocation ---- + + @Benchmark + public Set create_hashSet() { + HashSet set = new HashSet<>(); + fill(set); + return set; + } + + @Benchmark + public Set create_hashSet_sized() { + HashSet set = new HashSet<>(ELEMENTS.length); + fill(set); + return set; + } + + @Benchmark + public Set create_synchronizedSet() { + Set set = Collections.synchronizedSet(new HashSet<>()); + fill(set); + return set; + } + + @Benchmark + public Set create_treeSet() { + TreeSet set = new TreeSet<>(); + fill(set); + return set; + } + + @Benchmark + public Set create_linkedHashSet() { + LinkedHashSet set = new LinkedHashSet<>(); + fill(set); + return set; + } + + // ---- copy ---- + + @Benchmark + public Set clone_hashSet() { + return new HashSet<>(hashSet); + } + + @Benchmark + public Set clone_synchronizedSet() { + return Collections.synchronizedSet(new HashSet<>(synchronizedSet)); + } + + @Benchmark + public Set clone_treeSet() { + return new TreeSet<>(treeSet); + } + + @Benchmark + public Set clone_linkedHashSet() { + return new LinkedHashSet<>(linkedHashSet); + } + + // ---- read: unsynchronized baseline vs uncontended synchronized (biased-locking story) ---- + + @Benchmark + public boolean contains_hashSet() { + return hashSet.contains(nextLookup()); + } + + @Benchmark + public boolean contains_synchronizedSet() { + return synchronizedSet.contains(nextLookup()); + } + + @Benchmark + public void iterate_hashSet(Blackhole blackhole) { + for (String s : hashSet) { + blackhole.consume(s); + } + } + + @Benchmark + public void iterate_synchronizedSet(Blackhole blackhole) { + // Collections.synchronizedSet requires the caller to synchronize during iteration; this is the + // correct usage and measures one (uncontended) monitor acquire around the traversal. + synchronized (synchronizedSet) { + for (String s : synchronizedSet) { + blackhole.consume(s); + } + } + } +} From 75f8482ffdd560b37091d245d642aca39e82ca73 Mon Sep 17 00:00:00 2001 From: Stuart McCulloch Date: Mon, 29 Jun 2026 17:03:02 +0100 Subject: [PATCH 067/139] Cover continuation and listener behaviour when registering no-op manager during tests (#11762) Cover continuation and listener behaviour when registering no-op manager during tests. Relax default 90% branch coverage rule to 80% for ContextContinuationImpl (couple of branches involve a nanosecond CAS race that can't be reliably reproduced) Update jacoco task outside of afterEvaluate block Co-authored-by: devflow.devflow-routing-intake --- components/context/build.gradle.kts | 21 +++++++- .../context/ContextProvidersForkedTest.java | 53 ++++++++++++++----- 2 files changed, 59 insertions(+), 15 deletions(-) diff --git a/components/context/build.gradle.kts b/components/context/build.gradle.kts index 27992034fc2..9889bf0a86a 100644 --- a/components/context/build.gradle.kts +++ b/components/context/build.gradle.kts @@ -1,3 +1,22 @@ apply(from = "$rootDir/gradle/java.gradle") -extra["excludedClassesInstructionCoverage"] = listOf("datadog.context.ContextProviders") // covered by forked test +extra["excludedClassesInstructionCoverage"] = + listOf("datadog.context.ContextProviders") // covered by forked test + +// excluded from the default 90% rule so the relaxed 80% rule below can apply instead +// (couple of branches involve a nanosecond CAS race that can't be reliably reproduced) +extra["excludedClassesBranchCoverage"] = + listOf("datadog.context.ThreadLocalContextManager.ContextContinuationImpl") + +tasks.named("jacocoTestCoverageVerification") { + violationRules { + rule { + element = "CLASS" + includes = listOf("datadog.context.ThreadLocalContextManager.ContextContinuationImpl") + limit { + counter = "BRANCH" + minimum = "0.8".toBigDecimal() + } + } + } +} diff --git a/components/context/src/test/java/datadog/context/ContextProvidersForkedTest.java b/components/context/src/test/java/datadog/context/ContextProvidersForkedTest.java index b8e61ddc4a4..47e6287ea36 100644 --- a/components/context/src/test/java/datadog/context/ContextProvidersForkedTest.java +++ b/components/context/src/test/java/datadog/context/ContextProvidersForkedTest.java @@ -2,10 +2,13 @@ import static datadog.context.Context.root; import static datadog.context.ContextTest.STRING_KEY; -import static org.junit.jupiter.api.Assertions.assertEquals; +import static datadog.context.ContextTestBase.trackingListener; import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertTrue; +import java.util.ArrayList; +import java.util.List; import javax.annotation.Nonnull; import org.junit.jupiter.api.Test; @@ -15,13 +18,15 @@ void testCustomBinder() { assertTrue(ContextBinder.allowTesting()); Context context = root().with(STRING_KEY, "value"); + assertNotEquals(root(), context); + Object carrier = new Object(); // should delegate to the default binder context.attachTo(carrier); - assertNotEquals(root(), Context.from(carrier)); - assertEquals(context, Context.detachFrom(carrier)); - assertEquals(root(), Context.from(carrier)); + assertSame(context, Context.from(carrier)); + assertSame(context, Context.detachFrom(carrier)); + assertSame(root(), Context.from(carrier)); // now register a NOOP context binder ContextBinder.register( @@ -44,8 +49,9 @@ public Context detachFrom(@Nonnull Object carrier) { // NOOP binder, context will always be root context.attachTo(carrier); - assertEquals(root(), Context.from(carrier)); - assertEquals(root(), Context.detachFrom(carrier)); + assertSame(root(), Context.from(carrier)); + assertSame(root(), Context.detachFrom(carrier)); + assertSame(root(), Context.from(carrier)); } @Test @@ -53,15 +59,22 @@ void testCustomManager() { assertTrue(ContextManager.allowTesting()); Context context = root().with(STRING_KEY, "value"); + assertNotEquals(root(), context); // should delegate to the default manager - try (ContextScope ignored = context.attach()) { - assertNotEquals(root(), Context.current()); + try (ContextScope scope = context.attach()) { + assertSame(context, scope.context()); + assertSame(context, Context.current()); + ContextContinuation cont = context.capture(); + assertSame(context, cont.context()); + cont.release(); } Context swapped = context.swap(); - assertNotEquals(root(), Context.current()); - swapped.swap(); + assertSame(root(), swapped); + assertSame(context, Context.current()); + assertSame(context, swapped.swap()); + assertSame(root(), Context.current()); // now register a NOOP context manager ContextManager.register( @@ -90,14 +103,26 @@ public ContextContinuation capture(Context context) { public void addListener(ContextListener listener) {} }); + List events = new ArrayList<>(); + ContextManager.register(trackingListener(events)); + // NOOP manager, context will always be root - try (ContextScope ignored = context.attach()) { - assertEquals(root(), Context.current()); + try (ContextScope scope = context.attach()) { + assertSame(root(), scope.context()); + assertSame(root(), Context.current()); + ContextContinuation cont = context.capture(); + assertSame(root(), cont.context()); + cont.release(); } // NOOP manager, context will always be root swapped = context.swap(); - assertEquals(root(), Context.current()); - swapped.swap(); + assertSame(root(), swapped); + assertSame(root(), Context.current()); + assertSame(root(), swapped.swap()); + assertSame(root(), Context.current()); + + // NOOP manager, no events emitted + assertTrue(events.isEmpty()); } } From 33350a33fb2ea5680086c7a1ec7adab1e1d42135 Mon Sep 17 00:00:00 2001 From: mhlidd Date: Mon, 29 Jun 2026 12:42:46 -0400 Subject: [PATCH 068/139] init (#11781) init Co-authored-by: devflow.devflow-routing-intake --- utils/config-utils/build.gradle.kts | 3 +- .../provider/StableConfigSourceTest.java | 28 ++++++ .../provider/stableconfig/RuleTest.java | 85 +++++++++++++++++++ 3 files changed, 115 insertions(+), 1 deletion(-) create mode 100644 utils/config-utils/src/test/java/datadog/trace/bootstrap/config/provider/stableconfig/RuleTest.java diff --git a/utils/config-utils/build.gradle.kts b/utils/config-utils/build.gradle.kts index 2891dc3845b..30334c87292 100644 --- a/utils/config-utils/build.gradle.kts +++ b/utils/config-utils/build.gradle.kts @@ -32,7 +32,8 @@ extra["excludedClassesCoverage"] = listOf( "datadog.trace.bootstrap.config.provider.stableconfig.Selector", // tested in internal-api "datadog.trace.bootstrap.config.provider.StableConfigParser", - "datadog.trace.bootstrap.config.provider.SystemPropertiesConfigSource" + "datadog.trace.bootstrap.config.provider.SystemPropertiesConfigSource", + "datadog.trace.config.inversion.SupportedConfiguration" ) extra["excludedClassesBranchCoverage"] = listOf( diff --git a/utils/config-utils/src/test/java/datadog/trace/bootstrap/config/provider/StableConfigSourceTest.java b/utils/config-utils/src/test/java/datadog/trace/bootstrap/config/provider/StableConfigSourceTest.java index 6c7747e5a8c..8ca3989ba7f 100644 --- a/utils/config-utils/src/test/java/datadog/trace/bootstrap/config/provider/StableConfigSourceTest.java +++ b/utils/config-utils/src/test/java/datadog/trace/bootstrap/config/provider/StableConfigSourceTest.java @@ -294,6 +294,34 @@ void testConfigIdExistsInConfigCollectorWhenUsingStableConfigSource() throws Exc } } + @Test + void testStableConfigGetHandlesPresentAndMissingKeys() { + Map configMap = new HashMap<>(); + configMap.put("DD_SERVICE", "test-service"); + configMap.put("DD_PORT", 8126); + + StableConfigSource.StableConfig config = + new StableConfigSource.StableConfig("config-123", configMap); + + // Present String value: hits the non-null branch of the ternary in get() + assertEquals("test-service", config.get("DD_SERVICE")); + // Present non-String value: exercises String.valueOf on a non-null, non-String object + assertEquals("8126", config.get("DD_PORT")); + // Missing key: hits the null branch of the ternary in get() + assertNull(config.get("DD_MISSING")); + + assertEquals("config-123", config.getConfigId()); + assertEquals(configMap.keySet(), config.getKeys()); + } + + @Test + void testStableConfigEmpty() { + StableConfigSource.StableConfig empty = StableConfigSource.StableConfig.EMPTY; + assertNull(empty.get("DD_SERVICE")); + assertNull(empty.getConfigId()); + assertEquals(0, empty.getKeys().size()); + } + private static void writeFileYaml( Path filePath, String configId, Map defaultConfigs) throws IOException { Map yamlData = new HashMap<>(); diff --git a/utils/config-utils/src/test/java/datadog/trace/bootstrap/config/provider/stableconfig/RuleTest.java b/utils/config-utils/src/test/java/datadog/trace/bootstrap/config/provider/stableconfig/RuleTest.java new file mode 100644 index 00000000000..d84c653f3d4 --- /dev/null +++ b/utils/config-utils/src/test/java/datadog/trace/bootstrap/config/provider/stableconfig/RuleTest.java @@ -0,0 +1,85 @@ +package datadog.trace.bootstrap.config.provider.stableconfig; + +import static java.util.Arrays.asList; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import org.junit.jupiter.api.Test; + +class RuleTest { + + @Test + void testNoArgConstructorYieldsEmptyState() { + Rule rule = new Rule(); + assertTrue(rule.getSelectors().isEmpty()); + assertTrue(rule.getConfiguration().isEmpty()); + } + + @Test + void testConstructorExposesValuesViaGetters() { + Selector selector = new Selector("process_arguments", "-Dfoo", asList("bar"), "equals"); + Map configuration = new HashMap<>(); + configuration.put("DD_SERVICE", "test"); + + Rule rule = new Rule(asList(selector), configuration); + + assertEquals(1, rule.getSelectors().size()); + assertSame(selector, rule.getSelectors().get(0)); + assertSame(configuration, rule.getConfiguration()); + } + + @Test + void testFromParsesValidRule() { + Map selectorMap = new LinkedHashMap<>(); + selectorMap.put("origin", "process_arguments"); + selectorMap.put("key", "-Dfoo"); + selectorMap.put("matches", asList("bar")); + selectorMap.put("operator", "equals"); + + Map configuration = new LinkedHashMap<>(); + configuration.put("DD_SERVICE", "test"); + + Map ruleMap = new LinkedHashMap<>(); + ruleMap.put("selectors", asList(selectorMap)); + ruleMap.put("configuration", configuration); + + Rule rule = Rule.from(ruleMap); + + List selectors = rule.getSelectors(); + assertEquals(1, selectors.size()); + Selector selector = selectors.get(0); + assertEquals("process_arguments", selector.getOrigin()); + assertEquals("-Dfoo", selector.getKey()); + assertEquals(asList("bar"), selector.getMatches()); + assertEquals("equals", selector.getOperator()); + + assertEquals("test", rule.getConfiguration().get("DD_SERVICE")); + } + + @Test + void testFromSkipsNullSelectorEntries() { + Map selectorMap = new LinkedHashMap<>(); + selectorMap.put("origin", "process_arguments"); + selectorMap.put("key", "-Dfoo"); + selectorMap.put("matches", asList("bar")); + selectorMap.put("operator", "equals"); + + Map configuration = new LinkedHashMap<>(); + configuration.put("DD_SERVICE", "test"); + + Map ruleMap = new LinkedHashMap<>(); + ruleMap.put("selectors", asList(null, selectorMap)); + ruleMap.put("configuration", configuration); + + Rule rule = Rule.from(ruleMap); + + // The null entry is filtered out, leaving only the valid selector. + assertEquals(1, rule.getSelectors().size()); + assertEquals("process_arguments", rule.getSelectors().get(0).getOrigin()); + } +} From 9c923aa1b699501e92fa99be35f35c9d6ba5e4e1 Mon Sep 17 00:00:00 2001 From: Andrea Marziali Date: Mon, 29 Jun 2026 18:45:38 +0200 Subject: [PATCH 069/139] Exclude ProfilerContext from coverage (#11777) Exclude ProfilerContext from coverage Co-authored-by: devflow.devflow-routing-intake --- internal-api/build.gradle.kts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/internal-api/build.gradle.kts b/internal-api/build.gradle.kts index 7ccc744f1a8..6bce24ae27c 100644 --- a/internal-api/build.gradle.kts +++ b/internal-api/build.gradle.kts @@ -201,6 +201,8 @@ extra["excludedClassesCoverage"] = listOf( "datadog.trace.api.iast.Taintable", "datadog.trace.api.Stateful", "datadog.trace.api.Stateful.1", + // an interface + "datadog.trace.bootstrap.instrumentation.api.ProfilerContext", // a stub "datadog.trace.bootstrap.instrumentation.api.ProfilingContextIntegration", "datadog.trace.bootstrap.instrumentation.api.ProfilingContextIntegration.NoOp", From 59b2142996fffec2dc8bbc404f432ff4f5b2ebf8 Mon Sep 17 00:00:00 2001 From: Douglas Q Hawkins Date: Mon, 29 Jun 2026 13:03:02 -0400 Subject: [PATCH 070/139] Drop per-call String allocation in SharedDBCommenter.containsTraceComment (#11734) Hoist containsTraceComment "=" needles to constants SharedDBCommenter.containsTraceComment built nine "KEY + =" strings on every call: the keys are encode()-derived (not compile-time constants), so each "KEY + =" is a runtime concat. A non-matching comment ran all nine checks and allocated nine throwaway Strings per call. Precompute the needles once at class init as *_EQ constants; the contains-chain is unchanged. Co-Authored-By: Claude Opus 4.8 Add SharedDBCommenterBenchmark for containsTraceComment Throughput benchmark at @Threads(8) over a realistic comment-content mix (mostly non-DD, the all-nine-checks worst case) to surface the per-call allocation removed by hoisting the "=" needles to constants. Run the parent commit (baseline) vs this branch and read the ops/s delta; -prof gc (gc.alloc.rate.norm) corroborates the mechanism. Co-Authored-By: Claude Opus 4.8 Refresh SharedDBCommenterBenchmark results to JDK 17 @Fork(5) zulu-17 @Fork(5), -prof gc: 33.5M -> 62.1M ops/s (~1.9x), 156 -> ~0 B/op. Co-Authored-By: Claude Opus 4.8 Merge branch 'master' into dougqh/dbcommenter-alloc Merge branch 'master' into dougqh/dbcommenter-alloc Co-authored-by: devflow.devflow-routing-intake --- .../dbm/SharedDBCommenterBenchmark.java | 86 +++++++++++++++++++ .../dbm/SharedDBCommenter.java | 36 +++++--- 2 files changed, 111 insertions(+), 11 deletions(-) create mode 100644 dd-java-agent/agent-bootstrap/src/jmh/java/datadog/trace/bootstrap/instrumentation/dbm/SharedDBCommenterBenchmark.java diff --git a/dd-java-agent/agent-bootstrap/src/jmh/java/datadog/trace/bootstrap/instrumentation/dbm/SharedDBCommenterBenchmark.java b/dd-java-agent/agent-bootstrap/src/jmh/java/datadog/trace/bootstrap/instrumentation/dbm/SharedDBCommenterBenchmark.java new file mode 100644 index 00000000000..1919dab923c --- /dev/null +++ b/dd-java-agent/agent-bootstrap/src/jmh/java/datadog/trace/bootstrap/instrumentation/dbm/SharedDBCommenterBenchmark.java @@ -0,0 +1,86 @@ +package datadog.trace.bootstrap.instrumentation.dbm; + +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.Fork; +import org.openjdk.jmh.annotations.Measurement; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.Threads; +import org.openjdk.jmh.annotations.Warmup; + +/** + * Benchmark for {@link SharedDBCommenter#containsTraceComment(String)} — the per-query check run + * during inject (via {@code hasDDComment}) to avoid double-commenting an already-tagged statement. + * + *

What we're measuring. {@code containsTraceComment} currently does {@code + * commentContent.contains(KEY + "=")} for nine keys. The keys are {@code static final} but assigned + * via {@code encode(...)}, so they are not compile-time constants — each {@code KEY + "="} + * is a fresh {@code StringBuilder} concat on every call. A non-matching comment runs all nine + * checks = nine throwaway Strings per call. The proposed fix precomputes nine {@code KEY_EQ} + * constants once. + * + *

How we make the win visible (our usual approach). Run at {@code @Threads(8)} so the + * allocation churn manifests as a throughput delta — GC is a shared-heap tax, so a + * single-threaded run (cheap TLAB bumps) hides it, while concurrent allocation across threads + * drives GC pauses that every thread pays. Read the ops/s delta as the headline win. Corroborate + * the mechanism with the GC profiler: {@code -prof gc} → {@code gc.alloc.rate.norm} (B/op) should + * drop by ~nine small Strings per call on the non-matching path. + * + *

Protocol. Run this on the current code (baseline), then after the {@code + * KEY_EQ}-constant fix, and compare. The input mix is mostly non-DD comments (the common case — + * they run all nine checks, the exact all-nine-concats path the fix removes); the DD comment + * short-circuits on the first check. + * + * 

+ *   # agent-bootstrap has no -Pjmh.includes wiring yet (a generalization is in flight), so for now
+ *   # either run the whole module (only a handful of benchmarks) ...
+ *   ./gradlew :dd-java-agent:agent-bootstrap:jmh
+ *   # ... or hack a temporary filter into agent-bootstrap/build.gradle: jmh { includes = ['SharedDBCommenter.*'] }
+ *   # add -prof gc (gc.alloc.rate.norm) to corroborate the allocation delta.
+ *
+ * + *

Results (JDK 17, MacBook M-series, {@code @Threads(8)}, {@code @Fork(5)}, {@code -prof + * gc}): + * + * 

+ *                    throughput            gc.alloc.rate.norm
+ *   before (concat)  33.5M ± 2.0M ops/s    156 B/op
+ *   after  (*_EQ)    62.1M ± 3.8M ops/s    ~0  B/op  (10^-5)
+ *
+ * + * Removing the per-call concatenation drops allocation to ~0 and lifts throughput ~1.9x at + * {@code @Threads(8)} — the allocation win surfacing as throughput, exactly as intended; {@code + * -prof gc} confirms the mechanism (156 -> 0 B/op). + */ +@Fork(5) +@Warmup(iterations = 2) +@Measurement(iterations = 5) +@Threads(8) +public class SharedDBCommenterBenchmark { + + // Inner comment content (the surrounding "/*" "*/" already stripped by extractCommentContent), + // as a realistic mix: most queries carry a non-DD comment (or none); some already have ours. + static final String[] COMMENT_CONTENTS = { + "app generated comment", // non-DD -> all 9 contains checks (9 concats) + "route='/api/v1/users',batch=true", // non-DD + "framework='hibernate',layer='orm'", // non-DD + "ddps='web',dddbs='orders',traceparent='00-abc-def-01'", // DD -> short-circuits on 1st check + }; + + /** Per-thread cursor so threads don't contend on a shared index under {@code @Threads(8)}. */ + @State(Scope.Thread) + public static class Cursor { + int index = 0; + + String next() { + int i = index; + index = (i + 1) % COMMENT_CONTENTS.length; + return COMMENT_CONTENTS[i]; + } + } + + @Benchmark + public boolean containsTraceComment(Cursor cursor) { + return SharedDBCommenter.containsTraceComment(cursor.next()); + } +} diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/dbm/SharedDBCommenter.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/dbm/SharedDBCommenter.java index 3dbf916362c..610ab9ca31f 100644 --- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/dbm/SharedDBCommenter.java +++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/dbm/SharedDBCommenter.java @@ -33,6 +33,19 @@ public class SharedDBCommenter { private static final String TRACEPARENT = encode("traceparent"); private static final String DD_SERVICE_HASH = encode("ddsh"); + // Pre-built "=" needles for containsTraceComment, computed once at class init. The keys + // are assigned via encode(...), so "KEY + =" is a runtime concat, not a compile-time constant; + // doing it per call allocated nine throwaway Strings on every non-matching check. + private static final String PARENT_SERVICE_EQ = PARENT_SERVICE + "="; + private static final String DATABASE_SERVICE_EQ = DATABASE_SERVICE + "="; + private static final String DD_HOSTNAME_EQ = DD_HOSTNAME + "="; + private static final String DD_DB_NAME_EQ = DD_DB_NAME + "="; + private static final String DD_PEER_SERVICE_EQ = DD_PEER_SERVICE + "="; + private static final String DD_ENV_EQ = DD_ENV + "="; + private static final String DD_VERSION_EQ = DD_VERSION + "="; + private static final String TRACEPARENT_EQ = TRACEPARENT + "="; + private static final String DD_SERVICE_HASH_EQ = DD_SERVICE_HASH + "="; + // Pre-encoded "key='encoded_value'" fragments for the invariant fields (the values // come from Config are effectively immutable post-init in production). // Note about the visibility: needs to be visible but can tolerate races (reason why it's not @@ -40,18 +53,19 @@ public class SharedDBCommenter { private static volatile boolean staticPrefixComputed = false; private static volatile String staticPrefix; - // Used by SQLCommenter and MongoCommentInjector to avoid duplicate comment injection - // Note: this should be "better" done and avoid this bunch of string contains/concatenation + // Used by SQLCommenter and MongoCommentInjector to avoid duplicate comment injection. + // Note: the contains-chain could still be done "better" (a single scan), but the per-call + // "KEY + =" concatenation -- the allocating part -- is now hoisted to the *_EQ constants above. public static boolean containsTraceComment(String commentContent) { - return commentContent.contains(PARENT_SERVICE + "=") - || commentContent.contains(DATABASE_SERVICE + "=") - || commentContent.contains(DD_HOSTNAME + "=") - || commentContent.contains(DD_DB_NAME + "=") - || commentContent.contains(DD_PEER_SERVICE + "=") - || commentContent.contains(DD_ENV + "=") - || commentContent.contains(DD_VERSION + "=") - || commentContent.contains(TRACEPARENT + "=") - || commentContent.contains(DD_SERVICE_HASH + "="); + return commentContent.contains(PARENT_SERVICE_EQ) + || commentContent.contains(DATABASE_SERVICE_EQ) + || commentContent.contains(DD_HOSTNAME_EQ) + || commentContent.contains(DD_DB_NAME_EQ) + || commentContent.contains(DD_PEER_SERVICE_EQ) + || commentContent.contains(DD_ENV_EQ) + || commentContent.contains(DD_VERSION_EQ) + || commentContent.contains(TRACEPARENT_EQ) + || commentContent.contains(DD_SERVICE_HASH_EQ); } // Build database comment content without comment delimiters such as /* */ From c5ef3ff2ad79606a9ddb0dc64a7ba8359d03b8c9 Mon Sep 17 00:00:00 2001 From: Douglas Q Hawkins Date: Mon, 29 Jun 2026 13:15:56 -0400 Subject: [PATCH 071/139] Add missing coverage tests for Matchers.AnyMatcher primitive overloads (#11780) Add missing coverage tests for Matchers.AnyMatcher primitive overloads The existing parameterized tests always dispatch through matches(Object), leaving the 9 primitive overloads uncovered. Co-Authored-By: Claude Sonnet 4.6 Split AnyMatcher overload tests into individual test cases Co-Authored-By: Claude Sonnet 4.6 Merge branch 'master' into dougqh/matchers-anymatcher-coverage-fix Co-authored-by: devflow.devflow-routing-intake --- .../datadog/trace/core/util/MatchersTest.java | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/dd-trace-core/src/test/java/datadog/trace/core/util/MatchersTest.java b/dd-trace-core/src/test/java/datadog/trace/core/util/MatchersTest.java index 3eaea551323..e7a0c96bc35 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/util/MatchersTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/util/MatchersTest.java @@ -8,6 +8,7 @@ import java.math.BigDecimal; import java.math.BigInteger; import java.util.stream.Stream; +import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; @@ -113,4 +114,59 @@ void aPatternMatcherTest(String scenario, String pattern, Object value, boolean assertEquals(matches, matcher.matches(value)); } + + @Test + void anyMatcherMatchesString() { + assertTrue(Matchers.ANY.matches("hello")); + } + + @Test + void anyMatcherMatchesCharSequence() { + assertTrue(Matchers.ANY.matches((CharSequence) new StringBuilder("world"))); + } + + @Test + void anyMatcherMatchesBoolean() { + assertTrue(Matchers.ANY.matches(true)); + } + + @Test + void anyMatcherMatchesByte() { + assertTrue(Matchers.ANY.matches((byte) 1)); + } + + @Test + void anyMatcherMatchesShort() { + assertTrue(Matchers.ANY.matches((short) 2)); + } + + @Test + void anyMatcherMatchesInt() { + assertTrue(Matchers.ANY.matches(42)); + } + + @Test + void anyMatcherMatchesLong() { + assertTrue(Matchers.ANY.matches(100L)); + } + + @Test + void anyMatcherMatchesFloat() { + assertTrue(Matchers.ANY.matches(1.5f)); + } + + @Test + void anyMatcherMatchesDouble() { + assertTrue(Matchers.ANY.matches(3.14)); + } + + @Test + void anyMatcherMatchesBigInteger() { + assertTrue(Matchers.ANY.matches(new BigInteger("123"))); + } + + @Test + void anyMatcherMatchesBigDecimal() { + assertTrue(Matchers.ANY.matches(new BigDecimal("1.23"))); + } } From 810268daf10ed6e20193a7f6bc7cd45a65085abd Mon Sep 17 00:00:00 2001 From: Douglas Q Hawkins Date: Mon, 29 Jun 2026 13:25:24 -0400 Subject: [PATCH 072/139] Add missing coverage tests for Hashtable.D2 (#11779) Add missing coverage tests for Hashtable.D2 clear() had no test; remove() had no test for the not-found (null return) case. Co-Authored-By: Claude Sonnet 4.6 Merge branch 'master' into dougqh/hashtable-d2-coverage-fix Co-authored-by: devflow.devflow-routing-intake --- .../datadog/trace/util/HashtableD2Test.java | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/internal-api/src/test/java/datadog/trace/util/HashtableD2Test.java b/internal-api/src/test/java/datadog/trace/util/HashtableD2Test.java index edcb0ad9f74..8605af1b33f 100644 --- a/internal-api/src/test/java/datadog/trace/util/HashtableD2Test.java +++ b/internal-api/src/test/java/datadog/trace/util/HashtableD2Test.java @@ -118,6 +118,30 @@ void getOrCreateOnHitSkipsCreator() { assertEquals(0, createCount[0]); } + @Test + void removeReturnsNullForMissingKey() { + Hashtable.D2 table = new Hashtable.D2<>(8); + table.insert(new PairEntry("a", 1, 100)); + + assertNull(table.remove("a", 2)); + assertNull(table.remove("z", 1)); + assertEquals(1, table.size()); + } + + @Test + void clearEmptiesTable() { + Hashtable.D2 table = new Hashtable.D2<>(8); + table.insert(new PairEntry("a", 1, 100)); + table.insert(new PairEntry("b", 2, 200)); + assertEquals(2, table.size()); + + table.clear(); + + assertEquals(0, table.size()); + assertNull(table.get("a", 1)); + assertNull(table.get("b", 2)); + } + private static final class PairEntry extends Hashtable.D2.Entry { int value; From 6fd35b5a26077449e2217890cdd9d4be1c09eede Mon Sep 17 00:00:00 2001 From: Douglas Q Hawkins Date: Mon, 29 Jun 2026 13:26:07 -0400 Subject: [PATCH 073/139] Add missing coverage tests for OptimizedTagMap and EntryReadingHelper (#11778) Add missing coverage tests for OptimizedTagMap and EntryReadingHelper Tests for stream(), compute(), computeIfAbsent(), and computeIfPresent() on OptimizedTagMap were absent; EntryReadingHelper had no test coverage at all since LegacyTagMap (its sole caller) was removed. Co-Authored-By: Claude Sonnet 4.6 Merge branch 'master' into dougqh/tagmap-coverage-fix Co-authored-by: devflow.devflow-routing-intake --- .../trace/api/EntryReadingHelperTest.java | 139 ++++++++++++++++++ .../java/datadog/trace/api/TagMapTest.java | 50 +++++++ 2 files changed, 189 insertions(+) create mode 100644 internal-api/src/test/java/datadog/trace/api/EntryReadingHelperTest.java diff --git a/internal-api/src/test/java/datadog/trace/api/EntryReadingHelperTest.java b/internal-api/src/test/java/datadog/trace/api/EntryReadingHelperTest.java new file mode 100644 index 00000000000..c47f15e1b3e --- /dev/null +++ b/internal-api/src/test/java/datadog/trace/api/EntryReadingHelperTest.java @@ -0,0 +1,139 @@ +package datadog.trace.api; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.AbstractMap; +import java.util.Map; +import org.junit.jupiter.api.Test; + +class EntryReadingHelperTest { + + @Test + void setTagValueExposesIntValue() { + EntryReadingHelper helper = new EntryReadingHelper(); + helper.set("my.tag", 42); + + assertEquals("my.tag", helper.tag()); + assertEquals(42, helper.intValue()); + assertEquals(42L, helper.longValue()); + assertEquals(TagMap.EntryReader.INT, helper.type()); + assertTrue(helper.isNumber()); + assertTrue(helper.isNumericPrimitive()); + assertFalse(helper.isObject()); + assertTrue(helper.is(TagMap.EntryReader.INT)); + } + + @Test + void setTagValueExposesLongValue() { + EntryReadingHelper helper = new EntryReadingHelper(); + helper.set("id", 123456789L); + + assertEquals(123456789L, helper.longValue()); + assertEquals(TagMap.EntryReader.LONG, helper.type()); + assertTrue(helper.isNumber()); + assertTrue(helper.isNumericPrimitive()); + } + + @Test + void setTagValueExposesBooleanValue() { + EntryReadingHelper helper = new EntryReadingHelper(); + helper.set("flag", true); + + assertTrue(helper.booleanValue()); + assertEquals(TagMap.EntryReader.BOOLEAN, helper.type()); + assertFalse(helper.isNumber()); + assertFalse(helper.isObject()); + } + + @Test + void setTagValueExposesFloatValue() { + EntryReadingHelper helper = new EntryReadingHelper(); + helper.set("rate", 1.5f); + + assertEquals(1.5f, helper.floatValue()); + assertEquals(TagMap.EntryReader.FLOAT, helper.type()); + assertTrue(helper.isNumericPrimitive()); + } + + @Test + void setTagValueExposesDoubleValue() { + EntryReadingHelper helper = new EntryReadingHelper(); + helper.set("pi", 3.14); + + assertEquals(3.14, helper.doubleValue()); + assertEquals(TagMap.EntryReader.DOUBLE, helper.type()); + assertTrue(helper.isNumericPrimitive()); + } + + @Test + void setTagValueExposesStringAsObject() { + EntryReadingHelper helper = new EntryReadingHelper(); + helper.set("name", "foo"); + + assertEquals("foo", helper.stringValue()); + assertEquals("foo", helper.objectValue()); + assertEquals(TagMap.EntryReader.OBJECT, helper.type()); + assertTrue(helper.isObject()); + assertFalse(helper.isNumber()); + assertFalse(helper.isNumericPrimitive()); + } + + @Test + void setTagValueCreatesEntry() { + EntryReadingHelper helper = new EntryReadingHelper(); + helper.set("tag", "value"); + + TagMap.Entry entry = helper.entry(); + assertNotNull(entry); + assertEquals("tag", entry.tag()); + assertEquals("value", entry.objectValue()); + } + + @Test + void mapEntryFallsBackToNewEntryWhenSetWithTagValue() { + EntryReadingHelper helper = new EntryReadingHelper(); + helper.set("tag", "value"); + + Map.Entry mapEntry = helper.mapEntry(); + assertEquals("tag", mapEntry.getKey()); + assertEquals("value", mapEntry.getValue()); + } + + @Test + void setMapEntryExposesReadMethods() { + EntryReadingHelper helper = new EntryReadingHelper(); + Map.Entry original = new AbstractMap.SimpleEntry<>("key", "hello"); + helper.set(original); + + assertEquals("key", helper.tag()); + assertEquals("hello", helper.stringValue()); + assertEquals("hello", helper.objectValue()); + assertEquals(TagMap.EntryReader.OBJECT, helper.type()); + assertTrue(helper.isObject()); + assertFalse(helper.isNumber()); + } + + @Test + void mapEntryReturnsSameInstanceWhenSetWithMapEntry() { + EntryReadingHelper helper = new EntryReadingHelper(); + Map.Entry original = new AbstractMap.SimpleEntry<>("key", "value"); + helper.set(original); + + assertSame(original, helper.mapEntry()); + } + + @Test + void setMapEntryCreatesEntry() { + EntryReadingHelper helper = new EntryReadingHelper(); + helper.set(new AbstractMap.SimpleEntry<>("k", 99)); + + TagMap.Entry entry = helper.entry(); + assertNotNull(entry); + assertEquals("k", entry.tag()); + assertEquals(99, entry.objectValue()); + } +} diff --git a/internal-api/src/test/java/datadog/trace/api/TagMapTest.java b/internal-api/src/test/java/datadog/trace/api/TagMapTest.java index 84c9e401f43..0227a5b3886 100644 --- a/internal-api/src/test/java/datadog/trace/api/TagMapTest.java +++ b/internal-api/src/test/java/datadog/trace/api/TagMapTest.java @@ -15,6 +15,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ThreadLocalRandom; +import java.util.stream.Collectors; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; @@ -891,6 +892,55 @@ public void _toString() { } } + @Test + public void stream() { + int size = randomSize(); + TagMap map = createTagMap(size); + + Set keys = map.stream().map(TagMap.EntryReader::tag).collect(Collectors.toSet()); + + assertEquals(size, keys.size()); + for (int i = 0; i < size; ++i) { + assertTrue(keys.contains(key(i))); + } + } + + @Test + public void compute() { + TagMap map = TagMap.create(); + map.set("key", "original"); + + map.compute("key", (k, v) -> "updated"); + assertEquals("updated", map.get("key")); + + map.compute("new-key", (k, v) -> "created"); + assertEquals("created", map.get("new-key")); + } + + @Test + public void computeIfAbsent() { + TagMap map = TagMap.create(); + map.set("key", "existing"); + + map.computeIfAbsent("key", k -> "ignored"); + assertEquals("existing", map.get("key")); + + map.computeIfAbsent("new-key", k -> "added"); + assertEquals("added", map.get("new-key")); + } + + @Test + public void computeIfPresent() { + TagMap map = TagMap.create(); + map.set("key", "original"); + + map.computeIfPresent("key", (k, v) -> "updated"); + assertEquals("updated", map.get("key")); + + map.computeIfPresent("missing", (k, v) -> "never"); + assertNull(map.get("missing")); + } + @ParameterizedTest @ValueSource(ints = {0, 5, 25, 125}) public void _toInternalString(int size) { From 4399027ed949b2f8a6fd32f7e1a8fea045ba34a8 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Mon, 29 Jun 2026 13:35:35 -0400 Subject: [PATCH 074/139] Cover disabled ratelimited logging. (#11776) Cover disabled ratelimited logging. Co-authored-by: alexey.kuznetsov --- .../java/datadog/logging/RateLimitedLoggerTest.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/utils/logging-utils/src/test/java/datadog/logging/RateLimitedLoggerTest.java b/utils/logging-utils/src/test/java/datadog/logging/RateLimitedLoggerTest.java index 0875bff1226..11519ad2d9f 100644 --- a/utils/logging-utils/src/test/java/datadog/logging/RateLimitedLoggerTest.java +++ b/utils/logging-utils/src/test/java/datadog/logging/RateLimitedLoggerTest.java @@ -9,6 +9,7 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -80,6 +81,16 @@ void warningOnce() { (Object[]) any()); } + @Test + void warningDisabled() { + when(this.log.isWarnEnabled()).thenReturn(false); + when(this.log.isDebugEnabled()).thenReturn(false); + RatelimitedLogger rateLimitedLog = new RatelimitedLogger(this.log, 1, MINUTES, this.timeSource); + + assertFalse(rateLimitedLog.warn("test {} {}", "message", EXCEPTION)); + verify(this.log, never()).warn(nullable(Marker.class), any(String.class), (Object[]) any()); + } + @Test void warningOnceNegativeTime() { this.timeSource.set(Long.MIN_VALUE); From a8e41c52b11245e1cac3795098797ff5bf74dc23 Mon Sep 17 00:00:00 2001 From: Stuart McCulloch Date: Mon, 29 Jun 2026 18:49:51 +0100 Subject: [PATCH 075/139] Test explicit histogram boundaries and per-thread recordings (#11783) Test explicit histogram boundaries Test per-thread recordings Fix stale package names Co-authored-by: devflow.devflow-routing-intake --- products/metrics/metrics-lib/build.gradle.kts | 15 +-- .../metrics/impl/DDSketchHistogramsTest.java | 91 +++++++++++++++++++ .../impl/ThreadLocalRecordingTest.java | 86 ++++++++++++++++++ 3 files changed, 181 insertions(+), 11 deletions(-) create mode 100644 products/metrics/metrics-lib/src/test/java/datadog/metrics/impl/DDSketchHistogramsTest.java create mode 100644 products/metrics/metrics-lib/src/test/java/datadog/metrics/impl/ThreadLocalRecordingTest.java diff --git a/products/metrics/metrics-lib/build.gradle.kts b/products/metrics/metrics-lib/build.gradle.kts index ae38432669a..4f58777ff02 100644 --- a/products/metrics/metrics-lib/build.gradle.kts +++ b/products/metrics/metrics-lib/build.gradle.kts @@ -36,15 +36,8 @@ tasks.named("shadowJar") { extra["minimumBranchCoverage"] = 0.5 extra["minimumInstructionCoverage"] = 0.8 extra["excludedClassesCoverage"] = listOf( - "datadog.communication.monitor.DDAgentStatsDConnection", - "datadog.communication.monitor.DDAgentStatsDConnection.*", - "datadog.communication.monitor.LoggingStatsDClient", + "datadog.metrics.impl.statsd.DDAgentStatsDClientManager", + "datadog.metrics.impl.statsd.DDAgentStatsDConnection", + "datadog.metrics.impl.statsd.DDAgentStatsDConnection.*", + "datadog.metrics.impl.statsd.LoggingStatsDClient", ) -// val excludedClassesBranchCoverage by extra( -// listOf( -// ) -// ) -// val excludedClassesInstructionCoverage by extra( -// listOf( -// ) -// ) diff --git a/products/metrics/metrics-lib/src/test/java/datadog/metrics/impl/DDSketchHistogramsTest.java b/products/metrics/metrics-lib/src/test/java/datadog/metrics/impl/DDSketchHistogramsTest.java new file mode 100644 index 00000000000..d5e87846495 --- /dev/null +++ b/products/metrics/metrics-lib/src/test/java/datadog/metrics/impl/DDSketchHistogramsTest.java @@ -0,0 +1,91 @@ +package datadog.metrics.impl; + +import static java.util.Arrays.asList; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + +import datadog.metrics.impl.DDSketchHistograms.ExplicitBoundaries; +import java.util.List; +import org.junit.jupiter.api.Test; + +class DDSketchHistogramsTest { + + // boundaries define 4 bins: + // bin 0: (-inf, 10] + // bin 1: (10, 20] + // bin 2: (20, 30] + // bin 3: (30, +inf) + private static final List BOUNDARIES = asList(10.0, 20.0, 30.0); + + @Test + void indexBelowFirstBoundary() { + ExplicitBoundaries eb = new ExplicitBoundaries(BOUNDARIES); + assertEquals(0, eb.index(5.0)); + } + + @Test + void indexOnBoundary() { + ExplicitBoundaries eb = new ExplicitBoundaries(BOUNDARIES); + assertEquals(0, eb.index(10.0)); + assertEquals(1, eb.index(20.0)); + assertEquals(2, eb.index(30.0)); + } + + @Test + void indexBetweenBoundaries() { + ExplicitBoundaries eb = new ExplicitBoundaries(BOUNDARIES); + assertEquals(1, eb.index(15.0)); + assertEquals(2, eb.index(25.0)); + } + + @Test + void indexAboveLastBoundary() { + ExplicitBoundaries eb = new ExplicitBoundaries(BOUNDARIES); + assertEquals(3, eb.index(35.0)); + } + + @Test + void lowerBoundOfFirstBinIsNegativeInfinity() { + ExplicitBoundaries eb = new ExplicitBoundaries(BOUNDARIES); + assertEquals(Double.NEGATIVE_INFINITY, eb.lowerBound(0)); + } + + @Test + void lowerBoundMapsToPreceeedingBoundary() { + ExplicitBoundaries eb = new ExplicitBoundaries(BOUNDARIES); + assertEquals(10.0, eb.lowerBound(1)); + assertEquals(20.0, eb.lowerBound(2)); + assertEquals(30.0, eb.lowerBound(3)); + } + + @Test + void upperBoundMapsToCorrespondingBoundary() { + ExplicitBoundaries eb = new ExplicitBoundaries(BOUNDARIES); + assertEquals(10.0, eb.upperBound(0)); + assertEquals(20.0, eb.upperBound(1)); + assertEquals(30.0, eb.upperBound(2)); + } + + @Test + void upperBoundOfLastBinIsPositiveInfinity() { + ExplicitBoundaries eb = new ExplicitBoundaries(BOUNDARIES); + assertEquals(Double.POSITIVE_INFINITY, eb.upperBound(3)); + } + + @Test + void extremeIndexableValues() { + ExplicitBoundaries eb = new ExplicitBoundaries(BOUNDARIES); + assertEquals(Double.NEGATIVE_INFINITY, eb.minIndexableValue()); + assertEquals(Double.POSITIVE_INFINITY, eb.maxIndexableValue()); + } + + @Test + void unsupportedOperationsThrow() { + ExplicitBoundaries eb = new ExplicitBoundaries(BOUNDARIES); + assertThrows(UnsupportedOperationException.class, () -> eb.value(0)); + assertThrows(UnsupportedOperationException.class, eb::relativeAccuracy); + assertThrows(UnsupportedOperationException.class, () -> eb.encode(null)); + assertThrows(UnsupportedOperationException.class, eb::serializedSize); + assertThrows(UnsupportedOperationException.class, () -> eb.serialize(null)); + } +} diff --git a/products/metrics/metrics-lib/src/test/java/datadog/metrics/impl/ThreadLocalRecordingTest.java b/products/metrics/metrics-lib/src/test/java/datadog/metrics/impl/ThreadLocalRecordingTest.java new file mode 100644 index 00000000000..f533355eb89 --- /dev/null +++ b/products/metrics/metrics-lib/src/test/java/datadog/metrics/impl/ThreadLocalRecordingTest.java @@ -0,0 +1,86 @@ +package datadog.metrics.impl; + +import static java.util.Arrays.asList; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import datadog.metrics.api.Recording; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.CountDownLatch; +import org.junit.jupiter.api.Test; + +class ThreadLocalRecordingTest { + + @Test + void delegatesPerThread() throws Exception { + Map> callsByThread = new ConcurrentHashMap<>(); + + ThreadLocal sink = + ThreadLocal.withInitial( + () -> { + List calls = new ArrayList<>(); + callsByThread.put(Thread.currentThread(), calls); + return recordCalls(calls); + }); + + Recording recording = new ThreadLocalRecording(sink); + + int threadCount = 4; + CountDownLatch ready = new CountDownLatch(threadCount); + CountDownLatch done = new CountDownLatch(threadCount); + Thread[] threads = new Thread[threadCount]; + + for (int i = 0; i < threadCount; i++) { + threads[i] = + new Thread( + () -> { + ready.countDown(); + try { + ready.await(); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + return; + } + recording.start(); + recording.reset(); + recording.stop(); + recording.flush(); + done.countDown(); + }); + threads[i].start(); + } + done.await(); + + assertEquals(threadCount, callsByThread.size(), "each thread should have its own Recording"); + for (List calls : callsByThread.values()) { + assertEquals(asList("start", "reset", "stop", "flush"), calls); + } + } + + private static Recording recordCalls(List calls) { + return new Recording() { + @Override + public Recording start() { + calls.add("start"); + return this; + } + + @Override + public void reset() { + calls.add("reset"); + } + + @Override + public void stop() { + calls.add("stop"); + } + + @Override + public void flush() { + calls.add("flush"); + } + }; + } +} From 9c178e492bbdb7eb01a5a542146134ca692e62eb Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Mon, 29 Jun 2026 13:56:43 -0400 Subject: [PATCH 076/139] Cover decoded trace sampling priority. (#11773) Cover decoded trace sampling priority. Co-authored-by: alexey.kuznetsov --- utils/test-agent-utils/decoder/build.gradle.kts | 2 +- .../java/datadog/trace/test/agent/decoder/DecoderTest.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/utils/test-agent-utils/decoder/build.gradle.kts b/utils/test-agent-utils/decoder/build.gradle.kts index be1d8f5df49..844786b398b 100644 --- a/utils/test-agent-utils/decoder/build.gradle.kts +++ b/utils/test-agent-utils/decoder/build.gradle.kts @@ -4,10 +4,10 @@ plugins { apply(from = "$rootDir/gradle/java.gradle") -extra["minimumInstructionCoverage"] = 0.8 extra["excludedClassesCoverage"] = listOf( "datadog.trace.test.agent.decoder.v04.raw.*", "datadog.trace.test.agent.decoder.v05.raw.*", + "datadog.trace.test.agent.decoder.v1.raw.*", ) dependencies { diff --git a/utils/test-agent-utils/decoder/src/test/java/datadog/trace/test/agent/decoder/DecoderTest.java b/utils/test-agent-utils/decoder/src/test/java/datadog/trace/test/agent/decoder/DecoderTest.java index ddcd4d38f9c..4acea005e87 100644 --- a/utils/test-agent-utils/decoder/src/test/java/datadog/trace/test/agent/decoder/DecoderTest.java +++ b/utils/test-agent-utils/decoder/src/test/java/datadog/trace/test/agent/decoder/DecoderTest.java @@ -4,6 +4,7 @@ import static java.util.Collections.singletonMap; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertIterableEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.File; @@ -24,6 +25,7 @@ public void decodeV05() throws Throwable { DecodedMessage message = Decoder.decodeV05(buffer); List traces = message.getTraces(); assertEquals(1, traces.size()); + assertNull(traces.get(0).getSamplingPriority()); List spans = traces.get(0).getSpans(); assertEquals(2, spans.size()); List sorted = Decoder.sortByStart(spans); @@ -59,6 +61,7 @@ public void decodeV04() throws Throwable { DecodedMessage message = Decoder.decodeV04(buffer); List traces = message.getTraces(); assertEquals(1, traces.size()); + assertNull(traces.get(0).getSamplingPriority()); List spans = traces.get(0).getSpans(); assertEquals(2, spans.size()); List sorted = Decoder.sortByStart(spans); @@ -96,6 +99,7 @@ public void decodeV1() throws Throwable { DecodedMessage message = Decoder.decodeV1(buffer); List traces = message.getTraces(); assertEquals(1, traces.size()); + assertEquals(1, traces.get(0).getSamplingPriority()); List spans = traces.get(0).getSpans(); assertEquals(2, spans.size()); List sorted = Decoder.sortByStart(spans); From 8903488d064f33ff640ee1e4d2824f1922f249c0 Mon Sep 17 00:00:00 2001 From: Leo Romanovsky Date: Mon, 29 Jun 2026 13:57:42 -0400 Subject: [PATCH 077/139] Add FFE flag map adapter coverage (#11784) Add FFE flag map adapter coverage Co-authored-by: devflow.devflow-routing-intake --- .../RemoteConfigServiceImplTest.java | 87 +++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/RemoteConfigServiceImplTest.java b/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/RemoteConfigServiceImplTest.java index 4b8eb568cb6..d4ff05c75b1 100644 --- a/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/RemoteConfigServiceImplTest.java +++ b/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/RemoteConfigServiceImplTest.java @@ -1,6 +1,9 @@ package com.datadog.featureflag; import static java.nio.charset.StandardCharsets.UTF_8; +import static java.util.Collections.emptyMap; +import static java.util.Collections.emptySet; +import static java.util.Collections.singleton; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -13,8 +16,11 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import com.squareup.moshi.JsonAdapter; import com.squareup.moshi.JsonReader; import com.squareup.moshi.JsonWriter; +import com.squareup.moshi.Moshi; +import com.squareup.moshi.Types; import datadog.communication.ddagent.SharedCommunicationObjects; import datadog.remoteconfig.Capabilities; import datadog.remoteconfig.ConfigurationDeserializer; @@ -23,9 +29,13 @@ import datadog.remoteconfig.Product; import datadog.trace.api.Config; import datadog.trace.api.featureflag.FeatureFlaggingGateway; +import datadog.trace.api.featureflag.ufc.v1.Flag; import datadog.trace.api.featureflag.ufc.v1.ServerConfiguration; +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; import java.time.Instant; import java.util.Date; +import java.util.Map; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -173,6 +183,79 @@ void skipsUnknownOperatorFlagAndKeepsValidFlag() throws Exception { assertEquals("expected", config.flags.get("valid-flag").variations.get("expected").value); } + @Test + void flagMapAdapterFactoryOnlyCreatesFlagMapAdapterForFlagMapType() { + final Moshi moshi = moshi(); + final Type flagsType = Types.newParameterizedType(Map.class, String.class, Flag.class); + + final JsonAdapter adapter = + RemoteConfigServiceImpl.FlagMapAdapter.FACTORY.create(flagsType, emptySet(), moshi); + + assertNotNull(adapter); + assertTrue(adapter instanceof RemoteConfigServiceImpl.FlagMapAdapter); + assertNull( + RemoteConfigServiceImpl.FlagMapAdapter.FACTORY.create(String.class, emptySet(), moshi)); + assertNull( + RemoteConfigServiceImpl.FlagMapAdapter.FACTORY.create( + flagsType, singleton(mock(Annotation.class)), moshi)); + } + + @Test + void allowsNullFlagMap() throws Exception { + final ServerConfiguration config = + deserialize( + "{" + + "\"createdAt\":\"2024-04-17T19:40:53.716Z\"," + + "\"format\":\"SERVER\"," + + "\"environment\":{\"name\":\"Test\"}," + + "\"flags\":null" + + "}"); + + assertNotNull(config); + assertNull(config.flags); + } + + @Test + void skipsNullFlagAndKeepsValidFlag() throws Exception { + final ServerConfiguration config = + deserialize( + "{" + + "\"createdAt\":\"2024-04-17T19:40:53.716Z\"," + + "\"format\":\"SERVER\"," + + "\"environment\":{\"name\":\"Test\"}," + + "\"flags\":{" + + "\"null-flag\":null," + + "\"valid-flag\":{" + + "\"key\":\"valid-flag\"," + + "\"enabled\":true," + + "\"variationType\":\"STRING\"," + + "\"variations\":{\"expected\":{\"key\":\"expected\",\"value\":\"expected\"}}," + + "\"allocations\":[{" + + "\"key\":\"default-allocation\"," + + "\"rules\":[]," + + "\"splits\":[{\"variationKey\":\"expected\",\"shards\":[]}]," + + "\"doLog\":true" + + "}]" + + "}" + + "}" + + "}"); + + assertNotNull(config); + assertFalse(config.flags.containsKey("null-flag")); + assertTrue(config.flags.containsKey("valid-flag")); + assertEquals("expected", config.flags.get("valid-flag").variations.get("expected").value); + } + + @Test + void flagMapAdapterIsReadOnly() { + final RemoteConfigServiceImpl.FlagMapAdapter adapter = + new RemoteConfigServiceImpl.FlagMapAdapter(moshi().adapter(Flag.class)); + + assertThrows( + UnsupportedOperationException.class, + () -> adapter.toJson(mock(JsonWriter.class), emptyMap())); + } + @TableTest({ "scenario | value | expectedEpochMilli", "utc second | '2023-01-01T00:00:00Z' | 1672531200000 ", @@ -227,6 +310,10 @@ private static ServerConfiguration deserialize(final String json) throws Excepti json.getBytes(UTF_8)); } + private static Moshi moshi() { + return new Moshi.Builder().add(Date.class, new RemoteConfigServiceImpl.DateAdapter()).build(); + } + private static String emptyConfig() { return "{" + "\"createdAt\":\"2024-04-17T19:40:53.716Z\"," From 9f98ca9fac131d056dd025313b4acf9c3223528d Mon Sep 17 00:00:00 2001 From: "dd-octo-sts[bot]" <200755185+dd-octo-sts[bot]@users.noreply.github.com> Date: Mon, 29 Jun 2026 20:01:34 +0000 Subject: [PATCH 078/139] Update instrumentation Gradle dependencies (#11767) chore: Update instrumentation Gradle dependencies Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Rolled back armeria from `1.40.0` to `1.39.1` to pass the build on GitLab. Rolled back latestDep for: - `undertow-2.0` to `2.2.39.Final` - `undertow-2.2` to `2.3.24.Final to pass the build on GitLab. Force baseline Guava tests to use 16.0. Co-authored-by: AlexeyKuznetsov-DD --- .../aerospike-4.0/gradle.lockfile | 8 +- .../akka/akka-actor-2.5/gradle.lockfile | 8 +- .../akka-http/akka-http-10.0/gradle.lockfile | 12 +- .../akka-http-10.2-iast/gradle.lockfile | 8 +- .../akka-http/akka-http-10.6/gradle.lockfile | 8 +- .../gradle.lockfile | 8 +- .../apache-httpclient-4.0/gradle.lockfile | 8 +- .../apache-httpclient-5.0/gradle.lockfile | 8 +- .../apache-httpcore-4.0/gradle.lockfile | 8 +- .../apache-httpcore-5.0/gradle.lockfile | 10 +- .../armeria/armeria-grpc-0.84/gradle.lockfile | 17 +-- .../armeria-jetty-1.24/gradle.lockfile | 9 +- .../avro-1.11.3/gradle.lockfile | 21 ++-- .../aws-java/aws-java-common/gradle.lockfile | 8 +- .../aws-java-dynamodb-2.0/gradle.lockfile | 64 +++++----- .../aws-java-eventbridge-2.0/gradle.lockfile | 64 +++++----- .../gradle.lockfile | 8 +- .../aws-java/aws-java-s3-2.0/gradle.lockfile | 70 ++++++----- .../aws-java-sdk-1.11/gradle.lockfile | 8 +- .../aws-java/aws-java-sdk-2.2/gradle.lockfile | 74 +++++------ .../aws-java/aws-java-sfn-2.0/gradle.lockfile | 64 +++++----- .../aws-java/aws-java-sns-1.0/gradle.lockfile | 8 +- .../aws-java/aws-java-sns-2.0/gradle.lockfile | 64 +++++----- .../aws-java/aws-java-sqs-1.0/gradle.lockfile | 8 +- .../aws-java/aws-java-sqs-2.0/gradle.lockfile | 8 +- .../instrumentation/axis2-1.3/gradle.lockfile | 8 +- .../axway-api-7.5/gradle.lockfile | 8 +- .../azure-functions-1.2.2/gradle.lockfile | 8 +- .../caffeine-1.0/gradle.lockfile | 8 +- .../instrumentation/cdi-1.2/gradle.lockfile | 9 +- .../instrumentation/cics-9.1/gradle.lockfile | 8 +- .../commons-codec-1.1/gradle.lockfile | 8 +- .../commons-fileupload-1.5/gradle.lockfile | 8 +- .../commons-httpclient-2.0/gradle.lockfile | 8 +- .../commons-lang-2.1/gradle.lockfile | 8 +- .../commons-lang-3.5/gradle.lockfile | 8 +- .../commons-text-1.0/gradle.lockfile | 8 +- .../gradle.lockfile | 19 +-- .../couchbase/couchbase-2.0/gradle.lockfile | 8 +- .../couchbase/couchbase-2.6/gradle.lockfile | 8 +- .../couchbase/couchbase-3.1/gradle.lockfile | 8 +- .../couchbase/couchbase-3.2/gradle.lockfile | 9 +- .../cucumber-5.4/gradle.lockfile | 26 ++-- .../instrumentation/cxf-2.1/gradle.lockfile | 9 +- .../asm/iast-instrumenter/gradle.lockfile | 8 +- .../span-origin/gradle.lockfile | 8 +- .../gradle.lockfile | 8 +- .../exception-profiling/gradle.lockfile | 8 +- .../tracing/trace-annotation/gradle.lockfile | 8 +- .../datanucleus-4.0.5/gradle.lockfile | 8 +- .../datastax-cassandra-3.8/gradle.lockfile | 9 +- .../datastax-cassandra-4.0/gradle.lockfile | 8 +- .../drools/drools-6.0/gradle.lockfile | 8 +- .../dropwizard-views-0.7/gradle.lockfile | 9 +- .../elasticsearch-common/gradle.lockfile | 8 +- .../elasticsearch-rest-5.0/gradle.lockfile | 8 +- .../elasticsearch-rest-6.4/gradle.lockfile | 8 +- .../elasticsearch-rest-7.0/gradle.lockfile | 8 +- .../gradle.lockfile | 9 +- .../gradle.lockfile | 8 +- .../gradle.lockfile | 8 +- .../gradle.lockfile | 8 +- .../gradle.lockfile | 8 +- .../gradle.lockfile | 8 +- .../finatra-2.9/gradle.lockfile | 16 +-- .../freemarker-2.3.24/gradle.lockfile | 8 +- .../freemarker-2.3.9/gradle.lockfile | 8 +- .../instrumentation/gax-1.4/gradle.lockfile | 13 +- .../google-http-client-1.19/gradle.lockfile | 13 +- .../google-pubsub-1.116/gradle.lockfile | 17 +-- .../graal-native-image-20.0/gradle.lockfile | 8 +- .../instrumentation/graal/gradle.lockfile | 8 +- .../gradle-testing-5.1/gradle.lockfile | 8 +- .../gradle/gradle-3.0/gradle.lockfile | 8 +- .../gradle/gradle-8.3/gradle.lockfile | 8 +- .../graphql-java-14.0/gradle.lockfile | 8 +- .../graphql-java-20.0/gradle.lockfile | 8 +- .../graphql-java-common/gradle.lockfile | 8 +- .../grizzly-client-1.9/gradle.lockfile | 10 +- .../grizzly-http-2.3.20/gradle.lockfile | 8 +- .../instrumentation/grpc-1.5/gradle.lockfile | 40 +++--- .../instrumentation/gson-1.6/gradle.lockfile | 8 +- .../instrumentation/guava-10.0/build.gradle | 7 ++ .../hazelcast/hazelcast-3.6/gradle.lockfile | 8 +- .../hazelcast/hazelcast-3.9/gradle.lockfile | 8 +- .../hazelcast/hazelcast-4.0/gradle.lockfile | 8 +- .../hibernate-common/gradle.lockfile | 8 +- .../hibernate-core-3.3/gradle.lockfile | 8 +- .../hibernate-core-4.0/gradle.lockfile | 8 +- .../hibernate-core-4.3/gradle.lockfile | 8 +- .../hystrix-1.4/gradle.lockfile | 8 +- .../ignite-2.0/gradle.lockfile | 8 +- .../jackson-core-1.9.13/gradle.lockfile | 8 +- .../jackson-core-2.0/gradle.lockfile | 8 +- .../jackson-core-2.12/gradle.lockfile | 8 +- .../jackson-core-2.16/gradle.lockfile | 8 +- .../jackson-core-2.6/gradle.lockfile | 8 +- .../jackson-core-2.8/gradle.lockfile | 8 +- .../jackson-core-common/gradle.lockfile | 8 +- .../jacoco-0.8.9/gradle.lockfile | 8 +- .../java-concurrent-21.0/gradle.lockfile | 8 +- .../java-concurrent-25.0/gradle.lockfile | 8 +- .../java/java-io-1.8/gradle.lockfile | 8 +- .../java-lang/java-lang-1.8/gradle.lockfile | 8 +- .../java-lang/java-lang-11.0/gradle.lockfile | 8 +- .../java-lang/java-lang-15.0/gradle.lockfile | 8 +- .../java-lang/java-lang-17.0/gradle.lockfile | 8 +- .../java-lang/java-lang-21.0/gradle.lockfile | 8 +- .../java-lang/java-lang-22.0/gradle.lockfile | 8 +- .../java-lang/java-lang-9.0/gradle.lockfile | 8 +- .../gradle.lockfile | 8 +- .../java-net/java-net-1.8/gradle.lockfile | 8 +- .../java-net/java-net-11.0/gradle.lockfile | 8 +- .../java/java-nio-1.8/gradle.lockfile | 8 +- .../java/java-rmi-1.1/gradle.lockfile | 8 +- .../java/java-security-1.8/gradle.lockfile | 8 +- .../java/java-util-1.8/gradle.lockfile | 8 +- .../javax-naming-1.0/gradle.lockfile | 8 +- .../javax-xml-1.4/gradle.lockfile | 8 +- .../jboss-logmanager-1.1/gradle.lockfile | 8 +- .../jboss/jboss-modules-1.3/gradle.lockfile | 8 +- .../instrumentation/jdbc/gradle.lockfile | 8 +- .../jdbc/scalikejdbc-3.5/gradle.lockfile | 8 +- .../jedis/jedis-1.4/gradle.lockfile | 8 +- .../jedis/jedis-3.0/gradle.lockfile | 8 +- .../jedis/jedis-4.0/gradle.lockfile | 8 +- .../jersey/jersey-2.0/gradle.lockfile | 8 +- .../jersey/jersey-client-2.0/gradle.lockfile | 8 +- .../jersey/jersey-filter-2.0/gradle.lockfile | 8 +- .../jetty-appsec-11.0/gradle.lockfile | 8 +- .../jetty-appsec-7.0/gradle.lockfile | 8 +- .../jetty-appsec-8.1.3/gradle.lockfile | 8 +- .../jetty-appsec-9.2/gradle.lockfile | 8 +- .../jetty-appsec-9.3/gradle.lockfile | 8 +- .../jetty-appsec-9.4/gradle.lockfile | 8 +- .../jetty-client-10.0/gradle.lockfile | 8 +- .../jetty-client-12.0/gradle.lockfile | 8 +- .../jetty-client-9.1/gradle.lockfile | 8 +- .../jetty-client-common/gradle.lockfile | 8 +- .../jetty/jetty-common/gradle.lockfile | 8 +- .../jetty-server-10.0/gradle.lockfile | 8 +- .../jetty-server-11.0/gradle.lockfile | 8 +- .../jetty-server-12.0/gradle.lockfile | 8 +- .../jetty-server-7.0/gradle.lockfile | 8 +- .../jetty-server-7.6/gradle.lockfile | 8 +- .../jetty-server-9.0.4/gradle.lockfile | 8 +- .../jetty-server-9.0/gradle.lockfile | 8 +- .../jetty-server-9.3/gradle.lockfile | 8 +- .../jetty-server-9.4.21/gradle.lockfile | 8 +- .../jetty/jetty-util-9.4.31/gradle.lockfile | 8 +- .../jms/jakarta-jms-3.0/gradle.lockfile | 8 +- .../jms/javax-jms-1.1/gradle.lockfile | 8 +- .../jose-jwt-4.0/gradle.lockfile | 8 +- .../instrumentation/jsp-2.3/gradle.lockfile | 8 +- .../junit-4-cucumber-5.4/gradle.lockfile | 26 ++-- .../junit-4-munit-0.7.28/gradle.lockfile | 8 +- .../junit/junit-4/junit-4.10/gradle.lockfile | 8 +- .../junit/junit-4/junit-4.13/gradle.lockfile | 8 +- .../junit-5-cucumber-5.4/gradle.lockfile | 26 ++-- .../junit-5/junit-5-spock-2.0/gradle.lockfile | 8 +- .../kafka/kafka-common/gradle.lockfile | 8 +- .../kafka/kafka-connect-0.11/gradle.lockfile | 9 +- .../kafka/kafka-streams-0.11/gradle.lockfile | 8 +- .../kafka/kafka-streams-1.0/gradle.lockfile | 8 +- .../karate-1.0/gradle.lockfile | 8 +- .../kotlin-coroutines-1.3/gradle.lockfile | 8 +- .../lettuce/lettuce-4.0/gradle.lockfile | 10 +- .../lettuce/lettuce-5.0/gradle.lockfile | 8 +- .../liberty/liberty-20.0/gradle.lockfile | 8 +- .../liberty/liberty-23.0/gradle.lockfile | 8 +- .../log4j/log4j-1.2.4/gradle.lockfile | 8 +- .../log4j/log4j-2.0/gradle.lockfile | 8 +- .../log4j/log4j-2.7/gradle.lockfile | 8 +- .../logback-1.0/gradle.lockfile | 8 +- .../mail/jakarta-mail-2.0.1/gradle.lockfile | 8 +- .../mail/javax-mail-1.4.4/gradle.lockfile | 8 +- .../maven/maven-3.2.1/gradle.lockfile | 13 +- .../maven/maven-surefire-3.0/gradle.lockfile | 8 +- .../gradle.lockfile | 8 +- .../gradle.lockfile | 8 +- .../gradle.lockfile | 8 +- .../mongo/mongo-common/gradle.lockfile | 8 +- .../mongo-driver-3.1/gradle.lockfile | 8 +- .../mongo-driver-3.4/gradle.lockfile | 8 +- .../mongo-driver-3.6/gradle.lockfile | 8 +- .../mongo-driver-3.8/gradle.lockfile | 8 +- .../mongo-driver-4.0/gradle.lockfile | 8 +- .../mongo-test-async-3.3/gradle.lockfile | 8 +- .../mongo-test-core-3.1/gradle.lockfile | 8 +- .../mongo-test-core-3.7/gradle.lockfile | 8 +- .../mongo-test-sync-3.10/gradle.lockfile | 8 +- .../instrumentation/mule-4.5/gradle.lockfile | 34 ++--- .../netty/netty-3.8/gradle.lockfile | 8 +- .../netty/netty-4.0/gradle.lockfile | 8 +- .../netty/netty-4.1/gradle.lockfile | 8 +- .../netty/netty-buffer-4.0/gradle.lockfile | 8 +- .../netty/netty-common/gradle.lockfile | 8 +- .../netty-concurrent-4.0/gradle.lockfile | 8 +- .../netty/netty-promise-4.0/gradle.lockfile | 8 +- .../ognl-appsec-3.3.2/gradle.lockfile | 8 +- .../okhttp/okhttp-2.2/gradle.lockfile | 8 +- .../okhttp/okhttp-3.0/gradle.lockfile | 8 +- .../openai-java-3.0/gradle.lockfile | 10 +- .../opensearch-common/gradle.lockfile | 8 +- .../opensearch-rest-1.0/gradle.lockfile | 8 +- .../opensearch-transport-1.0/gradle.lockfile | 8 +- .../opentelemetry/gradle.lockfile | 8 +- .../opentelemetry-0.3/gradle.lockfile | 8 +- .../opentelemetry-1.27/gradle.lockfile | 8 +- .../opentelemetry-1.4/gradle.lockfile | 8 +- .../opentelemetry-1.47/gradle.lockfile | 8 +- .../gradle.lockfile | 8 +- .../gradle.lockfile | 8 +- .../opentracing-0.31/gradle.lockfile | 8 +- .../opentracing-0.32/gradle.lockfile | 8 +- .../opentracing-common/gradle.lockfile | 8 +- .../org-json-20230227/gradle.lockfile | 8 +- .../instrumentation/osgi-4.3/gradle.lockfile | 8 +- .../owasp-esapi-2.1/gradle.lockfile | 8 +- .../pekko-concurrent-1.0/gradle.lockfile | 8 +- .../pekko/pekko-http-1.0/gradle.lockfile | 8 +- .../play-ws/play-ws-1.0/gradle.lockfile | 8 +- .../play-ws/play-ws-2.0/gradle.lockfile | 8 +- .../play-ws/play-ws-2.1/gradle.lockfile | 8 +- .../play-ws/play-ws-common/gradle.lockfile | 8 +- .../play/play-2.3/gradle.lockfile | 8 +- .../play/play-2.4/gradle.lockfile | 8 +- .../play/play-2.6/gradle.lockfile | 16 ++- .../play/play-appsec-2.5/gradle.lockfile | 8 +- .../play/play-appsec-2.6/gradle.lockfile | 15 ++- .../play/play-appsec-2.7/gradle.lockfile | 12 +- .../play/play-appsec-common/gradle.lockfile | 8 +- .../protobuf-3.0/gradle.lockfile | 8 +- .../quartz-2.0/gradle.lockfile | 8 +- .../rabbitmq-amqp-2.7/gradle.lockfile | 8 +- .../ratpack-1.5/gradle.lockfile | 14 ++- .../reactive-streams-1.0/gradle.lockfile | 8 +- .../reactor-core-3.1/gradle.lockfile | 9 +- .../reactor-netty-1.0/gradle.lockfile | 9 +- .../rediscala-1.8/gradle.lockfile | 8 +- .../redisson/redisson-2.0.0/gradle.lockfile | 8 +- .../redisson/redisson-2.3.0/gradle.lockfile | 8 +- .../redisson/redisson-3.10.3/gradle.lockfile | 8 +- .../renaissance-0.7/gradle.lockfile | 8 +- .../resilience4j-2.0/gradle.lockfile | 9 +- .../resilience4j-reactor-2.0/gradle.lockfile | 9 +- .../filter-resteasy-3.0/gradle.lockfile | 8 +- .../filter-resteasy-3.1/gradle.lockfile | 8 +- .../resteasy/resteasy-3.0/gradle.lockfile | 8 +- .../restlet-2.2/gradle.lockfile | 8 +- .../gradle.lockfile | 8 +- .../jax-rs-annotations-1.1.1/gradle.lockfile | 8 +- .../jax-rs-annotations-2.0/gradle.lockfile | 11 +- .../jax-rs-client-1.1/gradle.lockfile | 8 +- .../rxjava/rxjava-1.0/gradle.lockfile | 8 +- .../rxjava/rxjava-2.0/gradle.lockfile | 8 +- .../scala/scala-2.10.7/gradle.lockfile | 8 +- .../scala-concurrent-2.8/gradle.lockfile | 8 +- .../scala-promise-2.10/gradle.lockfile | 8 +- .../scala-promise-2.13/gradle.lockfile | 8 +- .../scala-promise-common/gradle.lockfile | 8 +- .../scalatest-3.0.8/gradle.lockfile | 8 +- .../selenium-3.13/gradle.lockfile | 23 ++-- .../servicetalk-0.42.0/gradle.lockfile | 8 +- .../servicetalk-0.42.56/gradle.lockfile | 8 +- .../jakarta-servlet-5.0/gradle.lockfile | 8 +- .../javax-servlet-2.2/gradle.lockfile | 8 +- .../javax-servlet-3.0/gradle.lockfile | 8 +- .../javax-servlet-common/gradle.lockfile | 8 +- .../javax-servlet-iast/gradle.lockfile | 8 +- .../instrumentation/slick-3.2/gradle.lockfile | 8 +- .../snakeyaml-1.33/gradle.lockfile | 8 +- .../spark-executor-common/gradle.lockfile | 10 +- .../spark/sparkjava-2.3/gradle.lockfile | 8 +- .../instrumentation/spray-1.3/gradle.lockfile | 8 +- .../spring/spring-beans-3.1/gradle.lockfile | 8 +- .../spring/spring-boot-1.3/gradle.lockfile | 10 +- .../spring-cloud-zuul-2.0/gradle.lockfile | 9 +- .../spring/spring-core-3.2.2/gradle.lockfile | 8 +- .../spring/spring-data-1.8/gradle.lockfile | 8 +- .../spring/spring-jms-3.1/gradle.lockfile | 8 +- .../spring-messaging-4.0/gradle.lockfile | 8 +- .../spring/spring-rabbit-1.5/gradle.lockfile | 8 +- .../spring-scheduling-3.1/gradle.lockfile | 27 ++-- .../spring-security-5.0/gradle.lockfile | 8 +- .../spring-security-6.0/gradle.lockfile | 30 +++-- .../spring-webflux-5.0/gradle.lockfile | 8 +- .../spring-webflux-6.0/gradle.lockfile | 29 +++-- .../spring-webmvc-3.1/gradle.lockfile | 8 +- .../spring-webmvc-5.3/gradle.lockfile | 8 +- .../spring-webmvc-6.0/gradle.lockfile | 31 ++--- .../spring/spring-ws-2.0/gradle.lockfile | 8 +- .../spymemcached-2.10/gradle.lockfile | 8 +- .../synapse-3.0/gradle.lockfile | 8 +- .../testng/testng-6.4/gradle.lockfile | 8 +- .../testng/testng-7.0/gradle.lockfile | 8 +- .../testng/testng-common/gradle.lockfile | 8 +- .../thymeleaf-3.0/gradle.lockfile | 8 +- .../tibco-businessworks-5.14/gradle.lockfile | 8 +- .../tibco-businessworks-6.5/gradle.lockfile | 8 +- .../tibco-businessworks-stubs/gradle.lockfile | 8 +- .../tinylog-2.0/gradle.lockfile | 8 +- .../tomcat/tomcat-5.5/gradle.lockfile | 8 +- .../tomcat/tomcat-9.0/gradle.lockfile | 8 +- .../tomcat-appsec-5.5/gradle.lockfile | 8 +- .../tomcat-appsec-6.0/gradle.lockfile | 8 +- .../tomcat-appsec-7.0/gradle.lockfile | 8 +- .../tomcat/tomcat-common/gradle.lockfile | 8 +- .../twilio-0.0.1/gradle.lockfile | 10 +- .../unbescape-1.1/gradle.lockfile | 8 +- .../undertow/undertow-2.0/gradle.lockfile | 8 +- .../undertow/undertow-2.2/gradle.lockfile | 8 +- .../undertow/undertow-common/gradle.lockfile | 8 +- .../valkey-java-5.3/gradle.lockfile | 8 +- .../velocity-1.5/gradle.lockfile | 8 +- .../vertx-mysql-client-3.9/gradle.lockfile | 8 +- .../vertx-mysql-client-4.0/gradle.lockfile | 8 +- .../vertx-mysql-client-4.4.2/gradle.lockfile | 8 +- .../vertx-pg-client-4.0/gradle.lockfile | 8 +- .../vertx-pg-client-4.4.2/gradle.lockfile | 8 +- .../vertx-redis-client-3.9/gradle.lockfile | 8 +- .../vertx-redis-client-stubs/gradle.lockfile | 8 +- .../vertx/vertx-rx-3.5/gradle.lockfile | 8 +- .../vertx-sql-client-3.9/gradle.lockfile | 8 +- .../vertx-web/vertx-web-3.4/gradle.lockfile | 8 +- .../vertx-web/vertx-web-3.5/gradle.lockfile | 8 +- .../vertx-web/vertx-web-3.9/gradle.lockfile | 8 +- .../vertx-web/vertx-web-4.0/gradle.lockfile | 8 +- .../vertx-web/vertx-web-5.0/gradle.lockfile | 28 +++-- .../weaver-0.9/gradle.lockfile | 8 +- .../jakarta-websocket-2.0/gradle.lockfile | 8 +- .../javax-websocket-1.0/gradle.lockfile | 8 +- .../jetty-websocket-10.0/gradle.lockfile | 8 +- .../jetty-websocket-11.0/gradle.lockfile | 8 +- .../jetty-websocket-12.0/gradle.lockfile | 8 +- .../websphere-jmx-8.5/gradle.lockfile | 8 +- .../wildfly-9.0/gradle.lockfile | 118 +++++++++--------- .../gradle.lockfile | 8 +- .../jax-ws-annotations-1.1/gradle.lockfile | 8 +- .../jax-ws-annotations-2.0/gradle.lockfile | 8 +- .../zio/zio-2.0/gradle.lockfile | 8 +- .../apm-tracing-disabled/gradle.lockfile | 7 +- dd-smoke-tests/appsec/gradle.lockfile | 7 +- .../appsec/spring-tomcat7/gradle.lockfile | 7 +- .../appsec/springboot-graphql/gradle.lockfile | 7 +- .../appsec/springboot-grpc/gradle.lockfile | 7 +- .../springboot-security/gradle.lockfile | 7 +- .../appsec/springboot/gradle.lockfile | 11 +- dd-smoke-tests/armeria-grpc/gradle.lockfile | 15 ++- dd-smoke-tests/backend-mock/gradle.lockfile | 7 +- dd-smoke-tests/cli/gradle.lockfile | 7 +- .../concurrent/java-21/gradle.lockfile | 7 +- .../concurrent/java-25/gradle.lockfile | 7 +- .../concurrent/java-8/gradle.lockfile | 7 +- dd-smoke-tests/crashtracking/gradle.lockfile | 7 +- .../custom-systemloader/gradle.lockfile | 7 +- .../gradle.lockfile | 7 +- dd-smoke-tests/dynamic-config/gradle.lockfile | 7 +- .../field-injection/gradle.lockfile | 7 +- dd-smoke-tests/gradle.lockfile | 7 +- dd-smoke-tests/gradle/gradle.lockfile | 7 +- dd-smoke-tests/grpc-1.5/gradle.lockfile | 15 ++- .../iast-propagation/gradle.lockfile | 7 +- dd-smoke-tests/iast-util/gradle.lockfile | 7 +- .../iast-util/iast-util-11/gradle.lockfile | 7 +- .../iast-util/iast-util-17/gradle.lockfile | 7 +- dd-smoke-tests/java9-modules/gradle.lockfile | 7 +- dd-smoke-tests/jboss-modules/gradle.lockfile | 8 +- dd-smoke-tests/jdk-tool-abort/gradle.lockfile | 7 +- dd-smoke-tests/jersey-2/gradle.lockfile | 7 +- dd-smoke-tests/jersey-3/gradle.lockfile | 7 +- dd-smoke-tests/junit-console/gradle.lockfile | 7 +- dd-smoke-tests/kafka-2/gradle.lockfile | 7 +- dd-smoke-tests/kafka-3/gradle.lockfile | 7 +- dd-smoke-tests/lib-injection/gradle.lockfile | 7 +- dd-smoke-tests/log-injection/gradle.lockfile | 7 +- dd-smoke-tests/maven/gradle.lockfile | 7 +- dd-smoke-tests/openfeature/gradle.lockfile | 7 +- dd-smoke-tests/opentelemetry/gradle.lockfile | 7 +- dd-smoke-tests/opentracing/gradle.lockfile | 7 +- dd-smoke-tests/osgi/gradle.lockfile | 8 +- dd-smoke-tests/play-2.4/gradle.lockfile | 8 +- dd-smoke-tests/play-2.5/gradle.lockfile | 8 +- dd-smoke-tests/play-2.6/gradle.lockfile | 16 ++- dd-smoke-tests/play-2.7/gradle.lockfile | 17 ++- dd-smoke-tests/play-2.8-otel/gradle.lockfile | 15 ++- .../play-2.8-split-routes/gradle.lockfile | 15 ++- dd-smoke-tests/play-2.8/gradle.lockfile | 15 ++- .../gradle.lockfile | 7 +- dd-smoke-tests/quarkus-native/gradle.lockfile | 7 +- dd-smoke-tests/quarkus/gradle.lockfile | 7 +- dd-smoke-tests/ratpack-1.5/gradle.lockfile | 8 +- dd-smoke-tests/resteasy/gradle.lockfile | 7 +- dd-smoke-tests/rum/gradle.lockfile | 7 +- dd-smoke-tests/rum/tomcat-10/gradle.lockfile | 7 +- dd-smoke-tests/rum/tomcat-11/gradle.lockfile | 7 +- dd-smoke-tests/rum/tomcat-9/gradle.lockfile | 7 +- dd-smoke-tests/rum/wildfly-15/gradle.lockfile | 7 +- dd-smoke-tests/sample-trace/gradle.lockfile | 7 +- .../gradle.lockfile | 7 +- .../spring-boot-2.4-webflux/gradle.lockfile | 7 +- .../spring-boot-2.5-webflux/gradle.lockfile | 7 +- .../spring-boot-2.6-webflux/gradle.lockfile | 7 +- .../spring-boot-2.6-webmvc/gradle.lockfile | 7 +- .../spring-boot-2.7-webflux/gradle.lockfile | 7 +- .../spring-boot-3.0-native/gradle.lockfile | 7 +- .../spring-boot-3.0-webflux/gradle.lockfile | 7 +- .../spring-boot-3.0-webmvc/gradle.lockfile | 7 +- .../spring-boot-3.3-webmvc/gradle.lockfile | 7 +- .../spring-boot-rabbit/gradle.lockfile | 7 +- .../spring-security/gradle.lockfile | 7 +- .../springboot-freemarker/gradle.lockfile | 7 +- .../springboot-grpc/gradle.lockfile | 19 +-- .../springboot-java-11/gradle.lockfile | 7 +- .../springboot-java-17/gradle.lockfile | 7 +- .../springboot-jetty-jsp/gradle.lockfile | 7 +- dd-smoke-tests/springboot-jpa/gradle.lockfile | 7 +- .../springboot-mongo/gradle.lockfile | 7 +- .../springboot-openliberty-20/gradle.lockfile | 7 +- .../springboot-openliberty-23/gradle.lockfile | 7 +- .../springboot-thymeleaf/gradle.lockfile | 7 +- .../springboot-tomcat-jsp/gradle.lockfile | 7 +- .../springboot-tomcat/gradle.lockfile | 7 +- .../springboot-velocity/gradle.lockfile | 7 +- dd-smoke-tests/springboot/gradle.lockfile | 15 ++- dd-smoke-tests/tracer-flare/gradle.lockfile | 7 +- dd-smoke-tests/vertx-3.4/gradle.lockfile | 7 +- .../vertx-3.9-resteasy/gradle.lockfile | 7 +- dd-smoke-tests/vertx-3.9/gradle.lockfile | 7 +- dd-smoke-tests/vertx-4.2/gradle.lockfile | 7 +- dd-smoke-tests/websphere-jmx/gradle.lockfile | 7 +- dd-smoke-tests/wildfly/gradle.lockfile | 7 +- 432 files changed, 3010 insertions(+), 1260 deletions(-) diff --git a/dd-java-agent/instrumentation/aerospike-4.0/gradle.lockfile b/dd-java-agent/instrumentation/aerospike-4.0/gradle.lockfile index b74a4070713..4dd4506e138 100644 --- a/dd-java-agent/instrumentation/aerospike-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/aerospike-4.0/gradle.lockfile @@ -39,11 +39,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latest7DepForkedTestAnnotationProcessor,latest7DepTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latest7DepForkedTestAnnotationProcessor,latest7DepTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latest7DepForkedTestAnnotationProcessor,latest7DepTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latest7DepForkedTestAnnotationProcessor,latest7DepTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latest7DepForkedTestAnnotationProcessor,latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestAnnotationProcessor,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latest7DepForkedTestAnnotationProcessor,latest7DepTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latest7DepForkedTestRuntimeClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -92,6 +95,7 @@ org.hamcrest:hamcrest:3.0=latest7DepForkedTestCompileClasspath,latest7DepForkedT org.jctools:jctools-core-jdk11:4.0.6=latest7DepForkedTestRuntimeClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latest7DepForkedTestRuntimeClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jetbrains:annotations:17.0.0=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latest7DepForkedTestRuntimeClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/akka/akka-actor-2.5/gradle.lockfile b/dd-java-agent/instrumentation/akka/akka-actor-2.5/gradle.lockfile index cbb2a24e716..6890835f72b 100644 --- a/dd-java-agent/instrumentation/akka/akka-actor-2.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/akka/akka-actor-2.5/gradle.lockfile @@ -36,11 +36,14 @@ com.google.code.findbugs:jsr305:3.0.2=akka23TestAnnotationProcessor,akka23TestCo com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=akka23TestAnnotationProcessor,annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=akka23TestAnnotationProcessor,annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=akka23TestAnnotationProcessor,annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=akka23TestAnnotationProcessor,annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=akka23TestAnnotationProcessor,akka23TestCompileClasspath,akka23TestRuntimeClasspath,annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=akka23TestAnnotationProcessor,annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=akka23TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.squareup.moshi:moshi:1.11.0=akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -106,6 +109,7 @@ org.jline:jline-native:3.27.1=zinc org.jline:jline-terminal-jni:3.27.1=zinc org.jline:jline-terminal:3.27.1=zinc org.jline:jline:3.27.1=zinc +org.jspecify:jspecify:1.0.0=akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=akka23TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/gradle.lockfile b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/gradle.lockfile index 06de8309e79..6a385de8884 100644 --- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/gradle.lockfile @@ -56,18 +56,18 @@ com.google.auto.service:auto-service:1.1.1=annotationProcessor,baseForkedTestAnn com.google.auto:auto-common:1.2.1=annotationProcessor,baseForkedTestAnnotationProcessor,baseTestAnnotationProcessor,iastTestAnnotationProcessor,lagomTestAnnotationProcessor,latestDepIastTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,version101ForkedTestAnnotationProcessor,version101IastTestAnnotationProcessor,version101TestAnnotationProcessor,version102IastTestAnnotationProcessor,version102Scala213TestAnnotationProcessor com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,baseForkedTestAnnotationProcessor,baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,baseTestAnnotationProcessor,baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath,csiCompileClasspath,iastTestAnnotationProcessor,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestAnnotationProcessor,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestAnnotationProcessor,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath,version101ForkedTestAnnotationProcessor,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestAnnotationProcessor,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestAnnotationProcessor,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestAnnotationProcessor,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestAnnotationProcessor,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs -com.google.errorprone:error_prone_annotations:2.0.18=lagomTestCompileClasspath,lagomTestRuntimeClasspath com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,baseForkedTestAnnotationProcessor,baseTestAnnotationProcessor,iastTestAnnotationProcessor,lagomTestAnnotationProcessor,latestDepIastTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,version101ForkedTestAnnotationProcessor,version101IastTestAnnotationProcessor,version101TestAnnotationProcessor,version102IastTestAnnotationProcessor,version102Scala213TestAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,baseForkedTestAnnotationProcessor,baseTestAnnotationProcessor,iastTestAnnotationProcessor,lagomTestAnnotationProcessor,latestDepIastTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,version101ForkedTestAnnotationProcessor,version101IastTestAnnotationProcessor,version101TestAnnotationProcessor,version102IastTestAnnotationProcessor,version102Scala213TestAnnotationProcessor -com.google.guava:guava:20.0=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath -com.google.guava:guava:22.0=lagomTestCompileClasspath,lagomTestRuntimeClasspath +com.google.guava:failureaccess:1.0.3=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,baseForkedTestAnnotationProcessor,baseTestAnnotationProcessor,iastTestAnnotationProcessor,lagomTestAnnotationProcessor,latestDepIastTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,version101ForkedTestAnnotationProcessor,version101IastTestAnnotationProcessor,version101TestAnnotationProcessor,version102IastTestAnnotationProcessor,version102Scala213TestAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,baseForkedTestAnnotationProcessor,baseTestAnnotationProcessor,iastTestAnnotationProcessor,lagomTestAnnotationProcessor,latestDepIastTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,version101ForkedTestAnnotationProcessor,version101IastTestAnnotationProcessor,version101TestAnnotationProcessor,version102IastTestAnnotationProcessor,version102Scala213TestAnnotationProcessor +com.google.guava:guava:33.6.0-jre=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,baseForkedTestAnnotationProcessor,baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,baseTestAnnotationProcessor,baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestAnnotationProcessor,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestAnnotationProcessor,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestAnnotationProcessor,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath,version101ForkedTestAnnotationProcessor,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestAnnotationProcessor,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestAnnotationProcessor,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestAnnotationProcessor,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestAnnotationProcessor,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath com.google.inject.extensions:guice-assistedinject:4.1.0=lagomTestCompileClasspath,lagomTestRuntimeClasspath com.google.inject:guice:4.1.0=lagomTestCompileClasspath,lagomTestRuntimeClasspath -com.google.j2objc:j2objc-annotations:1.1=lagomTestCompileClasspath,lagomTestRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,baseForkedTestAnnotationProcessor,baseTestAnnotationProcessor,iastTestAnnotationProcessor,lagomTestAnnotationProcessor,latestDepIastTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,version101ForkedTestAnnotationProcessor,version101IastTestAnnotationProcessor,version101TestAnnotationProcessor,version102IastTestAnnotationProcessor,version102Scala213TestAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath com.google.re2j:re2j:1.8=baseForkedTestRuntimeClasspath,baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath com.lightbend.lagom:lagom-api_2.11:1.4.0=lagomTestCompileClasspath,lagomTestRuntimeClasspath com.lightbend.lagom:lagom-client_2.11:1.4.0=lagomTestCompileClasspath,lagomTestRuntimeClasspath @@ -255,7 +255,6 @@ org.codehaus.groovy:groovy-templates:3.0.23=codenarc org.codehaus.groovy:groovy-xml:3.0.23=codenarc org.codehaus.groovy:groovy:3.0.23=codenarc org.codehaus.groovy:groovy:3.0.25=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath -org.codehaus.mojo:animal-sniffer-annotations:1.14=lagomTestCompileClasspath,lagomTestRuntimeClasspath org.codenarc:CodeNarc:3.7.0=codenarc org.dom4j:dom4j:2.2.0=spotbugs org.eclipse.jetty.alpn:alpn-api:1.1.3.v20160715=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath @@ -271,6 +270,7 @@ org.jline:jline-terminal-jni:3.27.1=zinc org.jline:jline-terminal:3.27.1=zinc org.jline:jline:3.27.1=zinc org.joda:joda-convert:1.7=lagomTestCompileClasspath,lagomTestRuntimeClasspath +org.jspecify:jspecify:1.0.0=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=baseForkedTestRuntimeClasspath,baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.2-iast/gradle.lockfile b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.2-iast/gradle.lockfile index 23220b7e966..e8adfb3e1b2 100644 --- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.2-iast/gradle.lockfile +++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.2-iast/gradle.lockfile @@ -36,11 +36,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath @@ -100,6 +103,7 @@ org.jline:jline-native:3.27.1=zinc org.jline:jline-terminal-jni:3.27.1=zinc org.jline:jline-terminal:3.27.1=zinc org.jline:jline:3.27.1=zinc +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/gradle.lockfile b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/gradle.lockfile index cc3ed1370f7..899687c5612 100644 --- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/gradle.lockfile +++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/gradle.lockfile @@ -44,11 +44,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.hierynomus:asn-one:0.6.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.lmax:disruptor:3.4.2=zinc @@ -126,6 +129,7 @@ org.jline:jline-native:3.27.1=zinc org.jline:jline-terminal-jni:3.27.1=zinc org.jline:jline-terminal:3.27.1=zinc org.jline:jline:3.27.1=zinc +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/gradle.lockfile b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/gradle.lockfile index 5c9ec2ab256..368aa0e9ae7 100644 --- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -94,6 +97,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/gradle.lockfile b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/gradle.lockfile index aed18eec7cb..1bc89151c59 100644 --- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,iastI com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,iastIntegrationTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,v41IastIntegrationTestAnnotationProcessor,v42IastIntegrationTestAnnotationProcessor,v43IastIntegrationTestAnnotationProcessor,v44IastIntegrationTestAnnotationProcessor,v45IastIntegrationTestAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=iastIntegrationTestCompileClasspath,iastIntegrationTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,v41IastIntegrationTestCompileClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestCompileClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestCompileClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestCompileClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestCompileClasspath,v45IastIntegrationTestRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,iastIntegrationTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,v41IastIntegrationTestAnnotationProcessor,v42IastIntegrationTestAnnotationProcessor,v43IastIntegrationTestAnnotationProcessor,v44IastIntegrationTestAnnotationProcessor,v45IastIntegrationTestAnnotationProcessor -com.google.guava:guava:20.0=iastIntegrationTestCompileClasspath,iastIntegrationTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,v41IastIntegrationTestCompileClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestCompileClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestCompileClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestCompileClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestCompileClasspath,v45IastIntegrationTestRuntimeClasspath +com.google.guava:failureaccess:1.0.3=iastIntegrationTestCompileClasspath,iastIntegrationTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,v41IastIntegrationTestCompileClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestCompileClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestCompileClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestCompileClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestCompileClasspath,v45IastIntegrationTestRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,iastIntegrationTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,v41IastIntegrationTestAnnotationProcessor,v42IastIntegrationTestAnnotationProcessor,v43IastIntegrationTestAnnotationProcessor,v44IastIntegrationTestAnnotationProcessor,v45IastIntegrationTestAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,iastIntegrationTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,v41IastIntegrationTestAnnotationProcessor,v42IastIntegrationTestAnnotationProcessor,v43IastIntegrationTestAnnotationProcessor,v44IastIntegrationTestAnnotationProcessor,v45IastIntegrationTestAnnotationProcessor +com.google.guava:guava:33.6.0-jre=iastIntegrationTestCompileClasspath,iastIntegrationTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,v41IastIntegrationTestCompileClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestCompileClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestCompileClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestCompileClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestCompileClasspath,v45IastIntegrationTestRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,iastIntegrationTestAnnotationProcessor,iastIntegrationTestCompileClasspath,iastIntegrationTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath,v41IastIntegrationTestAnnotationProcessor,v41IastIntegrationTestCompileClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestAnnotationProcessor,v42IastIntegrationTestCompileClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestAnnotationProcessor,v43IastIntegrationTestCompileClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestAnnotationProcessor,v44IastIntegrationTestCompileClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestAnnotationProcessor,v45IastIntegrationTestCompileClasspath,v45IastIntegrationTestRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,iastIntegrationTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,v41IastIntegrationTestAnnotationProcessor,v42IastIntegrationTestAnnotationProcessor,v43IastIntegrationTestAnnotationProcessor,v44IastIntegrationTestAnnotationProcessor,v45IastIntegrationTestAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=iastIntegrationTestCompileClasspath,iastIntegrationTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,v41IastIntegrationTestCompileClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestCompileClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestCompileClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestCompileClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestCompileClasspath,v45IastIntegrationTestRuntimeClasspath com.google.re2j:re2j:1.8=iastIntegrationTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestRuntimeClasspath com.squareup.moshi:moshi:1.11.0=iastIntegrationTestCompileClasspath,iastIntegrationTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,v41IastIntegrationTestCompileClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestCompileClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestCompileClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestCompileClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestCompileClasspath,v45IastIntegrationTestRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=iastIntegrationTestCompileClasspath,iastIntegrationTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,v41IastIntegrationTestCompileClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestCompileClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestCompileClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestCompileClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestCompileClasspath,v45IastIntegrationTestRuntimeClasspath @@ -111,6 +114,7 @@ org.hamcrest:hamcrest-core:1.3=iastIntegrationTestRuntimeClasspath,latestDepTest org.hamcrest:hamcrest:3.0=iastIntegrationTestCompileClasspath,iastIntegrationTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,v41IastIntegrationTestCompileClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestCompileClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestCompileClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestCompileClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestCompileClasspath,v45IastIntegrationTestRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=iastIntegrationTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestRuntimeClasspath org.jctools:jctools-core:4.0.6=iastIntegrationTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestRuntimeClasspath +org.jspecify:jspecify:1.0.0=iastIntegrationTestCompileClasspath,iastIntegrationTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,v41IastIntegrationTestCompileClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestCompileClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestCompileClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestCompileClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestCompileClasspath,v45IastIntegrationTestRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=iastIntegrationTestCompileClasspath,iastIntegrationTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,v41IastIntegrationTestCompileClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestCompileClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestCompileClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestCompileClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestCompileClasspath,v45IastIntegrationTestRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=iastIntegrationTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=iastIntegrationTestCompileClasspath,iastIntegrationTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,v41IastIntegrationTestCompileClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestCompileClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestCompileClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestCompileClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestCompileClasspath,v45IastIntegrationTestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/gradle.lockfile b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/gradle.lockfile index e2b5fa4d167..19e4bed4f59 100644 --- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -89,6 +92,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-4.0/gradle.lockfile b/dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-4.0/gradle.lockfile index bee997cdb46..5894a75d9b3 100644 --- a/dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-4.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -84,6 +87,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-5.0/gradle.lockfile b/dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-5.0/gradle.lockfile index d66953f14e5..9e8310b7305 100644 --- a/dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-5.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-5.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -63,7 +66,7 @@ org.apache.bcel:bcel:6.11.0=spotbugs org.apache.commons:commons-lang3:3.19.0=spotbugs org.apache.commons:commons-text:1.14.0=spotbugs org.apache.httpcomponents.core5:httpcore5:5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.httpcomponents.core5:httpcore5:5.5-beta1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.httpcomponents.core5:httpcore5:5.5-beta2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.logging.log4j:log4j-api:2.25.2=spotbugs org.apache.logging.log4j:log4j-core:2.25.2=spotbugs org.apiguardian:apiguardian-api:1.1.2=latestDepTestCompileClasspath,testCompileClasspath @@ -84,6 +87,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/gradle.lockfile b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/gradle.lockfile index 90a6b040157..9e411ef2bbf 100644 --- a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/gradle.lockfile +++ b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/gradle.lockfile @@ -53,20 +53,16 @@ com.google.code.gson:gson:2.8.6=testCompileProtoPath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.3.2=compileClasspath,compileProtoPath com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.48.0=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath -com.google.errorprone:error_prone_annotations:2.5.1=testCompileClasspath -com.google.errorprone:error_prone_annotations:2.9.0=testCompileProtoPath,testRuntimeClasspath -com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.google.guava:failureaccess:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:failureaccess:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.google.guava:guava:26.0-android=compileClasspath,compileProtoPath -com.google.guava:guava:30.1.1-android=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:33.5.0-android=latestDepForkedTestCompileClasspath,latestDepTestCompileClasspath -com.google.guava:guava:33.5.0-jre=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +com.google.guava:guava:33.6.0-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.google.j2objc:j2objc-annotations:1.3=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.j2objc:j2objc-annotations:3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.google.protobuf:protobuf-java-util:3.12.0=testCompileProtoPath,testRuntimeClasspath com.google.protobuf:protobuf-java-util:3.25.8=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath com.google.protobuf:protobuf-java-util:3.7.1=compileClasspath,compileProtoPath @@ -203,7 +199,6 @@ org.apache.logging.log4j:log4j-api:2.25.2=spotbugs org.apache.logging.log4j:log4j-core:2.25.2=spotbugs org.apiguardian:apiguardian-api:1.1.2=latestDepForkedTestCompileClasspath,latestDepTestCompileClasspath,testCompileClasspath org.checkerframework:checker-compat-qual:2.5.2=compileClasspath,compileProtoPath -org.checkerframework:checker-compat-qual:2.5.5=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath org.checkerframework:checker-qual:3.33.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor org.codehaus.groovy:groovy-ant:3.0.23=codenarc org.codehaus.groovy:groovy-docgenerator:3.0.23=codenarc @@ -229,7 +224,7 @@ org.hdrhistogram:HdrHistogram:2.1.9=compileClasspath,compileProtoPath org.hdrhistogram:HdrHistogram:2.2.2=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath -org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/gradle.lockfile b/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/gradle.lockfile index 95853157371..6365759da7f 100644 --- a/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/gradle.lockfile +++ b/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/gradle.lockfile @@ -48,11 +48,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,jetty com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,jetty11LatestDepTestAnnotationProcessor,jetty11TestAnnotationProcessor,jetty9LatestDepTestAnnotationProcessor,jetty9TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,jetty11LatestDepTestAnnotationProcessor,jetty11TestAnnotationProcessor,jetty9LatestDepTestAnnotationProcessor,jetty9TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,jetty11LatestDepTestAnnotationProcessor,jetty11TestAnnotationProcessor,jetty9LatestDepTestAnnotationProcessor,jetty9TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,jetty11LatestDepTestAnnotationProcessor,jetty11TestAnnotationProcessor,jetty9LatestDepTestAnnotationProcessor,jetty9TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,jetty11LatestDepTestAnnotationProcessor,jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestAnnotationProcessor,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestAnnotationProcessor,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestAnnotationProcessor,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,jetty11LatestDepTestAnnotationProcessor,jetty11TestAnnotationProcessor,jetty9LatestDepTestAnnotationProcessor,jetty9TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=jetty11LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.linecorp.armeria:armeria-jetty11:1.24.0=jetty11TestCompileClasspath,jetty11TestRuntimeClasspath com.linecorp.armeria:armeria-jetty11:1.40.0=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath @@ -187,7 +190,7 @@ org.hdrhistogram:HdrHistogram:2.1.12=jetty11TestRuntimeClasspath,jetty9TestRunti org.hdrhistogram:HdrHistogram:2.2.2=jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=jetty11LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=jetty11LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -org.jspecify:jspecify:1.0.0=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +org.jspecify:jspecify:1.0.0=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=jetty11LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/avro-1.11.3/gradle.lockfile b/dd-java-agent/instrumentation/avro-1.11.3/gradle.lockfile index 0e783363d4d..cafae541d19 100644 --- a/dd-java-agent/instrumentation/avro-1.11.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/avro-1.11.3/gradle.lockfile @@ -49,19 +49,18 @@ com.google.code.gson:gson:2.13.2=spotbugs com.google.code.gson:gson:2.2.4=compileClasspath,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.9.0=latestDepTest8CompileClasspath,latestDepTest8RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTest8AnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.errorprone:error_prone_annotations:2.2.0=testCompileClasspath,testRuntimeClasspath -com.google.errorprone:error_prone_annotations:2.36.0=latestDepTest8CompileClasspath,latestDepTest8RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:failureaccess:1.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTest8CompileClasspath,latestDepTest8RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0=compileClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTest8AnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:failureaccess:1.0.3=latestDepTest8CompileClasspath,latestDepTest8RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.google.guava:guava:27.0-jre=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTest8CompileClasspath,latestDepTest8RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:27.0-jre=compileClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTest8AnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:33.4.8-jre=latestDepTest8CompileClasspath,latestDepTest8RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.guava:guava:33.6.0-jre=latestDepTest8CompileClasspath,latestDepTest8RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,latestDepTest8AnnotationProcessor,latestDepTest8CompileClasspath,latestDepTest8RuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -com.google.j2objc:j2objc-annotations:1.1=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:1.1=compileClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTest8AnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.j2objc:j2objc-annotations:3.0.0=latestDepTest8CompileClasspath,latestDepTest8RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=latestDepTest8CompileClasspath,latestDepTest8RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.protobuf:protobuf-java:2.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.1=compileClasspath,latestDepTest8CompileClasspath,latestDepTestCompileClasspath,testCompileClasspath com.google.re2j:re2j:1.8=latestDepTest8RuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -216,7 +215,7 @@ org.apache.zookeeper:zookeeper:3.5.6=compileClasspath,testCompileClasspath,testR org.apache.zookeeper:zookeeper:3.8.6=latestDepTest8CompileClasspath,latestDepTest8RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=latestDepTest8CompileClasspath,latestDepTestCompileClasspath,testCompileClasspath org.bouncycastle:bcprov-jdk18on:1.82=latestDepTest8CompileClasspath,latestDepTest8RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.checkerframework:checker-qual:2.5.2=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:2.5.2=compileClasspath org.checkerframework:checker-qual:3.33.0=annotationProcessor,latestDepTest8AnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor org.codehaus.groovy:groovy-ant:3.0.23=codenarc org.codehaus.groovy:groovy-docgenerator:3.0.23=codenarc @@ -232,7 +231,7 @@ org.codehaus.jackson:jackson-jaxrs:1.9.2=compileClasspath,testCompileClasspath,t org.codehaus.jackson:jackson-mapper-asl:1.9.2=compileClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.jackson:jackson-xc:1.9.2=compileClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.jettison:jettison:1.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.codehaus.mojo:animal-sniffer-annotations:1.17=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.mojo:animal-sniffer-annotations:1.17=compileClasspath org.codehaus.woodstox:stax2-api:4.2.1=compileClasspath,latestDepTest8CompileClasspath,latestDepTest8RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.codenarc:CodeNarc:3.7.0=codenarc org.dom4j:dom4j:2.2.0=spotbugs @@ -274,7 +273,7 @@ org.hamcrest:hamcrest:3.0=latestDepTest8CompileClasspath,latestDepTest8RuntimeCl org.javassist:javassist:3.30.2-GA=latestDepTest8CompileClasspath,latestDepTest8RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTest8RuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTest8RuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -org.jspecify:jspecify:1.0.0=latestDepTest8CompileClasspath,latestDepTest8RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTest8CompileClasspath,latestDepTest8RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTest8CompileClasspath,latestDepTest8RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTest8RuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTest8CompileClasspath,latestDepTest8RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-common/gradle.lockfile b/dd-java-agent/instrumentation/aws-java/aws-java-common/gradle.lockfile index c0c32d6d385..38b31a1360b 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/aws-java/aws-java-common/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -82,6 +85,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/gradle.lockfile b/dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/gradle.lockfile index 01b9d8e0195..d38b070280c 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/gradle.lockfile @@ -36,12 +36,15 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -115,6 +118,7 @@ org.hamcrest:hamcrest:3.0=latestDepForkedTestCompileClasspath,latestDepForkedTes org.jctools:jctools-core-jdk11:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jetbrains:annotations:17.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -158,57 +162,57 @@ org.testcontainers:localstack:1.21.4=latestDepForkedTestCompileClasspath,latestD org.testcontainers:testcontainers:1.21.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.xmlresolver:xmlresolver:5.3.3=spotbugs software.amazon.awssdk:annotations:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:annotations:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:annotations:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:apache-client:2.30.22=testRuntimeClasspath -software.amazon.awssdk:apache5-client:2.46.15=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:apache5-client:2.46.17=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:auth:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:auth:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:auth:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-core:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:aws-core:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:aws-core:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-json-protocol:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:aws-json-protocol:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:aws-json-protocol:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:checksums-spi:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:checksums-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:checksums-spi:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:checksums:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:checksums:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:checksums:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:dynamodb:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:dynamodb:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:dynamodb:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:endpoints-spi:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:endpoints-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:endpoints-spi:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth-aws-eventstream:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth-aws-eventstream:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws-eventstream:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth-aws:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth-aws:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth-spi:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-spi:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-client-spi:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-client-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-client-spi:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:identity-spi:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:identity-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:identity-spi:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:json-utils:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:json-utils:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:json-utils:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:metrics-spi:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:metrics-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:metrics-spi:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.30.22=testRuntimeClasspath -software.amazon.awssdk:netty-nio-client:2.46.15=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:netty-nio-client:2.46.17=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:profiles:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:profiles:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:profiles:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:protocol-core:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:protocol-core:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:protocol-core:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:regions:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:regions:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:regions:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:retries-spi:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:retries-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:retries-spi:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:retries:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:retries:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:retries:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sdk-core:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:sdk-core:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:sdk-core:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:third-party-jackson-core:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:third-party-jackson-core:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:utils-lite:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:third-party-jackson-core:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:utils-lite:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:utils:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:utils:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:utils:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.eventstream:eventstream:1.0.1=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath empty=spotbugsPlugins diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/gradle.lockfile b/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/gradle.lockfile index df7a96bb70c..a7f5c57168d 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/gradle.lockfile @@ -36,12 +36,15 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -115,6 +118,7 @@ org.hamcrest:hamcrest:3.0=latestDepForkedTestCompileClasspath,latestDepForkedTes org.jctools:jctools-core-jdk11:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jetbrains:annotations:17.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -159,83 +163,83 @@ org.testcontainers:testcontainers:1.21.4=latestDepForkedTestCompileClasspath,lat org.xmlresolver:xmlresolver:5.3.3=spotbugs software.amazon.awssdk:annotations:2.27.19=compileClasspath software.amazon.awssdk:annotations:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:annotations:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:annotations:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:apache-client:2.27.23=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -software.amazon.awssdk:apache5-client:2.46.15=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:apache5-client:2.46.17=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:auth:2.27.19=compileClasspath software.amazon.awssdk:auth:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:auth:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:auth:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-core:2.27.19=compileClasspath software.amazon.awssdk:aws-core:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:aws-core:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:aws-core:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-json-protocol:2.27.19=compileClasspath software.amazon.awssdk:aws-json-protocol:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:aws-json-protocol:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:aws-json-protocol:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-query-protocol:2.27.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:checksums-spi:2.27.19=compileClasspath software.amazon.awssdk:checksums-spi:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:checksums-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:checksums-spi:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:checksums:2.27.19=compileClasspath software.amazon.awssdk:checksums:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:checksums:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:checksums:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:endpoints-spi:2.27.19=compileClasspath software.amazon.awssdk:endpoints-spi:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:endpoints-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:endpoints-spi:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:eventbridge:2.27.19=compileClasspath software.amazon.awssdk:eventbridge:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:eventbridge:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:eventbridge:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth-aws-eventstream:2.27.19=compileClasspath software.amazon.awssdk:http-auth-aws-eventstream:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth-aws-eventstream:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws-eventstream:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth-aws:2.27.19=compileClasspath software.amazon.awssdk:http-auth-aws:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth-aws:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth-spi:2.27.19=compileClasspath software.amazon.awssdk:http-auth-spi:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-spi:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth:2.27.19=compileClasspath software.amazon.awssdk:http-auth:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-client-spi:2.27.19=compileClasspath software.amazon.awssdk:http-client-spi:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-client-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-client-spi:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:identity-spi:2.27.19=compileClasspath software.amazon.awssdk:identity-spi:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:identity-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:identity-spi:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:json-utils:2.27.19=compileClasspath software.amazon.awssdk:json-utils:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:json-utils:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:json-utils:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:metrics-spi:2.27.19=compileClasspath software.amazon.awssdk:metrics-spi:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:metrics-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:metrics-spi:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.27.23=testRuntimeClasspath -software.amazon.awssdk:netty-nio-client:2.46.15=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:netty-nio-client:2.46.17=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:profiles:2.27.19=compileClasspath software.amazon.awssdk:profiles:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:profiles:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:profiles:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:protocol-core:2.27.19=compileClasspath software.amazon.awssdk:protocol-core:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:protocol-core:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:protocol-core:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:regions:2.27.19=compileClasspath software.amazon.awssdk:regions:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:regions:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:regions:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:retries-spi:2.27.19=compileClasspath software.amazon.awssdk:retries-spi:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:retries-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:retries-spi:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:retries:2.27.19=compileClasspath software.amazon.awssdk:retries:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:retries:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:retries:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sdk-core:2.27.19=compileClasspath software.amazon.awssdk:sdk-core:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:sdk-core:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:sdk-core:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sns:2.27.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:sqs:2.27.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:third-party-jackson-core:2.27.19=compileClasspath software.amazon.awssdk:third-party-jackson-core:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:third-party-jackson-core:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:utils-lite:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:third-party-jackson-core:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:utils-lite:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:utils:2.27.19=compileClasspath software.amazon.awssdk:utils:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:utils:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:utils:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.eventstream:eventstream:1.0.1=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath empty=spotbugsPlugins diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/gradle.lockfile b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/gradle.lockfile index 892496f0352..fce2e25a811 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/gradle.lockfile @@ -33,11 +33,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -83,6 +86,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-s3-2.0/gradle.lockfile b/dd-java-agent/instrumentation/aws-java/aws-java-s3-2.0/gradle.lockfile index b168bfec03c..19a4061e98e 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-s3-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/aws-java/aws-java-s3-2.0/gradle.lockfile @@ -36,12 +36,15 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -115,6 +118,7 @@ org.hamcrest:hamcrest:3.0=latestDepForkedTestCompileClasspath,latestDepForkedTes org.jctools:jctools-core-jdk11:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jetbrains:annotations:17.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -158,63 +162,63 @@ org.testcontainers:localstack:1.21.4=latestDepForkedTestCompileClasspath,latestD org.testcontainers:testcontainers:1.21.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.xmlresolver:xmlresolver:5.3.3=spotbugs software.amazon.awssdk:annotations:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:annotations:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:annotations:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:apache-client:2.29.26=testRuntimeClasspath -software.amazon.awssdk:apache5-client:2.46.15=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:apache5-client:2.46.17=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:arns:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:arns:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:arns:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:auth:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:auth:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:auth:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-core:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:aws-core:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:aws-core:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-query-protocol:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:aws-query-protocol:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:aws-query-protocol:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-xml-protocol:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:aws-xml-protocol:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:aws-xml-protocol:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:checksums-spi:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:checksums-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:checksums-spi:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:checksums:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:checksums:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:checksums:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:crt-core:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:crt-core:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:crt-core:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:endpoints-spi:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:endpoints-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:endpoints-spi:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth-aws-eventstream:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth-aws-eventstream:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws-eventstream:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth-aws:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth-aws:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth-spi:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-spi:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-client-spi:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-client-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-client-spi:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:identity-spi:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:identity-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:identity-spi:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:json-utils:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:json-utils:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:json-utils:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:metrics-spi:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:metrics-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:metrics-spi:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.29.26=testRuntimeClasspath -software.amazon.awssdk:netty-nio-client:2.46.15=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:netty-nio-client:2.46.17=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:profiles:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:profiles:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:profiles:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:protocol-core:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:protocol-core:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:protocol-core:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:regions:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:regions:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:regions:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:retries-spi:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:retries-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:retries-spi:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:retries:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:retries:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:retries:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:s3:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:s3:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:s3:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sdk-core:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:sdk-core:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:sdk-core:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:third-party-jackson-core:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:third-party-jackson-core:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:utils-lite:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:third-party-jackson-core:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:utils-lite:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:utils:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:utils:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:utils:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.eventstream:eventstream:1.0.1=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath empty=spotbugsPlugins diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/gradle.lockfile b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/gradle.lockfile index 37f455e2aee..59b1721f345 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/gradle.lockfile +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/gradle.lockfile @@ -84,11 +84,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,dsmFo com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,dsmForkedTestAnnotationProcessor,dsmTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestDsmForkedTestAnnotationProcessor,latestDsmTestAnnotationProcessor,testAnnotationProcessor,test_before_1_11_106AnnotationProcessor,test_before_1_11_106ForkedTestAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,dsmForkedTestAnnotationProcessor,dsmTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestDsmForkedTestAnnotationProcessor,latestDsmTestAnnotationProcessor,testAnnotationProcessor,test_before_1_11_106AnnotationProcessor,test_before_1_11_106ForkedTestAnnotationProcessor -com.google.guava:guava:20.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath +com.google.guava:failureaccess:1.0.3=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,dsmForkedTestAnnotationProcessor,dsmTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestDsmForkedTestAnnotationProcessor,latestDsmTestAnnotationProcessor,testAnnotationProcessor,test_before_1_11_106AnnotationProcessor,test_before_1_11_106ForkedTestAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,dsmForkedTestAnnotationProcessor,dsmTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestDsmForkedTestAnnotationProcessor,latestDsmTestAnnotationProcessor,testAnnotationProcessor,test_before_1_11_106AnnotationProcessor,test_before_1_11_106ForkedTestAnnotationProcessor +com.google.guava:guava:33.6.0-jre=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,dsmForkedTestAnnotationProcessor,dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestAnnotationProcessor,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestAnnotationProcessor,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestAnnotationProcessor,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106AnnotationProcessor,test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestAnnotationProcessor,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,dsmForkedTestAnnotationProcessor,dsmTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestDsmForkedTestAnnotationProcessor,latestDsmTestAnnotationProcessor,testAnnotationProcessor,test_before_1_11_106AnnotationProcessor,test_before_1_11_106ForkedTestAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath com.google.re2j:re2j:1.8=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath com.squareup.moshi:moshi:1.11.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath @@ -144,6 +147,7 @@ org.hamcrest:hamcrest:3.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClas org.jctools:jctools-core-jdk11:4.0.6=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath org.jctools:jctools-core:4.0.6=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath org.json:json:20231013=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath +org.jspecify:jspecify:1.0.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/gradle.lockfile b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/gradle.lockfile index a3fea8173e3..86fc2aa30f6 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/gradle.lockfile @@ -40,12 +40,15 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,dsmFo com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,dsmForkedTestAnnotationProcessor,dsmTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestDsmForkedTestAnnotationProcessor,latestDsmTestAnnotationProcessor,latestPayloadTaggingForkedTestAnnotationProcessor,latestPayloadTaggingTestAnnotationProcessor,payloadTaggingForkedTestAnnotationProcessor,payloadTaggingTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,dsmForkedTestAnnotationProcessor,dsmTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestDsmForkedTestAnnotationProcessor,latestDsmTestAnnotationProcessor,latestPayloadTaggingForkedTestAnnotationProcessor,latestPayloadTaggingTestAnnotationProcessor,payloadTaggingForkedTestAnnotationProcessor,payloadTaggingTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,dsmForkedTestAnnotationProcessor,dsmTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestDsmForkedTestAnnotationProcessor,latestDsmTestAnnotationProcessor,latestPayloadTaggingForkedTestAnnotationProcessor,latestPayloadTaggingTestAnnotationProcessor,payloadTaggingForkedTestAnnotationProcessor,payloadTaggingTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,dsmForkedTestAnnotationProcessor,dsmTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestDsmForkedTestAnnotationProcessor,latestDsmTestAnnotationProcessor,latestPayloadTaggingForkedTestAnnotationProcessor,latestPayloadTaggingTestAnnotationProcessor,payloadTaggingForkedTestAnnotationProcessor,payloadTaggingTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,dsmForkedTestAnnotationProcessor,dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestAnnotationProcessor,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestAnnotationProcessor,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestAnnotationProcessor,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestAnnotationProcessor,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestAnnotationProcessor,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestAnnotationProcessor,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestAnnotationProcessor,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,dsmForkedTestAnnotationProcessor,dsmTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestDsmForkedTestAnnotationProcessor,latestDsmTestAnnotationProcessor,latestPayloadTaggingForkedTestAnnotationProcessor,latestPayloadTaggingTestAnnotationProcessor,payloadTaggingForkedTestAnnotationProcessor,payloadTaggingTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -164,6 +167,7 @@ org.hamcrest:hamcrest:3.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClas org.jctools:jctools-core-jdk11:4.0.6=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath org.jetbrains:annotations:17.0.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -213,14 +217,14 @@ software.amazon.awssdk:annotations:2.19.0=payloadTaggingForkedTestCompileClasspa software.amazon.awssdk:annotations:2.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:annotations:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:annotations:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:annotations:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:annotations:2.46.17=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:apache-client:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath software.amazon.awssdk:apache-client:2.19.0=payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:apache-client:2.2.0=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingTestCompileClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingTestCompileClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:apache-client:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:apache-client:2.25.40=latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:apache-client:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath -software.amazon.awssdk:apache5-client:2.46.15=latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:apache-client:2.46.17=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:apache5-client:2.46.17=latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:apigateway:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:apigateway:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:apigateway:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath @@ -231,35 +235,35 @@ software.amazon.awssdk:auth:2.19.0=payloadTaggingForkedTestCompileClasspath,payl software.amazon.awssdk:auth:2.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:auth:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:auth:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:auth:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:auth:2.46.17=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:aws-cbor-protocol:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:aws-cbor-protocol:2.2.0=testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:aws-cbor-protocol:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:aws-cbor-protocol:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:aws-cbor-protocol:2.46.17=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:aws-core:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath software.amazon.awssdk:aws-core:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:aws-core:2.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:aws-core:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-core:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:aws-core:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:aws-core:2.46.17=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:aws-json-protocol:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath software.amazon.awssdk:aws-json-protocol:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:aws-json-protocol:2.2.0=testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:aws-json-protocol:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-json-protocol:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:aws-json-protocol:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:aws-json-protocol:2.46.17=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:aws-query-protocol:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:aws-query-protocol:2.2.0=testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:aws-query-protocol:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-query-protocol:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:aws-query-protocol:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:aws-query-protocol:2.46.17=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:aws-xml-protocol:2.18.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:aws-xml-protocol:2.2.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:aws-xml-protocol:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:checksums-spi:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:checksums-spi:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:checksums-spi:2.46.17=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:checksums:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:checksums:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:checksums:2.46.17=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:crt-core:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:dynamodb:2.2.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:dynamodb:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -269,57 +273,57 @@ software.amazon.awssdk:endpoints-spi:2.18.40=dsmForkedTestCompileClasspath,dsmFo software.amazon.awssdk:endpoints-spi:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:endpoints-spi:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:endpoints-spi:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:endpoints-spi:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:endpoints-spi:2.46.17=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:eventbridge:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:eventbridge:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath software.amazon.awssdk:eventbridge:2.7.4=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath -software.amazon.awssdk:http-auth-aws-eventstream:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws-eventstream:2.46.17=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:http-auth-aws:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:http-auth-aws:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws:2.46.17=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:http-auth-spi:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:http-auth-spi:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:http-auth-spi:2.46.17=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:http-auth:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:http-auth:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:http-auth:2.46.17=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:http-client-spi:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath software.amazon.awssdk:http-client-spi:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:http-client-spi:2.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:http-client-spi:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-client-spi:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:http-client-spi:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:http-client-spi:2.46.17=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:identity-spi:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:identity-spi:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:identity-spi:2.46.17=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:json-utils:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath software.amazon.awssdk:json-utils:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:json-utils:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:json-utils:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:json-utils:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:json-utils:2.46.17=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:kinesis:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:kinesis:2.2.0=testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:kinesis:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:kinesis:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:kinesis:2.46.17=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:metrics-spi:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath software.amazon.awssdk:metrics-spi:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:metrics-spi:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:metrics-spi:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:metrics-spi:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:metrics-spi:2.46.17=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.19.0=payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.2.0=testRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.20.33=latestDepTestRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.25.40=latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:netty-nio-client:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:netty-nio-client:2.46.17=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:profiles:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath software.amazon.awssdk:profiles:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:profiles:2.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:profiles:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:profiles:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:profiles:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:profiles:2.46.17=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:protocol-core:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath software.amazon.awssdk:protocol-core:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:protocol-core:2.2.0=testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:protocol-core:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:protocol-core:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:protocol-core:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:protocol-core:2.46.17=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:rds:2.2.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:rds:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:regions:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath @@ -327,9 +331,9 @@ software.amazon.awssdk:regions:2.19.0=payloadTaggingForkedTestCompileClasspath,p software.amazon.awssdk:regions:2.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:regions:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:regions:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:regions:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath -software.amazon.awssdk:retries-spi:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath -software.amazon.awssdk:retries:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:regions:2.46.17=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:retries-spi:2.46.17=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:retries:2.46.17=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:s3:2.18.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:s3:2.2.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:s3:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -338,12 +342,12 @@ software.amazon.awssdk:sdk-core:2.19.0=payloadTaggingForkedTestCompileClasspath, software.amazon.awssdk:sdk-core:2.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:sdk-core:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sdk-core:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:sdk-core:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:sdk-core:2.46.17=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:sns:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:sns:2.2.0=testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:sns:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sns:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:sns:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:sns:2.46.17=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:sqs:2.18.40=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:sqs:2.2.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:sqs:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -352,17 +356,17 @@ software.amazon.awssdk:third-party-jackson-core:2.18.40=dsmForkedTestCompileClas software.amazon.awssdk:third-party-jackson-core:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:third-party-jackson-core:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:third-party-jackson-core:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:third-party-jackson-core:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:third-party-jackson-core:2.46.17=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:third-party-jackson-dataformat-cbor:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:third-party-jackson-dataformat-cbor:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:third-party-jackson-dataformat-cbor:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath -software.amazon.awssdk:utils-lite:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:third-party-jackson-dataformat-cbor:2.46.17=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:utils-lite:2.46.17=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:utils:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath software.amazon.awssdk:utils:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:utils:2.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:utils:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:utils:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:utils:2.46.15=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:utils:2.46.17=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.eventstream:eventstream:1.0.1=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon:flow:1.7=compileClasspath,testCompileClasspath,testRuntimeClasspath empty=spotbugsPlugins diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sfn-2.0/gradle.lockfile b/dd-java-agent/instrumentation/aws-java/aws-java-sfn-2.0/gradle.lockfile index 01e581d2017..ce836f0d5c0 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sfn-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sfn-2.0/gradle.lockfile @@ -39,12 +39,15 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -120,6 +123,7 @@ org.hamcrest:hamcrest:3.0=latestDepForkedTestCompileClasspath,latestDepForkedTes org.jctools:jctools-core-jdk11:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jetbrains:annotations:17.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -164,45 +168,45 @@ org.tabletest:tabletest-parser:1.2.0=latestDepForkedTestCompileClasspath,latestD org.testcontainers:testcontainers:1.21.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.xmlresolver:xmlresolver:5.3.3=spotbugs software.amazon.awssdk:annotations:2.15.35=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:annotations:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:annotations:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:apache-client:2.15.35=testRuntimeClasspath -software.amazon.awssdk:apache5-client:2.46.15=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:apache5-client:2.46.17=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:auth:2.15.35=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:auth:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:auth:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-core:2.15.35=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:aws-core:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:aws-core:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-json-protocol:2.15.35=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:aws-json-protocol:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:checksums-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:checksums:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:endpoints-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:http-auth-aws-eventstream:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:http-auth-aws:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:http-auth-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:http-auth:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:aws-json-protocol:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:checksums-spi:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:checksums:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:endpoints-spi:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws-eventstream:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-spi:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-client-spi:2.15.35=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-client-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:identity-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:json-utils:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-client-spi:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:identity-spi:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:json-utils:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:metrics-spi:2.15.35=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:metrics-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:metrics-spi:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.15.35=testRuntimeClasspath -software.amazon.awssdk:netty-nio-client:2.46.15=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:netty-nio-client:2.46.17=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:profiles:2.15.35=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:profiles:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:profiles:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:protocol-core:2.15.35=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:protocol-core:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:protocol-core:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:regions:2.15.35=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:regions:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:retries-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:retries:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:regions:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:retries-spi:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:retries:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sdk-core:2.15.35=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:sdk-core:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:sdk-core:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sfn:2.15.35=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:sfn:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:third-party-jackson-core:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:utils-lite:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:sfn:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:third-party-jackson-core:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:utils-lite:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:utils:2.15.35=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:utils:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:utils:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.eventstream:eventstream:1.0.1=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath empty=spotbugsPlugins diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/gradle.lockfile b/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/gradle.lockfile index a838324c7e9..164922c2825 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/gradle.lockfile @@ -53,11 +53,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -120,6 +123,7 @@ org.hamcrest:hamcrest:3.0=latestDepForkedTestCompileClasspath,latestDepForkedTes org.jctools:jctools-core-jdk11:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jetbrains:annotations:17.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/gradle.lockfile b/dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/gradle.lockfile index 48082e375c8..5ce46795849 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/gradle.lockfile @@ -36,12 +36,15 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -115,6 +118,7 @@ org.hamcrest:hamcrest:3.0=latestDepForkedTestCompileClasspath,latestDepForkedTes org.jctools:jctools-core-jdk11:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jetbrains:annotations:17.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -158,56 +162,56 @@ org.testcontainers:localstack:1.21.4=latestDepForkedTestCompileClasspath,latestD org.testcontainers:testcontainers:1.21.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.xmlresolver:xmlresolver:5.3.3=spotbugs software.amazon.awssdk:annotations:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:annotations:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:annotations:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:apache-client:2.25.40=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -software.amazon.awssdk:apache5-client:2.46.15=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:apache5-client:2.46.17=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:auth:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:auth:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:auth:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-core:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:aws-core:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:aws-core:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-json-protocol:2.25.40=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:aws-query-protocol:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:aws-query-protocol:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:aws-query-protocol:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:checksums-spi:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:checksums-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:checksums-spi:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:checksums:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:checksums:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:checksums:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:endpoints-spi:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:endpoints-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:http-auth-aws-eventstream:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:endpoints-spi:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws-eventstream:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth-aws:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth-aws:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth-spi:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-spi:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-client-spi:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-client-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-client-spi:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:identity-spi:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:identity-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:identity-spi:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:json-utils:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:json-utils:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:json-utils:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:metrics-spi:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:metrics-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:metrics-spi:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.25.40=testRuntimeClasspath -software.amazon.awssdk:netty-nio-client:2.46.15=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:netty-nio-client:2.46.17=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:profiles:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:profiles:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:profiles:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:protocol-core:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:protocol-core:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:protocol-core:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:regions:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:regions:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:retries-spi:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:retries:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:regions:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:retries-spi:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:retries:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sdk-core:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:sdk-core:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:sdk-core:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sns:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:sns:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:sns:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sqs:2.25.40=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:third-party-jackson-core:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:third-party-jackson-core:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:utils-lite:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:third-party-jackson-core:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:utils-lite:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:utils:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:utils:2.46.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:utils:2.46.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.eventstream:eventstream:1.0.1=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath empty=spotbugsPlugins diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/gradle.lockfile b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/gradle.lockfile index 23107bb36ce..4d642f8c698 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/gradle.lockfile @@ -56,11 +56,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -137,6 +140,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepForkedTestRuntimeClasspath,latestDepTest org.hamcrest:hamcrest:3.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/gradle.lockfile b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/gradle.lockfile index ebc67d7bd58..15c4d0acd9a 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/gradle.lockfile @@ -34,11 +34,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -126,6 +129,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepForkedTestRuntimeClasspath,latestDepTest org.hamcrest:hamcrest:3.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/axis2-1.3/gradle.lockfile b/dd-java-agent/instrumentation/axis2-1.3/gradle.lockfile index 2e7a971ff5b..bba1f964f74 100644 --- a/dd-java-agent/instrumentation/axis2-1.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/axis2-1.3/gradle.lockfile @@ -36,11 +36,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -131,6 +134,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepForkedTestRuntimeClasspath,latestDepTest org.hamcrest:hamcrest:3.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/axway-api-7.5/gradle.lockfile b/dd-java-agent/instrumentation/axway-api-7.5/gradle.lockfile index 5f3be685d07..a335a95d13a 100644 --- a/dd-java-agent/instrumentation/axway-api-7.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/axway-api-7.5/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -82,6 +85,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/azure-functions-1.2.2/gradle.lockfile b/dd-java-agent/instrumentation/azure-functions-1.2.2/gradle.lockfile index 95e8622a65b..0c1cbd3291b 100644 --- a/dd-java-agent/instrumentation/azure-functions-1.2.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/azure-functions-1.2.2/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.microsoft.azure.functions:azure-functions-java-core-library:1.3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.microsoft.azure.functions:azure-functions-java-library:1.2.2=compileClasspath,testCompileClasspath,testRuntimeClasspath @@ -85,6 +88,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/caffeine-1.0/gradle.lockfile b/dd-java-agent/instrumentation/caffeine-1.0/gradle.lockfile index c148600f795..eb9749cd4fe 100644 --- a/dd-java-agent/instrumentation/caffeine-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/caffeine-1.0/gradle.lockfile @@ -34,11 +34,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -84,6 +87,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/cdi-1.2/gradle.lockfile b/dd-java-agent/instrumentation/cdi-1.2/gradle.lockfile index 5d6bd921693..d2a914b617d 100644 --- a/dd-java-agent/instrumentation/cdi-1.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/cdi-1.2/gradle.lockfile @@ -32,12 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:18.0=testCompileClasspath,testRuntimeClasspath -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -106,6 +108,7 @@ org.jboss.weld:weld-spi:2.3.Final=testCompileClasspath,testRuntimeClasspath org.jboss.weld:weld-spi:2.4.SP2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/cics-9.1/gradle.lockfile b/dd-java-agent/instrumentation/cics-9.1/gradle.lockfile index 8806629b117..a7961372b32 100644 --- a/dd-java-agent/instrumentation/cics-9.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/cics-9.1/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -84,6 +87,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/commons-codec-1.1/gradle.lockfile b/dd-java-agent/instrumentation/commons-codec-1.1/gradle.lockfile index 03ef3b586fd..3216ee5ea2f 100644 --- a/dd-java-agent/instrumentation/commons-codec-1.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/commons-codec-1.1/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,csiCo com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -83,6 +86,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/commons-fileupload-1.5/gradle.lockfile b/dd-java-agent/instrumentation/commons-fileupload-1.5/gradle.lockfile index 6baabbfb840..8308098f6b0 100644 --- a/dd-java-agent/instrumentation/commons-fileupload-1.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/commons-fileupload-1.5/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -85,6 +88,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/commons-httpclient-2.0/gradle.lockfile b/dd-java-agent/instrumentation/commons-httpclient-2.0/gradle.lockfile index 2e49d415c32..ae2e9a50da7 100644 --- a/dd-java-agent/instrumentation/commons-httpclient-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/commons-httpclient-2.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -88,6 +91,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/commons-lang/commons-lang-2.1/gradle.lockfile b/dd-java-agent/instrumentation/commons-lang/commons-lang-2.1/gradle.lockfile index 3e5b4b59fa9..0ac30c9fdcf 100644 --- a/dd-java-agent/instrumentation/commons-lang/commons-lang-2.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/commons-lang/commons-lang-2.1/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,csiCo com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -84,6 +87,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/commons-lang/commons-lang-3.5/gradle.lockfile b/dd-java-agent/instrumentation/commons-lang/commons-lang-3.5/gradle.lockfile index ec54d3d1d58..3f1ab96eef0 100644 --- a/dd-java-agent/instrumentation/commons-lang/commons-lang-3.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/commons-lang/commons-lang-3.5/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,csiCo com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -84,6 +87,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/commons-text-1.0/gradle.lockfile b/dd-java-agent/instrumentation/commons-text-1.0/gradle.lockfile index a1bf3d46369..03c9b3c1746 100644 --- a/dd-java-agent/instrumentation/commons-text-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/commons-text-1.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,csiCo com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -86,6 +89,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/confluent-schema-registry/confluent-schema-registry-4.1/gradle.lockfile b/dd-java-agent/instrumentation/confluent-schema-registry/confluent-schema-registry-4.1/gradle.lockfile index cd483be8800..c7b39a4e52a 100644 --- a/dd-java-agent/instrumentation/confluent-schema-registry/confluent-schema-registry-4.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/confluent-schema-registry/confluent-schema-registry-4.1/gradle.lockfile @@ -48,15 +48,16 @@ com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnno com.google.auto:auto-common:1.2.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs -com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor +com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.errorprone:error_prone_annotations:2.5.1=testCompileClasspath,testRuntimeClasspath -com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -com.google.guava:guava:30.1.1-jre=testCompileClasspath,testRuntimeClasspath -com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -com.google.j2objc:j2objc-annotations:1.3=testCompileClasspath,testRuntimeClasspath -com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.6=latestDepTestCompileClasspath,testCompileClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -124,8 +125,7 @@ org.apache.logging.log4j:log4j-api:2.25.2=spotbugs org.apache.logging.log4j:log4j-core:2.25.2=spotbugs org.apache.zookeeper:zookeeper:3.4.10=compileClasspath org.apiguardian:apiguardian-api:1.1.2=latestDepTestCompileClasspath,testCompileClasspath -org.checkerframework:checker-qual:3.33.0=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor -org.checkerframework:checker-qual:3.8.0=testCompileClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.33.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor org.codehaus.groovy:groovy-ant:3.0.23=codenarc org.codehaus.groovy:groovy-docgenerator:3.0.23=codenarc org.codehaus.groovy:groovy-groovydoc:3.0.23=codenarc @@ -144,6 +144,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-2.0/gradle.lockfile b/dd-java-agent/instrumentation/couchbase/couchbase-2.0/gradle.lockfile index 7b41eec810d..91c7444cc2c 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/couchbase/couchbase-2.0/gradle.lockfile @@ -47,11 +47,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -102,6 +105,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-2.6/gradle.lockfile b/dd-java-agent/instrumentation/couchbase/couchbase-2.6/gradle.lockfile index 6676f88cf96..1d6d2d393e2 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-2.6/gradle.lockfile +++ b/dd-java-agent/instrumentation/couchbase/couchbase-2.6/gradle.lockfile @@ -47,11 +47,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -100,6 +103,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/gradle.lockfile b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/gradle.lockfile index 10475f88081..a234e91b38d 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/gradle.lockfile @@ -40,11 +40,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -94,6 +97,7 @@ org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClas org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jetbrains:annotations:17.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/gradle.lockfile b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/gradle.lockfile index 912a7279183..df658a96303 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/gradle.lockfile @@ -40,11 +40,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -94,7 +97,7 @@ org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClas org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jetbrains:annotations:17.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/cucumber-5.4/gradle.lockfile b/dd-java-agent/instrumentation/cucumber-5.4/gradle.lockfile index 4e09906f45c..5b84bd680ed 100644 --- a/dd-java-agent/instrumentation/cucumber-5.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/cucumber-5.4/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -49,28 +52,28 @@ commons-io:commons-io:2.20.0=spotbugs de.thetaphi:forbiddenapis:3.10=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.cucumber:ci-environment:12.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:cucumber-core:5.4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.cucumber:cucumber-core:7.34.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:cucumber-core:7.34.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:cucumber-expressions:18.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:cucumber-expressions:8.3.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.cucumber:cucumber-gherkin-messages:7.34.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:cucumber-gherkin-messages:7.34.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:cucumber-gherkin-vintage:5.4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath io.cucumber:cucumber-gherkin:5.4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.cucumber:cucumber-gherkin:7.34.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:cucumber-gherkin:7.34.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:cucumber-java:5.4.0=testCompileClasspath,testRuntimeClasspath -io.cucumber:cucumber-java:7.34.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:cucumber-java:7.34.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:cucumber-json-formatter:0.3.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:cucumber-junit-platform-engine:5.4.0=testCompileClasspath,testRuntimeClasspath -io.cucumber:cucumber-junit-platform-engine:7.34.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:cucumber-junit-platform-engine:7.34.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:cucumber-plugin:5.4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.cucumber:cucumber-plugin:7.34.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:cucumber-plugin:7.34.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:datatable:3.3.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.cucumber:datatable:7.34.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:datatable:7.34.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:docstring:5.4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.cucumber:docstring:7.34.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:docstring:7.34.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:gherkin:36.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:html-formatter:22.3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:junit-xml-formatter:0.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.cucumber:messages-ndjson:0.3.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:messages-ndjson:0.3.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:messages:30.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:pretty-formatter:2.4.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:query:14.7.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -115,6 +118,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/cxf-2.1/gradle.lockfile b/dd-java-agent/instrumentation/cxf-2.1/gradle.lockfile index b8211784b3c..d86083a9a82 100644 --- a/dd-java-agent/instrumentation/cxf-2.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/cxf-2.1/gradle.lockfile @@ -35,11 +35,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,cxf3L com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,cxf3LatestDepTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,cxf3LatestDepTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,cxf3LatestDepTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,cxf3LatestDepTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,cxf3LatestDepTestAnnotationProcessor,cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,cxf3LatestDepTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=cxf3LatestDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -162,7 +165,7 @@ org.hamcrest:hamcrest-core:1.3=cxf3LatestDepTestRuntimeClasspath,latestDepTestRu org.hamcrest:hamcrest:3.0=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=cxf3LatestDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=cxf3LatestDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.jspecify:jspecify:1.0.0=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=cxf3LatestDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/gradle.lockfile b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/gradle.lockfile index a732f15fb26..c9effb4a50a 100644 --- a/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/gradle.lockfile +++ b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -82,6 +85,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/datadog/dynamic-instrumentation/span-origin/gradle.lockfile b/dd-java-agent/instrumentation/datadog/dynamic-instrumentation/span-origin/gradle.lockfile index a1b1dd0b541..1290a7b6753 100644 --- a/dd-java-agent/instrumentation/datadog/dynamic-instrumentation/span-origin/gradle.lockfile +++ b/dd-java-agent/instrumentation/datadog/dynamic-instrumentation/span-origin/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -82,6 +85,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/datadog/profiling/enable-wallclock-profiling/gradle.lockfile b/dd-java-agent/instrumentation/datadog/profiling/enable-wallclock-profiling/gradle.lockfile index 897a880b4a7..48d08921c6e 100644 --- a/dd-java-agent/instrumentation/datadog/profiling/enable-wallclock-profiling/gradle.lockfile +++ b/dd-java-agent/instrumentation/datadog/profiling/enable-wallclock-profiling/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDep4TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDep4TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDep4TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDep4TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDep4TestAnnotationProcessor,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDep4TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -117,6 +120,7 @@ org.hamcrest:hamcrest-core:1.3=latestDep4TestRuntimeClasspath,latestDepTestRunti org.hamcrest:hamcrest:3.0=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/gradle.lockfile b/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/gradle.lockfile index 6e9385a762b..8f4b1e057e5 100644 --- a/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/gradle.lockfile +++ b/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -83,6 +86,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/gradle.lockfile b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/gradle.lockfile index 969092f78fa..ca5c93d470d 100644 --- a/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/gradle.lockfile +++ b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.newrelic.agent.java:newrelic-api:6.5.4=testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath @@ -83,6 +86,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/datanucleus-4.0.5/gradle.lockfile b/dd-java-agent/instrumentation/datanucleus-4.0.5/gradle.lockfile index a4f74158b1a..f32c0056e9a 100644 --- a/dd-java-agent/instrumentation/datanucleus-4.0.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/datanucleus-4.0.5/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.h2database:h2:1.3.169=testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath @@ -88,6 +91,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.8/gradle.lockfile b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.8/gradle.lockfile index 8048b03e1f5..a2686909e08 100644 --- a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.8/gradle.lockfile @@ -45,11 +45,15 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:19.0=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:19.0=compileClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -103,6 +107,7 @@ org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClas org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jetbrains:annotations:17.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/gradle.lockfile b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/gradle.lockfile index 6f2bd366da3..76874476e8f 100644 --- a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/gradle.lockfile @@ -60,11 +60,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:19.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -131,6 +134,7 @@ org.hdrhistogram:HdrHistogram:2.1.12=latestDepTestCompileClasspath,latestDepTest org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jetbrains:annotations:17.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/drools/drools-6.0/gradle.lockfile b/dd-java-agent/instrumentation/drools/drools-6.0/gradle.lockfile index faa1ae65d3c..ad897adb4d7 100644 --- a/dd-java-agent/instrumentation/drools/drools-6.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/drools/drools-6.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latest7TestAnnotationProcessor,latest8TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latest7TestCompileClasspath,latest7TestRuntimeClasspath,latest8TestCompileClasspath,latest8TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latest7TestAnnotationProcessor,latest8TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latest7TestCompileClasspath,latest7TestRuntimeClasspath,latest8TestCompileClasspath,latest8TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latest7TestCompileClasspath,latest7TestRuntimeClasspath,latest8TestCompileClasspath,latest8TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latest7TestAnnotationProcessor,latest8TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latest7TestAnnotationProcessor,latest8TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latest7TestCompileClasspath,latest7TestRuntimeClasspath,latest8TestCompileClasspath,latest8TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latest7TestAnnotationProcessor,latest7TestCompileClasspath,latest7TestRuntimeClasspath,latest8TestAnnotationProcessor,latest8TestCompileClasspath,latest8TestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latest7TestAnnotationProcessor,latest8TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latest7TestCompileClasspath,latest7TestRuntimeClasspath,latest8TestCompileClasspath,latest8TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.protobuf:protobuf-java:2.5.0=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latest7TestRuntimeClasspath,latest8TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latest7TestCompileClasspath,latest7TestRuntimeClasspath,latest8TestCompileClasspath,latest8TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -130,6 +133,7 @@ org.hamcrest:hamcrest-core:1.3=latest7TestRuntimeClasspath,latest8TestRuntimeCla org.hamcrest:hamcrest:3.0=latest7TestCompileClasspath,latest7TestRuntimeClasspath,latest8TestCompileClasspath,latest8TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latest7TestRuntimeClasspath,latest8TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latest7TestRuntimeClasspath,latest8TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latest7TestCompileClasspath,latest7TestRuntimeClasspath,latest8TestCompileClasspath,latest8TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latest7TestCompileClasspath,latest7TestRuntimeClasspath,latest8TestCompileClasspath,latest8TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latest7TestRuntimeClasspath,latest8TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latest7TestCompileClasspath,latest7TestRuntimeClasspath,latest8TestCompileClasspath,latest8TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/dropwizard/dropwizard-views-0.7/gradle.lockfile b/dd-java-agent/instrumentation/dropwizard/dropwizard-views-0.7/gradle.lockfile index e54f1ae021f..351cc0252b5 100644 --- a/dd-java-agent/instrumentation/dropwizard/dropwizard-views-0.7/gradle.lockfile +++ b/dd-java-agent/instrumentation/dropwizard/dropwizard-views-0.7/gradle.lockfile @@ -55,11 +55,15 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:16.0.1=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:16.0.1=compileClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -141,6 +145,7 @@ org.hibernate:hibernate-validator:5.0.2.Final=compileClasspath,testCompileClassp org.jboss.logging:jboss-logging:3.1.1.GA=compileClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-common/gradle.lockfile b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-common/gradle.lockfile index ea3cb8b1756..14e945c01cf 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-common/gradle.lockfile @@ -37,12 +37,15 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:18.0=compileClasspath -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.ning:compress-lzf:1.0.2=compileClasspath com.spatial4j:spatial4j:0.4.1=compileClasspath @@ -118,6 +121,7 @@ org.hdrhistogram:HdrHistogram:2.1.6=compileClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath org.joda:joda-convert:1.2=compileClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-5.0/gradle.lockfile b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-5.0/gradle.lockfile index 668737ae814..66335e0ff37 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-5.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-5.0/gradle.lockfile @@ -41,11 +41,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -158,6 +161,7 @@ org.hdrhistogram:HdrHistogram:2.1.9=latestDepTestCompileClasspath,latestDepTestR org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.joda:joda-convert:1.2=testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-6.4/gradle.lockfile b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-6.4/gradle.lockfile index e5a03eb798d..ff2c0654de6 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-6.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-6.4/gradle.lockfile @@ -42,11 +42,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -173,6 +176,7 @@ org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClas org.hdrhistogram:HdrHistogram:2.1.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-7.0/gradle.lockfile b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-7.0/gradle.lockfile index ab40e83d3b9..d959e0fd896 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-7.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-7.0/gradle.lockfile @@ -43,11 +43,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -177,6 +180,7 @@ org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClas org.hdrhistogram:HdrHistogram:2.1.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-2.0/gradle.lockfile b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-2.0/gradle.lockfile index e62635d9604..ece7d50df20 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-2.0/gradle.lockfile @@ -48,11 +48,15 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:18.0=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:18.0=compileClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.ning:compress-lzf:1.0.2=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.spatial4j:spatial4j:0.4.1=compileClasspath @@ -161,6 +165,7 @@ org.hdrhistogram:HdrHistogram:2.1.6=compileClasspath,latestDepTestCompileClasspa org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.joda:joda-convert:1.2=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.0/gradle.lockfile b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.0/gradle.lockfile index 5aa7484b118..d5a32ddcc2c 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.0/gradle.lockfile @@ -38,11 +38,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -134,6 +137,7 @@ org.hdrhistogram:HdrHistogram:2.1.6=compileClasspath,testCompileClasspath,testRu org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath org.joda:joda-convert:1.2=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.3/gradle.lockfile b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.3/gradle.lockfile index 9e2c3d02390..3907a2122fb 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.3/gradle.lockfile @@ -43,11 +43,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -210,6 +213,7 @@ org.hdrhistogram:HdrHistogram:2.1.6=compileClasspath org.hdrhistogram:HdrHistogram:2.1.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-6.0/gradle.lockfile b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-6.0/gradle.lockfile index 1d5831e451d..ea32b095f79 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-6.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-6.0/gradle.lockfile @@ -42,11 +42,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -176,6 +179,7 @@ org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClas org.hdrhistogram:HdrHistogram:2.1.9=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-7.3/gradle.lockfile b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-7.3/gradle.lockfile index d75ee461a10..52f20a04cd0 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-7.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-7.3/gradle.lockfile @@ -43,11 +43,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -184,6 +187,7 @@ org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClas org.hdrhistogram:HdrHistogram:2.1.9=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-common/gradle.lockfile b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-common/gradle.lockfile index e5b4ddd9a3a..2761a60dd09 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-common/gradle.lockfile @@ -38,11 +38,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -137,6 +140,7 @@ org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.hdrhistogram:HdrHistogram:2.1.9=compileClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/finatra-2.9/gradle.lockfile b/dd-java-agent/instrumentation/finatra-2.9/gradle.lockfile index 48aae83a4e5..f3d702f9a0a 100644 --- a/dd-java-agent/instrumentation/finatra-2.9/gradle.lockfile +++ b/dd-java-agent/instrumentation/finatra-2.9/gradle.lockfile @@ -60,14 +60,14 @@ com.google.auto:auto-common:1.2.1=annotationProcessor,latestDepTestAnnotationPro com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPre207TestAnnotationProcessor,latestPre207TestCompileClasspath,latestPre207TestRuntimeClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,latestPre207TestAnnotationProcessor,testAnnotationProcessor -com.google.errorprone:error_prone_annotations:2.3.3=latestPre207TestCompileClasspath,latestPre207TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.errorprone:error_prone_annotations:2.4.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPre207TestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:19.0=compileClasspath,latestPre207TestCompileClasspath,latestPre207TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.guava:guava:27.1-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPre207TestCompileClasspath,latestPre207TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,latestPre207TestAnnotationProcessor,testAnnotationProcessor +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPre207TestCompileClasspath,latestPre207TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:19.0=compileClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,latestPre207TestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPre207TestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPre207TestCompileClasspath,latestPre207TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPre207TestAnnotationProcessor,latestPre207TestCompileClasspath,latestPre207TestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.inject.extensions:guice-assistedinject:4.0=compileClasspath com.google.inject.extensions:guice-assistedinject:4.1.0=latestPre207TestCompileClasspath,latestPre207TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.inject.extensions:guice-assistedinject:4.2.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -75,8 +75,8 @@ com.google.inject.extensions:guice-multibindings:4.1.0=compileClasspath,latestPr com.google.inject.extensions:guice-multibindings:4.2.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.inject:guice:4.1.0=compileClasspath,latestPre207TestCompileClasspath,latestPre207TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.inject:guice:4.2.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.google.j2objc:j2objc-annotations:1.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,latestPre207TestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPre207TestCompileClasspath,latestPre207TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,latestPre207TestRuntimeClasspath,testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.netflix.concurrency-limits:concurrency-limits-core:0.3.0=latestPre207TestCompileClasspath,latestPre207TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -317,7 +317,6 @@ org.codehaus.groovy:groovy-templates:3.0.23=codenarc org.codehaus.groovy:groovy-xml:3.0.23=codenarc org.codehaus.groovy:groovy:3.0.23=codenarc org.codehaus.groovy:groovy:3.0.25=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPre207TestCompileClasspath,latestPre207TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.codehaus.mojo:animal-sniffer-annotations:1.17=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.codenarc:CodeNarc:3.7.0=codenarc org.dom4j:dom4j:2.2.0=spotbugs org.fusesource.jansi:jansi:2.4.1=zinc @@ -336,6 +335,7 @@ org.joda:joda-convert:2.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl org.json4s:json4s-ast_2.11:3.6.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPre207TestCompileClasspath,latestPre207TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.json4s:json4s-core_2.11:3.6.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPre207TestCompileClasspath,latestPre207TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.json4s:json4s-scalap_2.11:3.6.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPre207TestCompileClasspath,latestPre207TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPre207TestCompileClasspath,latestPre207TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPre207TestCompileClasspath,latestPre207TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,latestPre207TestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPre207TestCompileClasspath,latestPre207TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/gradle.lockfile b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/gradle.lockfile index fd3f0ebff6a..38e9878abde 100644 --- a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/gradle.lockfile +++ b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,csiCo com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -84,6 +87,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.9/gradle.lockfile b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.9/gradle.lockfile index 4da1680020a..edbe4db8ad1 100644 --- a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.9/gradle.lockfile +++ b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.9/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor,version2_3_23TestAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath,version2_3_23TestCompileClasspath,version2_3_23TestRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor,version2_3_23TestAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath,version2_3_23TestCompileClasspath,version2_3_23TestRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath,version2_3_23TestCompileClasspath,version2_3_23TestRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor,version2_3_23TestAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,version2_3_23TestAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath,version2_3_23TestCompileClasspath,version2_3_23TestRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath,version2_3_23TestAnnotationProcessor,version2_3_23TestCompileClasspath,version2_3_23TestRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor,version2_3_23TestAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath,version2_3_23TestCompileClasspath,version2_3_23TestRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath,version2_3_23TestRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath,version2_3_23TestCompileClasspath,version2_3_23TestRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath,version2_3_23TestCompileClasspath,version2_3_23TestRuntimeClasspath @@ -84,6 +87,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath,version2_3_23TestRuntimeClas org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath,version2_3_23TestCompileClasspath,version2_3_23TestRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath,version2_3_23TestRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath,version2_3_23TestRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath,version2_3_23TestCompileClasspath,version2_3_23TestRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath,version2_3_23TestCompileClasspath,version2_3_23TestRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath,version2_3_23TestRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath,version2_3_23TestCompileClasspath,version2_3_23TestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/gax-1.4/gradle.lockfile b/dd-java-agent/instrumentation/gax-1.4/gradle.lockfile index dfa246c2059..5bb1e5c654b 100644 --- a/dd-java-agent/instrumentation/gax-1.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/gax-1.4/gradle.lockfile @@ -44,19 +44,20 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.48.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.google.guava:guava:19.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:19.0=compileClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:33.5.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.http-client:google-http-client-gson:2.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.http-client:google-http-client-jackson2:1.19.0=compileClasspath,testCompileClasspath,testRuntimeClasspath com.google.http-client:google-http-client:1.19.0=compileClasspath,testCompileClasspath,testRuntimeClasspath com.google.http-client:google-http-client:2.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.protobuf:protobuf-java-util:4.33.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.protobuf:protobuf-java:4.33.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -116,7 +117,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath -org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/google-http-client-1.19/gradle.lockfile b/dd-java-agent/instrumentation/google-http-client-1.19/gradle.lockfile index 8385b04246f..bb7ef4befee 100644 --- a/dd-java-agent/instrumentation/google-http-client-1.19/gradle.lockfile +++ b/dd-java-agent/instrumentation/google-http-client-1.19/gradle.lockfile @@ -31,18 +31,17 @@ com.google.auto:auto-common:1.2.1=annotationProcessor,latestDepTestAnnotationPro com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.errorprone:error_prone_annotations:2.36.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:33.4.8-android=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.http-client:google-http-client:1.19.0=compileClasspath,testCompileClasspath,testRuntimeClasspath com.google.http-client:google-http-client:2.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.j2objc:j2objc-annotations:3.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -99,7 +98,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath -org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/google-pubsub-1.116/gradle.lockfile b/dd-java-agent/instrumentation/google-pubsub-1.116/gradle.lockfile index 93338736b48..19b5655c006 100644 --- a/dd-java-agent/instrumentation/google-pubsub-1.116/gradle.lockfile +++ b/dd-java-agent/instrumentation/google-pubsub-1.116/gradle.lockfile @@ -57,23 +57,24 @@ com.google.cloud:google-cloud-pubsub:1.151.0=latestDepForkedTestCompileClasspath com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs com.google.code.gson:gson:2.9.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.errorprone:error_prone_annotations:2.11.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.11.0=compileClasspath com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.48.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.google.guava:failureaccess:1.0.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -com.google.guava:failureaccess:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.google.guava:guava:31.0.1-jre=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:failureaccess:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:31.0.1-jre=compileClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:33.5.0-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.guava:guava:33.6.0-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.http-client:google-http-client-gson:1.41.4=compileClasspath,testCompileClasspath,testRuntimeClasspath com.google.http-client:google-http-client-gson:2.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.http-client:google-http-client:1.41.4=compileClasspath,testCompileClasspath,testRuntimeClasspath com.google.http-client:google-http-client:2.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath -com.google.j2objc:j2objc-annotations:1.3=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:1.3=compileClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.j2objc:j2objc-annotations:3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.protobuf:protobuf-java-util:3.19.4=testRuntimeClasspath com.google.protobuf:protobuf-java-util:4.33.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.protobuf:protobuf-java:3.19.4=compileClasspath,testCompileClasspath,testRuntimeClasspath @@ -176,7 +177,7 @@ org.hamcrest:hamcrest:3.0=latestDepForkedTestCompileClasspath,latestDepForkedTes org.jctools:jctools-core-jdk11:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jetbrains:annotations:17.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/graal/graal-native-image-20.0/gradle.lockfile b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/gradle.lockfile index 2b30c6d1d0f..06c6ca52244 100644 --- a/dd-java-agent/instrumentation/graal/graal-native-image-20.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -95,6 +98,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/graal/gradle.lockfile b/dd-java-agent/instrumentation/graal/gradle.lockfile index 4f474c1717c..88e02ecad19 100644 --- a/dd-java-agent/instrumentation/graal/gradle.lockfile +++ b/dd-java-agent/instrumentation/graal/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -82,6 +85,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/gradle-testing-5.1/gradle.lockfile b/dd-java-agent/instrumentation/gradle-testing-5.1/gradle.lockfile index 2d376bbdc96..d7adb4dbbf5 100644 --- a/dd-java-agent/instrumentation/gradle-testing-5.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/gradle-testing-5.1/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -82,6 +85,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/gradle/gradle-3.0/gradle.lockfile b/dd-java-agent/instrumentation/gradle/gradle-3.0/gradle.lockfile index cbada565a76..03d350e4c75 100644 --- a/dd-java-agent/instrumentation/gradle/gradle-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/gradle/gradle-3.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -82,6 +85,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/gradle/gradle-8.3/gradle.lockfile b/dd-java-agent/instrumentation/gradle/gradle-8.3/gradle.lockfile index 8413b0587ad..e33114dd1df 100644 --- a/dd-java-agent/instrumentation/gradle/gradle-8.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/gradle/gradle-8.3/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -82,6 +85,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/gradle.lockfile b/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/gradle.lockfile index f39948bbe98..03d6b88587e 100644 --- a/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.graphql-java:graphql-java:14.0=compileClasspath,testCompileClasspath,testRuntimeClasspath com.graphql-java:graphql-java:19.11=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -87,6 +90,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepForkedTestRuntimeClasspath,latestDepTest org.hamcrest:hamcrest:3.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/gradle.lockfile b/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/gradle.lockfile index cc7d500fd86..bf571a416e3 100644 --- a/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,graph com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,graphql20LatestDepForkedTestAnnotationProcessor,graphql20LatestDepTestAnnotationProcessor,graphql21LatestDepForkedTestAnnotationProcessor,graphql21LatestDepTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=graphql20LatestDepForkedTestCompileClasspath,graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestCompileClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestCompileClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestCompileClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,graphql20LatestDepForkedTestAnnotationProcessor,graphql20LatestDepTestAnnotationProcessor,graphql21LatestDepForkedTestAnnotationProcessor,graphql21LatestDepTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=graphql20LatestDepForkedTestCompileClasspath,graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestCompileClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestCompileClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestCompileClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=graphql20LatestDepForkedTestCompileClasspath,graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestCompileClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestCompileClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestCompileClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,graphql20LatestDepForkedTestAnnotationProcessor,graphql20LatestDepTestAnnotationProcessor,graphql21LatestDepForkedTestAnnotationProcessor,graphql21LatestDepTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,graphql20LatestDepForkedTestAnnotationProcessor,graphql20LatestDepTestAnnotationProcessor,graphql21LatestDepForkedTestAnnotationProcessor,graphql21LatestDepTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=graphql20LatestDepForkedTestCompileClasspath,graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestCompileClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestCompileClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestCompileClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,graphql20LatestDepForkedTestAnnotationProcessor,graphql20LatestDepForkedTestCompileClasspath,graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestAnnotationProcessor,graphql20LatestDepTestCompileClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestAnnotationProcessor,graphql21LatestDepForkedTestCompileClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestAnnotationProcessor,graphql21LatestDepTestCompileClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,graphql20LatestDepForkedTestAnnotationProcessor,graphql20LatestDepTestAnnotationProcessor,graphql21LatestDepForkedTestAnnotationProcessor,graphql21LatestDepTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=graphql20LatestDepForkedTestCompileClasspath,graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestCompileClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestCompileClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestCompileClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.graphql-java:graphql-java:20.0=compileClasspath,testCompileClasspath,testRuntimeClasspath com.graphql-java:graphql-java:20.9=graphql20LatestDepForkedTestCompileClasspath,graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestCompileClasspath,graphql20LatestDepTestRuntimeClasspath @@ -89,6 +92,7 @@ org.hamcrest:hamcrest-core:1.3=graphql20LatestDepForkedTestRuntimeClasspath,grap org.hamcrest:hamcrest:3.0=graphql20LatestDepForkedTestCompileClasspath,graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestCompileClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestCompileClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestCompileClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=graphql20LatestDepForkedTestCompileClasspath,graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestCompileClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestCompileClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestCompileClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=graphql20LatestDepForkedTestCompileClasspath,graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestCompileClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestCompileClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestCompileClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=graphql20LatestDepForkedTestCompileClasspath,graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestCompileClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestCompileClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestCompileClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-common/gradle.lockfile b/dd-java-agent/instrumentation/graphql-java/graphql-java-common/gradle.lockfile index e63effbab8d..94b3ab1b5e0 100644 --- a/dd-java-agent/instrumentation/graphql-java/graphql-java-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/graphql-java/graphql-java-common/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.graphql-java:graphql-java:14.0=compileClasspath com.graphql-java:java-dataloader:2.2.3=compileClasspath @@ -85,6 +88,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/gradle.lockfile b/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/gradle.lockfile index 32718e7a59c..a9c8320f7e3 100644 --- a/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/gradle.lockfile +++ b/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/gradle.lockfile @@ -32,13 +32,15 @@ com.google.auto:auto-common:1.2.1=annotationProcessor,latest5DepTestAnnotationPr com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,latest5DepTestAnnotationProcessor,latest5DepTestCompileClasspath,latest5DepTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestAnnotationProcessor,muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latest5DepTestAnnotationProcessor,latestDepTestAnnotationProcessor,muleLatestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.errorprone:error_prone_annotations:2.38.0=latest5DepTestCompileClasspath com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latest5DepTestCompileClasspath,latest5DepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latest5DepTestAnnotationProcessor,latestDepTestAnnotationProcessor,muleLatestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latest5DepTestCompileClasspath,latest5DepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latest5DepTestCompileClasspath,latest5DepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latest5DepTestAnnotationProcessor,latestDepTestAnnotationProcessor,muleLatestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latest5DepTestAnnotationProcessor,latestDepTestAnnotationProcessor,muleLatestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latest5DepTestCompileClasspath,latest5DepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latest5DepTestAnnotationProcessor,latest5DepTestCompileClasspath,latest5DepTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestAnnotationProcessor,muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latest5DepTestAnnotationProcessor,latestDepTestAnnotationProcessor,muleLatestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latest5DepTestCompileClasspath,latest5DepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latest5DepTestRuntimeClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latest5DepTestCompileClasspath,latest5DepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latest5DepTestCompileClasspath,latest5DepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -103,7 +105,7 @@ org.hamcrest:hamcrest-core:1.3=latest5DepTestRuntimeClasspath,latestDepTestRunti org.hamcrest:hamcrest:3.0=latest5DepTestCompileClasspath,latest5DepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latest5DepTestRuntimeClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latest5DepTestRuntimeClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestRuntimeClasspath,testRuntimeClasspath -org.jspecify:jspecify:1.0.0=latest5DepTestCompileClasspath +org.jspecify:jspecify:1.0.0=latest5DepTestCompileClasspath,latest5DepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latest5DepTestCompileClasspath,latest5DepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latest5DepTestRuntimeClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latest5DepTestCompileClasspath,latest5DepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/gradle.lockfile b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/gradle.lockfile index 54eec4e14e2..4df635a3e6d 100644 --- a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/gradle.lockfile +++ b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -126,6 +129,7 @@ org.javassist:javassist:3.18.1-GA=testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.30.2-GA=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/grpc-1.5/gradle.lockfile b/dd-java-agent/instrumentation/grpc-1.5/gradle.lockfile index 9fe969c021e..9ff58d5ea72 100644 --- a/dd-java-agent/instrumentation/grpc-1.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/grpc-1.5/gradle.lockfile @@ -36,22 +36,22 @@ com.google.code.gson:gson:2.13.2=latestDepTestCompileProtoPath,latestDepTestRunt com.google.code.gson:gson:2.8.6=compileProtoPath,testCompileProtoPath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.48.0=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath -com.google.errorprone:error_prone_annotations:2.5.1=testCompileClasspath -com.google.errorprone:error_prone_annotations:2.9.0=compileProtoPath,testCompileProtoPath,testRuntimeClasspath -com.google.guava:failureaccess:1.0.1=annotationProcessor,compileProtoPath,latestDepTestAnnotationProcessor,testAnnotationProcessor,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath -com.google.guava:guava:30.1.1-android=compileProtoPath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.9.0=compileProtoPath +com.google.guava:failureaccess:1.0.1=annotationProcessor,compileProtoPath,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.google.guava:guava:30.1.1-android=compileProtoPath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:33.5.0-android=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileProtoPath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.google.j2objc:j2objc-annotations:1.3=compileProtoPath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:1.3=compileProtoPath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.google.protobuf:protobuf-java:3.18.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.google.protobuf:protobuf-java:3.25.8=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath com.google.protobuf:protoc:3.17.3=protobufToolsLocator_protoc -com.google.re2j:re2j:1.7=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath @@ -62,21 +62,21 @@ commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestCompileP commons-io:commons-io:2.20.0=spotbugs de.thetaphi:forbiddenapis:3.10=compileClasspath,compileProtoPath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath io.grpc:grpc-api:1.42.2=compileClasspath,compileProtoPath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.grpc:grpc-api:1.82.0=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.grpc:grpc-api:1.82.1=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.grpc:grpc-context:1.42.2=compileClasspath,compileProtoPath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.grpc:grpc-context:1.82.0=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.grpc:grpc-context:1.82.1=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.grpc:grpc-core:1.42.2=compileClasspath,compileProtoPath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.grpc:grpc-core:1.82.0=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath -io.grpc:grpc-inprocess:1.82.0=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.grpc:grpc-core:1.82.1=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.grpc:grpc-inprocess:1.82.1=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.grpc:grpc-netty:1.42.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.grpc:grpc-netty:1.82.0=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.grpc:grpc-netty:1.82.1=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.grpc:grpc-protobuf-lite:1.42.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.grpc:grpc-protobuf-lite:1.82.0=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.grpc:grpc-protobuf-lite:1.82.1=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.grpc:grpc-protobuf:1.42.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.grpc:grpc-protobuf:1.82.0=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.grpc:grpc-protobuf:1.82.1=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.grpc:grpc-stub:1.42.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.grpc:grpc-stub:1.82.0=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath -io.grpc:grpc-util:1.82.0=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.grpc:grpc-stub:1.82.1=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.grpc:grpc-util:1.82.1=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.grpc:protoc-gen-grpc-java:1.42.2=protobufToolsLocator_grpc io.leangen.geantyref:geantyref:1.3.16=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath io.netty:netty-buffer:4.1.133.Final=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath @@ -120,7 +120,7 @@ org.apache.commons:commons-text:1.14.0=spotbugs org.apache.logging.log4j:log4j-api:2.25.2=spotbugs org.apache.logging.log4j:log4j-core:2.25.2=spotbugs org.apiguardian:apiguardian-api:1.1.2=latestDepTestCompileClasspath,testCompileClasspath -org.checkerframework:checker-compat-qual:2.5.5=compileProtoPath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +org.checkerframework:checker-compat-qual:2.5.5=compileProtoPath org.checkerframework:checker-qual:3.33.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor org.codehaus.groovy:groovy-ant:3.0.23=codenarc org.codehaus.groovy:groovy-docgenerator:3.0.23=codenarc @@ -140,7 +140,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestCompileProtoPath,latestDepTestRuntim org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath -org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/gson-1.6/gradle.lockfile b/dd-java-agent/instrumentation/gson-1.6/gradle.lockfile index c1ebd82982e..503c3f6f4b2 100644 --- a/dd-java-agent/instrumentation/gson-1.6/gradle.lockfile +++ b/dd-java-agent/instrumentation/gson-1.6/gradle.lockfile @@ -34,12 +34,15 @@ com.google.code.gson:gson:2.13.2=spotbugs com.google.code.gson:gson:2.14.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.48.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -85,6 +88,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/guava-10.0/build.gradle b/dd-java-agent/instrumentation/guava-10.0/build.gradle index db51a7e8832..3fb88e31638 100644 --- a/dd-java-agent/instrumentation/guava-10.0/build.gradle +++ b/dd-java-agent/instrumentation/guava-10.0/build.gradle @@ -25,6 +25,13 @@ dependencies { latestDepTestImplementation group: 'com.google.guava', name: 'guava', version: '+' } +// Baseline tests should exercise the first Guava version needed by the tests. +['testCompileClasspath', 'testRuntimeClasspath'].each { + configurations.named(it) { + resolutionStrategy.force 'com.google.guava:guava:16.0' + } +} + // Exclude helper class from test execution to avoid JUnit 5.14+ discovering it as test tasks.withType(Test).configureEach { filter { diff --git a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/gradle.lockfile b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/gradle.lockfile index 40beec1cbde..71515cbbf73 100644 --- a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/gradle.lockfile +++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.hazelcast:hazelcast-all:3.6=compileClasspath com.hazelcast:hazelcast-all:3.8=testCompileClasspath,testRuntimeClasspath @@ -85,6 +88,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/gradle.lockfile b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/gradle.lockfile index 2a467e84022..7467848d909 100644 --- a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/gradle.lockfile +++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.hazelcast:hazelcast-all:3.12.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.hazelcast:hazelcast-all:3.9=compileClasspath,testCompileClasspath,testRuntimeClasspath @@ -84,6 +87,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/gradle.lockfile b/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/gradle.lockfile index 4ac901d3934..00489829237 100644 --- a/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.hazelcast:hazelcast-all:4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath com.hazelcast:hazelcast-all:5.0-BETA-1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -84,6 +87,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-common/gradle.lockfile b/dd-java-agent/instrumentation/hibernate/hibernate-common/gradle.lockfile index 0ece97fd31a..d4ce86587c6 100644 --- a/dd-java-agent/instrumentation/hibernate/hibernate-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/hibernate/hibernate-common/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -82,6 +85,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/gradle.lockfile b/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/gradle.lockfile index 0ca6a809a3c..60a469f5be7 100644 --- a/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/gradle.lockfile @@ -33,11 +33,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.h2database:h2:1.4.197=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -100,6 +103,7 @@ org.hibernate:hibernate-core:3.3.0.SP1=testCompileClasspath,testRuntimeClasspath org.hibernate:hibernate-core:3.6.10.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/gradle.lockfile b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/gradle.lockfile index a92092f8997..2ab3605dbcb 100644 --- a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/gradle.lockfile @@ -34,11 +34,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.h2database:h2:1.4.197=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -103,6 +106,7 @@ org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:1.0.1.Final=late org.jboss:jandex:1.0.3.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.3/gradle.lockfile b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.3/gradle.lockfile index c6ad4dd7d75..f8aeb68f306 100644 --- a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.3/gradle.lockfile @@ -34,11 +34,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -98,6 +101,7 @@ org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.0.Final=comp org.jboss:jandex:1.1.0.Final=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/hystrix-1.4/gradle.lockfile b/dd-java-agent/instrumentation/hystrix-1.4/gradle.lockfile index 254f43e36be..89a30182dea 100644 --- a/dd-java-agent/instrumentation/hystrix-1.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/hystrix-1.4/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.netflix.archaius:archaius-core:0.4.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.netflix.hystrix:hystrix-core:1.4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath @@ -91,6 +94,7 @@ org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClas org.hdrhistogram:HdrHistogram:2.1.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/ignite-2.0/gradle.lockfile b/dd-java-agent/instrumentation/ignite-2.0/gradle.lockfile index 769f1981574..afd02ab1b85 100644 --- a/dd-java-agent/instrumentation/ignite-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/ignite-2.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,ignit com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,ignite216ForkedTestAnnotationProcessor,ignite216TestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=ignite216ForkedTestCompileClasspath,ignite216ForkedTestRuntimeClasspath,ignite216TestCompileClasspath,ignite216TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,ignite216ForkedTestAnnotationProcessor,ignite216TestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=ignite216ForkedTestCompileClasspath,ignite216ForkedTestRuntimeClasspath,ignite216TestCompileClasspath,ignite216TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=ignite216ForkedTestCompileClasspath,ignite216ForkedTestRuntimeClasspath,ignite216TestCompileClasspath,ignite216TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,ignite216ForkedTestAnnotationProcessor,ignite216TestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,ignite216ForkedTestAnnotationProcessor,ignite216TestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=ignite216ForkedTestCompileClasspath,ignite216ForkedTestRuntimeClasspath,ignite216TestCompileClasspath,ignite216TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,ignite216ForkedTestAnnotationProcessor,ignite216ForkedTestCompileClasspath,ignite216ForkedTestRuntimeClasspath,ignite216TestAnnotationProcessor,ignite216TestCompileClasspath,ignite216TestRuntimeClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,ignite216ForkedTestAnnotationProcessor,ignite216TestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=ignite216ForkedTestCompileClasspath,ignite216ForkedTestRuntimeClasspath,ignite216TestCompileClasspath,ignite216TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=ignite216ForkedTestRuntimeClasspath,ignite216TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.h2database:h2:1.4.195=testCompileClasspath,testRuntimeClasspath com.h2database:h2:1.4.197=ignite216ForkedTestCompileClasspath,ignite216ForkedTestRuntimeClasspath,ignite216TestCompileClasspath,ignite216TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -107,6 +110,7 @@ org.jctools:jctools-core-jdk11:4.0.6=ignite216ForkedTestRuntimeClasspath,ignite2 org.jctools:jctools-core:4.0.6=ignite216ForkedTestRuntimeClasspath,ignite216TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jetbrains:annotations:13.0=compileClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains:annotations:16.0.3=ignite216ForkedTestCompileClasspath,ignite216ForkedTestRuntimeClasspath,ignite216TestCompileClasspath,ignite216TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.jspecify:jspecify:1.0.0=ignite216ForkedTestCompileClasspath,ignite216ForkedTestRuntimeClasspath,ignite216TestCompileClasspath,ignite216TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=ignite216ForkedTestCompileClasspath,ignite216ForkedTestRuntimeClasspath,ignite216TestCompileClasspath,ignite216TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=ignite216ForkedTestRuntimeClasspath,ignite216TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=ignite216ForkedTestCompileClasspath,ignite216ForkedTestRuntimeClasspath,ignite216TestCompileClasspath,ignite216TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-1.9.13/gradle.lockfile b/dd-java-agent/instrumentation/jackson-core/jackson-core-1.9.13/gradle.lockfile index ebb4b4ad5c8..8cb24a2c744 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-1.9.13/gradle.lockfile +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-1.9.13/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -84,6 +87,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.0/gradle.lockfile b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.0/gradle.lockfile index 43b5f17b728..f062a423c2d 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.0/gradle.lockfile @@ -38,11 +38,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -88,6 +91,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.12/gradle.lockfile b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.12/gradle.lockfile index fd356718269..18eccf2c7d8 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.12/gradle.lockfile +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.12/gradle.lockfile @@ -40,11 +40,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -90,6 +93,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/gradle.lockfile b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/gradle.lockfile index 1d3126bb885..8080bd86fdd 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/gradle.lockfile +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/gradle.lockfile @@ -40,11 +40,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -90,6 +93,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.6/gradle.lockfile b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.6/gradle.lockfile index bfeb814e827..86319818596 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.6/gradle.lockfile +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.6/gradle.lockfile @@ -38,11 +38,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -88,6 +91,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.8/gradle.lockfile b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.8/gradle.lockfile index 6e86a79afeb..9eaa560e196 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.8/gradle.lockfile @@ -38,11 +38,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -88,6 +91,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-common/gradle.lockfile b/dd-java-agent/instrumentation/jackson-core/jackson-core-common/gradle.lockfile index 2da4be27d8b..cd3cac7fc9a 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-common/gradle.lockfile @@ -40,11 +40,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -90,6 +93,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jacoco-0.8.9/gradle.lockfile b/dd-java-agent/instrumentation/jacoco-0.8.9/gradle.lockfile index 21c5abf9c84..351822c85cf 100644 --- a/dd-java-agent/instrumentation/jacoco-0.8.9/gradle.lockfile +++ b/dd-java-agent/instrumentation/jacoco-0.8.9/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -83,6 +86,7 @@ org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jacoco:org.jacoco.agent:0.8.9=compileClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/gradle.lockfile b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/gradle.lockfile index 140bd98e179..41d6e790d04 100644 --- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,previ com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,previewTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=previewTestCompileClasspath,previewTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,previewTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=previewTestCompileClasspath,previewTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=previewTestCompileClasspath,previewTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,previewTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,previewTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=previewTestCompileClasspath,previewTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,previewTestAnnotationProcessor,previewTestCompileClasspath,previewTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,previewTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=previewTestCompileClasspath,previewTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=previewTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=previewTestCompileClasspath,previewTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=previewTestCompileClasspath,previewTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -82,6 +85,7 @@ org.hamcrest:hamcrest-core:1.3=previewTestRuntimeClasspath,testRuntimeClasspath org.hamcrest:hamcrest:3.0=previewTestCompileClasspath,previewTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=previewTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=previewTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=previewTestCompileClasspath,previewTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=previewTestCompileClasspath,previewTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=previewTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=previewTestCompileClasspath,previewTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-25.0/gradle.lockfile b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-25.0/gradle.lockfile index a977886acc8..46517f87552 100644 --- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-25.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-25.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -82,6 +85,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java/java-io-1.8/gradle.lockfile b/dd-java-agent/instrumentation/java/java-io-1.8/gradle.lockfile index 8eaab4c3168..88e97a9c681 100644 --- a/dd-java-agent/instrumentation/java/java-io-1.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-io-1.8/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,csiCo com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,java11TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=java11TestCompileClasspath,java11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,java11TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=java11TestCompileClasspath,java11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=java11TestCompileClasspath,java11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,java11TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,java11TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=java11TestCompileClasspath,java11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,java11TestAnnotationProcessor,java11TestCompileClasspath,java11TestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,java11TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=java11TestCompileClasspath,java11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=java11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=java11TestCompileClasspath,java11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=java11TestCompileClasspath,java11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -94,6 +97,7 @@ org.hamcrest:hamcrest-core:1.3=java11TestRuntimeClasspath,latestDepTestRuntimeCl org.hamcrest:hamcrest:3.0=java11TestCompileClasspath,java11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=java11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=java11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=java11TestCompileClasspath,java11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=java11TestCompileClasspath,java11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=java11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=java11TestCompileClasspath,java11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/gradle.lockfile b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/gradle.lockfile index 5ebf4b2fae2..73bfa75e3bb 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,csiCo com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -82,6 +85,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-11.0/gradle.lockfile b/dd-java-agent/instrumentation/java/java-lang/java-lang-11.0/gradle.lockfile index 0c8fef16343..134abc1519a 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-11.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-11.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,csiCo com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -82,6 +85,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/gradle.lockfile b/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/gradle.lockfile index fe55062c96b..324faf0d7c6 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/gradle.lockfile @@ -33,11 +33,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,csiCo com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -83,6 +86,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-17.0/gradle.lockfile b/dd-java-agent/instrumentation/java/java-lang/java-lang-17.0/gradle.lockfile index 30ed01132d9..05624497e19 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-17.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-17.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,csiCo com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -82,6 +85,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/gradle.lockfile b/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/gradle.lockfile index 3ae825a99c2..c7675fd7b2c 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -82,6 +85,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/gradle.lockfile b/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/gradle.lockfile index d1c8672d0dd..99a42afea89 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -82,6 +85,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/gradle.lockfile b/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/gradle.lockfile index 946613cf2d4..58025872430 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,csiCo com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -82,6 +85,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-classloading-1.8/gradle.lockfile b/dd-java-agent/instrumentation/java/java-lang/java-lang-classloading-1.8/gradle.lockfile index 48a50209f60..2478ac92a02 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-classloading-1.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-classloading-1.8/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,classloadingJbossTestA com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,classloadingJbossTestAnnotationProcessor,classloadingJsr14TestAnnotationProcessor,classloadingOsgiTestAnnotationProcessor,classloadingTomcatLatestDepTestAnnotationProcessor,classloadingTomcatTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=classloadingJbossTestCompileClasspath,classloadingJbossTestRuntimeClasspath,classloadingJsr14TestCompileClasspath,classloadingJsr14TestRuntimeClasspath,classloadingOsgiTestCompileClasspath,classloadingOsgiTestRuntimeClasspath,classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath,classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,classloadingJbossTestAnnotationProcessor,classloadingJsr14TestAnnotationProcessor,classloadingOsgiTestAnnotationProcessor,classloadingTomcatLatestDepTestAnnotationProcessor,classloadingTomcatTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=classloadingJbossTestCompileClasspath,classloadingJbossTestRuntimeClasspath,classloadingJsr14TestCompileClasspath,classloadingJsr14TestRuntimeClasspath,classloadingOsgiTestCompileClasspath,classloadingOsgiTestRuntimeClasspath,classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath,classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=classloadingJbossTestCompileClasspath,classloadingJbossTestRuntimeClasspath,classloadingJsr14TestCompileClasspath,classloadingJsr14TestRuntimeClasspath,classloadingOsgiTestCompileClasspath,classloadingOsgiTestRuntimeClasspath,classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath,classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,classloadingJbossTestAnnotationProcessor,classloadingJsr14TestAnnotationProcessor,classloadingOsgiTestAnnotationProcessor,classloadingTomcatLatestDepTestAnnotationProcessor,classloadingTomcatTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,classloadingJbossTestAnnotationProcessor,classloadingJsr14TestAnnotationProcessor,classloadingOsgiTestAnnotationProcessor,classloadingTomcatLatestDepTestAnnotationProcessor,classloadingTomcatTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=classloadingJbossTestCompileClasspath,classloadingJbossTestRuntimeClasspath,classloadingJsr14TestCompileClasspath,classloadingJsr14TestRuntimeClasspath,classloadingOsgiTestCompileClasspath,classloadingOsgiTestRuntimeClasspath,classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath,classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,classloadingJbossTestAnnotationProcessor,classloadingJbossTestCompileClasspath,classloadingJbossTestRuntimeClasspath,classloadingJsr14TestAnnotationProcessor,classloadingJsr14TestCompileClasspath,classloadingJsr14TestRuntimeClasspath,classloadingOsgiTestAnnotationProcessor,classloadingOsgiTestCompileClasspath,classloadingOsgiTestRuntimeClasspath,classloadingTomcatLatestDepTestAnnotationProcessor,classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath,classloadingTomcatTestAnnotationProcessor,classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,classloadingJbossTestAnnotationProcessor,classloadingJsr14TestAnnotationProcessor,classloadingOsgiTestAnnotationProcessor,classloadingTomcatLatestDepTestAnnotationProcessor,classloadingTomcatTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=classloadingJbossTestCompileClasspath,classloadingJbossTestRuntimeClasspath,classloadingJsr14TestCompileClasspath,classloadingJsr14TestRuntimeClasspath,classloadingOsgiTestCompileClasspath,classloadingOsgiTestRuntimeClasspath,classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath,classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=classloadingJbossTestRuntimeClasspath,classloadingJsr14TestRuntimeClasspath,classloadingOsgiTestRuntimeClasspath,classloadingTomcatLatestDepTestRuntimeClasspath,classloadingTomcatTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=classloadingJbossTestCompileClasspath,classloadingJbossTestRuntimeClasspath,classloadingJsr14TestCompileClasspath,classloadingJsr14TestRuntimeClasspath,classloadingOsgiTestCompileClasspath,classloadingOsgiTestRuntimeClasspath,classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath,classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=classloadingJbossTestCompileClasspath,classloadingJbossTestRuntimeClasspath,classloadingJsr14TestCompileClasspath,classloadingJsr14TestRuntimeClasspath,classloadingOsgiTestCompileClasspath,classloadingOsgiTestRuntimeClasspath,classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath,classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -109,6 +112,7 @@ org.hamcrest:hamcrest:3.0=classloadingJbossTestCompileClasspath,classloadingJbos org.jboss.modules:jboss-modules:1.3.10.Final=classloadingJbossTestCompileClasspath,classloadingJbossTestRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=classloadingJbossTestRuntimeClasspath,classloadingJsr14TestRuntimeClasspath,classloadingOsgiTestRuntimeClasspath,classloadingTomcatLatestDepTestRuntimeClasspath,classloadingTomcatTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=classloadingJbossTestRuntimeClasspath,classloadingJsr14TestRuntimeClasspath,classloadingOsgiTestRuntimeClasspath,classloadingTomcatLatestDepTestRuntimeClasspath,classloadingTomcatTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=classloadingJbossTestCompileClasspath,classloadingJbossTestRuntimeClasspath,classloadingJsr14TestCompileClasspath,classloadingJsr14TestRuntimeClasspath,classloadingOsgiTestCompileClasspath,classloadingOsgiTestRuntimeClasspath,classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath,classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=classloadingJbossTestCompileClasspath,classloadingJbossTestRuntimeClasspath,classloadingJsr14TestCompileClasspath,classloadingJsr14TestRuntimeClasspath,classloadingOsgiTestCompileClasspath,classloadingOsgiTestRuntimeClasspath,classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath,classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=classloadingJbossTestRuntimeClasspath,classloadingJsr14TestRuntimeClasspath,classloadingOsgiTestRuntimeClasspath,classloadingTomcatLatestDepTestRuntimeClasspath,classloadingTomcatTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=classloadingJbossTestCompileClasspath,classloadingJbossTestRuntimeClasspath,classloadingJsr14TestCompileClasspath,classloadingJsr14TestRuntimeClasspath,classloadingOsgiTestCompileClasspath,classloadingOsgiTestRuntimeClasspath,classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath,classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/gradle.lockfile b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/gradle.lockfile index 4ec91999cd8..83eecd9fd6e 100644 --- a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,csiCo com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -83,6 +86,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/gradle.lockfile b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/gradle.lockfile index 3d28302a5d7..5eb8747090c 100644 --- a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -82,6 +85,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java/java-nio-1.8/gradle.lockfile b/dd-java-agent/instrumentation/java/java-nio-1.8/gradle.lockfile index 6466511b288..bd716a14e89 100644 --- a/dd-java-agent/instrumentation/java/java-nio-1.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-nio-1.8/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -82,6 +85,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java/java-rmi-1.1/gradle.lockfile b/dd-java-agent/instrumentation/java/java-rmi-1.1/gradle.lockfile index 4b704450b8c..b3b1afdc6b6 100644 --- a/dd-java-agent/instrumentation/java/java-rmi-1.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-rmi-1.1/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -82,6 +85,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java/java-security-1.8/gradle.lockfile b/dd-java-agent/instrumentation/java/java-security-1.8/gradle.lockfile index cd266fdf82f..34a239fc307 100644 --- a/dd-java-agent/instrumentation/java/java-security-1.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-security-1.8/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,csiCo com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -83,6 +86,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java/java-util-1.8/gradle.lockfile b/dd-java-agent/instrumentation/java/java-util-1.8/gradle.lockfile index a8d381878dc..6f8d0c7a9fb 100644 --- a/dd-java-agent/instrumentation/java/java-util-1.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/java/java-util-1.8/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,csiCo com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -82,6 +85,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/javax-naming-1.0/gradle.lockfile b/dd-java-agent/instrumentation/javax-naming-1.0/gradle.lockfile index 853adbebda3..6d35d9b01a4 100644 --- a/dd-java-agent/instrumentation/javax-naming-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/javax-naming-1.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,csiCo com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -82,6 +85,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/javax-xml-1.4/gradle.lockfile b/dd-java-agent/instrumentation/javax-xml-1.4/gradle.lockfile index 821ebc4bfe6..ea503289a1a 100644 --- a/dd-java-agent/instrumentation/javax-xml-1.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/javax-xml-1.4/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,csiCo com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -82,6 +85,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jboss/jboss-logmanager-1.1/gradle.lockfile b/dd-java-agent/instrumentation/jboss/jboss-logmanager-1.1/gradle.lockfile index e73b87e9272..5c1be6460da 100644 --- a/dd-java-agent/instrumentation/jboss/jboss-logmanager-1.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/jboss/jboss-logmanager-1.1/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -83,6 +86,7 @@ org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jboss.logmanager:jboss-logmanager:1.1.0.GA=compileClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jboss/jboss-modules-1.3/gradle.lockfile b/dd-java-agent/instrumentation/jboss/jboss-modules-1.3/gradle.lockfile index 2f7a31ac93a..da6fbcd7144 100644 --- a/dd-java-agent/instrumentation/jboss/jboss-modules-1.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/jboss/jboss-modules-1.3/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -84,6 +87,7 @@ org.jboss.modules:jboss-modules:1.3.0.Final=compileClasspath,testCompileClasspat org.jboss.modules:jboss-modules:2.3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jdbc/gradle.lockfile b/dd-java-agent/instrumentation/jdbc/gradle.lockfile index 9bac4858d6f..e6f3cbc87a2 100644 --- a/dd-java-agent/instrumentation/jdbc/gradle.lockfile +++ b/dd-java-agent/instrumentation/jdbc/gradle.lockfile @@ -36,11 +36,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,csiCo com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepJava11TestAnnotationProcessor,latestDepTestAnnotationProcessor,oldH2TestAnnotationProcessor,oldPostgresTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=jmhRuntimeClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,oldH2TestCompileClasspath,oldH2TestRuntimeClasspath,oldPostgresTestCompileClasspath,oldPostgresTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepJava11TestAnnotationProcessor,latestDepTestAnnotationProcessor,oldH2TestAnnotationProcessor,oldPostgresTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=jmhRuntimeClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,oldH2TestCompileClasspath,oldH2TestRuntimeClasspath,oldPostgresTestCompileClasspath,oldPostgresTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=jmhRuntimeClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,oldH2TestCompileClasspath,oldH2TestRuntimeClasspath,oldPostgresTestCompileClasspath,oldPostgresTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepJava11TestAnnotationProcessor,latestDepTestAnnotationProcessor,oldH2TestAnnotationProcessor,oldPostgresTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepJava11TestAnnotationProcessor,latestDepTestAnnotationProcessor,oldH2TestAnnotationProcessor,oldPostgresTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=jmhRuntimeClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,oldH2TestCompileClasspath,oldH2TestRuntimeClasspath,oldPostgresTestCompileClasspath,oldPostgresTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,jmhRuntimeClasspath,latestDepJava11TestAnnotationProcessor,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,oldH2TestAnnotationProcessor,oldH2TestCompileClasspath,oldH2TestRuntimeClasspath,oldPostgresTestAnnotationProcessor,oldPostgresTestCompileClasspath,oldPostgresTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepJava11TestAnnotationProcessor,latestDepTestAnnotationProcessor,oldH2TestAnnotationProcessor,oldPostgresTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=jmhRuntimeClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,oldH2TestCompileClasspath,oldH2TestRuntimeClasspath,oldPostgresTestCompileClasspath,oldPostgresTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.protobuf:protobuf-java:3.11.4=jmhRuntimeClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,oldH2TestCompileClasspath,oldH2TestRuntimeClasspath,oldPostgresTestCompileClasspath,oldPostgresTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=jmhRuntimeClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestRuntimeClasspath,oldH2TestRuntimeClasspath,oldPostgresTestRuntimeClasspath,testRuntimeClasspath com.h2database:h2:1.3.168=oldH2TestCompileClasspath,oldH2TestRuntimeClasspath @@ -118,6 +121,7 @@ org.hsqldb:hsqldb:2.5.2=latestDepJava11TestCompileClasspath,latestDepJava11TestR org.jctools:jctools-core-jdk11:4.0.6=jmhRuntimeClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestRuntimeClasspath,oldH2TestRuntimeClasspath,oldPostgresTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=jmhRuntimeClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestRuntimeClasspath,oldH2TestRuntimeClasspath,oldPostgresTestRuntimeClasspath,testRuntimeClasspath org.jetbrains:annotations:17.0.0=jmhRuntimeClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,oldH2TestCompileClasspath,oldH2TestRuntimeClasspath,oldPostgresTestCompileClasspath,oldPostgresTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=jmhRuntimeClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,oldH2TestCompileClasspath,oldH2TestRuntimeClasspath,oldPostgresTestCompileClasspath,oldPostgresTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=jmhRuntimeClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,oldH2TestCompileClasspath,oldH2TestRuntimeClasspath,oldPostgresTestCompileClasspath,oldPostgresTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=jmhRuntimeClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestRuntimeClasspath,oldH2TestRuntimeClasspath,oldPostgresTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=jmhRuntimeClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,oldH2TestCompileClasspath,oldH2TestRuntimeClasspath,oldPostgresTestCompileClasspath,oldPostgresTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jdbc/scalikejdbc-3.5/gradle.lockfile b/dd-java-agent/instrumentation/jdbc/scalikejdbc-3.5/gradle.lockfile index 6f03dfc6db6..7f83a618afe 100644 --- a/dd-java-agent/instrumentation/jdbc/scalikejdbc-3.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/jdbc/scalikejdbc-3.5/gradle.lockfile @@ -36,11 +36,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.h2database:h2:1.3.169=testCompileClasspath,testRuntimeClasspath com.h2database:h2:2.2.224=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -116,6 +119,7 @@ org.jline:jline-native:3.27.1=zinc org.jline:jline-terminal-jni:3.27.1=zinc org.jline:jline-terminal:3.27.1=zinc org.jline:jline:3.27.1=zinc +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jedis/jedis-1.4/gradle.lockfile b/dd-java-agent/instrumentation/jedis/jedis-1.4/gradle.lockfile index 7b3acede36a..55e5366ad03 100644 --- a/dd-java-agent/instrumentation/jedis/jedis-1.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/jedis/jedis-1.4/gradle.lockfile @@ -33,11 +33,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -84,6 +87,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jedis/jedis-3.0/gradle.lockfile b/dd-java-agent/instrumentation/jedis/jedis-3.0/gradle.lockfile index 28050aadb67..9ad583748df 100644 --- a/dd-java-agent/instrumentation/jedis/jedis-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jedis/jedis-3.0/gradle.lockfile @@ -33,11 +33,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -85,6 +88,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jedis/jedis-4.0/gradle.lockfile b/dd-java-agent/instrumentation/jedis/jedis-4.0/gradle.lockfile index 9c12836ddca..7ff36cd2a6c 100644 --- a/dd-java-agent/instrumentation/jedis/jedis-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jedis/jedis-4.0/gradle.lockfile @@ -35,11 +35,14 @@ com.google.code.gson:gson:2.13.2=spotbugs com.google.code.gson:gson:2.8.9=compileClasspath,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -88,6 +91,7 @@ org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeCl org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.json:json:20211205=compileClasspath,testCompileClasspath,testRuntimeClasspath org.json:json:20231013=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jersey/jersey-2.0/gradle.lockfile b/dd-java-agent/instrumentation/jersey/jersey-2.0/gradle.lockfile index dce4d551c4b..16c3a2aa81f 100644 --- a/dd-java-agent/instrumentation/jersey/jersey-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jersey/jersey-2.0/gradle.lockfile @@ -43,12 +43,15 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,jerse com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,jersey2JettyTestAnnotationProcessor,jersey3JettyTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=jersey2JettyTestCompileClasspath,jersey2JettyTestRuntimeClasspath,jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,jersey2JettyTestAnnotationProcessor,jersey3JettyTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:failureaccess:1.0.3=jersey2JettyTestCompileClasspath,jersey2JettyTestRuntimeClasspath,jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:14.0.1=compileClasspath -com.google.guava:guava:20.0=jersey2JettyTestCompileClasspath,jersey2JettyTestRuntimeClasspath,jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,jersey2JettyTestAnnotationProcessor,jersey3JettyTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,jersey2JettyTestAnnotationProcessor,jersey3JettyTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=jersey2JettyTestCompileClasspath,jersey2JettyTestRuntimeClasspath,jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,jersey2JettyTestAnnotationProcessor,jersey2JettyTestCompileClasspath,jersey2JettyTestRuntimeClasspath,jersey3JettyTestAnnotationProcessor,jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,jersey2JettyTestAnnotationProcessor,jersey3JettyTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=jersey2JettyTestCompileClasspath,jersey2JettyTestRuntimeClasspath,jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=jersey2JettyTestRuntimeClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=jersey2JettyTestCompileClasspath,jersey2JettyTestRuntimeClasspath,jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=jersey2JettyTestCompileClasspath,jersey2JettyTestRuntimeClasspath,jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -163,6 +166,7 @@ org.javassist:javassist:3.18.1-GA=jersey2JettyTestCompileClasspath,jersey2JettyT org.javassist:javassist:3.29.0-GA=jersey3JettyTestRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=jersey2JettyTestRuntimeClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=jersey2JettyTestRuntimeClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=jersey2JettyTestCompileClasspath,jersey2JettyTestRuntimeClasspath,jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=jersey2JettyTestCompileClasspath,jersey2JettyTestRuntimeClasspath,jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=jersey2JettyTestRuntimeClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=jersey2JettyTestCompileClasspath,jersey2JettyTestRuntimeClasspath,jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jersey/jersey-client-2.0/gradle.lockfile b/dd-java-agent/instrumentation/jersey/jersey-client-2.0/gradle.lockfile index a9991ad69b0..b7824b3b96d 100644 --- a/dd-java-agent/instrumentation/jersey/jersey-client-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jersey/jersey-client-2.0/gradle.lockfile @@ -32,12 +32,15 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:14.0.1=compileClasspath -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -95,6 +98,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jersey/jersey-filter-2.0/gradle.lockfile b/dd-java-agent/instrumentation/jersey/jersey-filter-2.0/gradle.lockfile index b32bc575fcb..420b8d568b3 100644 --- a/dd-java-agent/instrumentation/jersey/jersey-filter-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jersey/jersey-filter-2.0/gradle.lockfile @@ -32,12 +32,15 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:14.0.1=compileClasspath -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -97,6 +100,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/gradle.lockfile index 50ea0adb43e..41647db45e4 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -88,6 +91,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-7.0/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-7.0/gradle.lockfile index 1e06a3f9d3a..1b1a98f1c11 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-7.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-7.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -88,6 +91,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/gradle.lockfile index 7e5d0ec449c..fe4569503c7 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -88,6 +91,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/gradle.lockfile index 837fcc5ffb6..8eb6d34d548 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -86,6 +89,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/gradle.lockfile index c594648a48c..1316c6aae6d 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -86,6 +89,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/gradle.lockfile index ea7cf10c040..c39bf44ee9a 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -86,6 +89,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/gradle.lockfile index 28828827b86..000f390ae86 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,jetty com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,jetty10LatestDepTestAnnotationProcessor,jetty11TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=jetty10LatestDepTestCompileClasspath,jetty10LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,jetty10LatestDepTestAnnotationProcessor,jetty11TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=jetty10LatestDepTestCompileClasspath,jetty10LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=jetty10LatestDepTestCompileClasspath,jetty10LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,jetty10LatestDepTestAnnotationProcessor,jetty11TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,jetty10LatestDepTestAnnotationProcessor,jetty11TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=jetty10LatestDepTestCompileClasspath,jetty10LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,jetty10LatestDepTestAnnotationProcessor,jetty10LatestDepTestCompileClasspath,jetty10LatestDepTestRuntimeClasspath,jetty11TestAnnotationProcessor,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,jetty10LatestDepTestAnnotationProcessor,jetty11TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=jetty10LatestDepTestCompileClasspath,jetty10LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=jetty10LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=jetty10LatestDepTestCompileClasspath,jetty10LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=jetty10LatestDepTestCompileClasspath,jetty10LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -104,6 +107,7 @@ org.hamcrest:hamcrest-core:1.3=jetty10LatestDepTestRuntimeClasspath,jetty11TestR org.hamcrest:hamcrest:3.0=jetty10LatestDepTestCompileClasspath,jetty10LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=jetty10LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=jetty10LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=jetty10LatestDepTestCompileClasspath,jetty10LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=jetty10LatestDepTestCompileClasspath,jetty10LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=jetty10LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=jetty10LatestDepTestCompileClasspath,jetty10LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/gradle.lockfile index 3f39b21e058..6bd563a4d98 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -94,6 +97,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/gradle.lockfile index 90ded2b5176..511c433ae0c 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -92,6 +95,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-common/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-common/gradle.lockfile index 8b1e75ffbf3..8dd5d364e36 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-common/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -86,6 +89,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-common/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-common/gradle.lockfile index d7f5436286e..480c510b193 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-common/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -92,6 +95,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/gradle.lockfile index 28ccf6f18a2..5b36625cf02 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,early com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,earlyDep10ForkedTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,earlyDep10ForkedTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,earlyDep10ForkedTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,earlyDep10ForkedTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,earlyDep10ForkedTestAnnotationProcessor,earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,earlyDep10ForkedTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -152,6 +155,7 @@ org.hamcrest:hamcrest-core:1.3=earlyDep10ForkedTestRuntimeClasspath,latestDepFor org.hamcrest:hamcrest:3.0=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/gradle.lockfile index 3c99a99bea2..84a31e653bb 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -131,6 +134,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepForkedTestRuntimeClasspath,latestDepTest org.hamcrest:hamcrest:3.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/gradle.lockfile index d8dfd4eff03..c228b770815 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,ee10F com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,ee10ForkedTestAnnotationProcessor,ee10LatestDepForkedTestAnnotationProcessor,ee10LatestDepTestAnnotationProcessor,ee10TestAnnotationProcessor,ee8LatestDepTestAnnotationProcessor,ee8TestAnnotationProcessor,ee9LatestDepTestAnnotationProcessor,ee9TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,ee10ForkedTestAnnotationProcessor,ee10LatestDepForkedTestAnnotationProcessor,ee10LatestDepTestAnnotationProcessor,ee10TestAnnotationProcessor,ee8LatestDepTestAnnotationProcessor,ee8TestAnnotationProcessor,ee9LatestDepTestAnnotationProcessor,ee9TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,ee10ForkedTestAnnotationProcessor,ee10LatestDepForkedTestAnnotationProcessor,ee10LatestDepTestAnnotationProcessor,ee10TestAnnotationProcessor,ee8LatestDepTestAnnotationProcessor,ee8TestAnnotationProcessor,ee9LatestDepTestAnnotationProcessor,ee9TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,ee10ForkedTestAnnotationProcessor,ee10LatestDepForkedTestAnnotationProcessor,ee10LatestDepTestAnnotationProcessor,ee10TestAnnotationProcessor,ee8LatestDepTestAnnotationProcessor,ee8TestAnnotationProcessor,ee9LatestDepTestAnnotationProcessor,ee9TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,ee10ForkedTestAnnotationProcessor,ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestAnnotationProcessor,ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestAnnotationProcessor,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestAnnotationProcessor,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestAnnotationProcessor,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestAnnotationProcessor,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestAnnotationProcessor,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestAnnotationProcessor,ee9TestCompileClasspath,ee9TestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,ee10ForkedTestAnnotationProcessor,ee10LatestDepForkedTestAnnotationProcessor,ee10LatestDepTestAnnotationProcessor,ee10TestAnnotationProcessor,ee8LatestDepTestAnnotationProcessor,ee8TestAnnotationProcessor,ee9LatestDepTestAnnotationProcessor,ee9TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -192,6 +195,7 @@ org.hamcrest:hamcrest-core:1.3=ee10ForkedTestRuntimeClasspath,ee10LatestDepForke org.hamcrest:hamcrest:3.0=ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/gradle.lockfile index 30652b805b6..2f057b97ff5 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -96,6 +99,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepForkedTestRuntimeClasspath,testRuntimeCl org.hamcrest:hamcrest:3.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepForkedTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepForkedTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepForkedTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/gradle.lockfile index e85ece6e981..2721867a937 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -97,6 +100,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepForkedTestRuntimeClasspath,testRuntimeCl org.hamcrest:hamcrest:3.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepForkedTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepForkedTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepForkedTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/gradle.lockfile index aaa3b75adf5..f20f69257bb 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -111,6 +114,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepForkedTestRuntimeClasspath,latestDepTest org.hamcrest:hamcrest:3.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/gradle.lockfile index 2b40361facc..b66da8c6dcc 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -91,6 +94,7 @@ org.hamcrest:hamcrest-core:1.3=testFixturesRuntimeClasspath,testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testFixturesRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=testFixturesRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.3/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.3/gradle.lockfile index 1bd7f466cfd..241d4c04e93 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.3/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -112,6 +115,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepForkedTestRuntimeClasspath,latestDepTest org.hamcrest:hamcrest:3.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.4.21/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.4.21/gradle.lockfile index 48c4bca12df..9f4867be92e 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.4.21/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.4.21/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -113,6 +116,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepForkedTestRuntimeClasspath,latestDepTest org.hamcrest:hamcrest:3.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-util-9.4.31/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-util-9.4.31/gradle.lockfile index a668a46f217..13c9b216047 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-util-9.4.31/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-util-9.4.31/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -84,6 +87,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jms/jakarta-jms-3.0/gradle.lockfile b/dd-java-agent/instrumentation/jms/jakarta-jms-3.0/gradle.lockfile index 8eb03711c01..68b1f964945 100644 --- a/dd-java-agent/instrumentation/jms/jakarta-jms-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jms/jakarta-jms-3.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -105,6 +108,7 @@ org.jboss:jboss-transaction-spi:7.0.0.Final=testCompileClasspath,testRuntimeClas org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath org.jgroups:jgroups:3.3.4.Final=testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jms/javax-jms-1.1/gradle.lockfile b/dd-java-agent/instrumentation/jms/javax-jms-1.1/gradle.lockfile index 15e9fc398f5..6f6b51c63b8 100644 --- a/dd-java-agent/instrumentation/jms/javax-jms-1.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/jms/javax-jms-1.1/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -115,6 +118,7 @@ org.jboss:jboss-transaction-spi:7.0.0.Final=latestDepForkedTestCompileClasspath, org.jctools:jctools-core-jdk11:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jgroups:jgroups:3.3.4.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jose-jwt-4.0/gradle.lockfile b/dd-java-agent/instrumentation/jose-jwt-4.0/gradle.lockfile index 6888a73a78f..3be588737d5 100644 --- a/dd-java-agent/instrumentation/jose-jwt-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jose-jwt-4.0/gradle.lockfile @@ -37,11 +37,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.nimbusds:nimbus-jose-jwt:9.24.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -88,6 +91,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jsp-2.3/gradle.lockfile b/dd-java-agent/instrumentation/jsp-2.3/gradle.lockfile index 841480bebe2..920188f1001 100644 --- a/dd-java-agent/instrumentation/jsp-2.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/jsp-2.3/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -104,6 +107,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/gradle.lockfile b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/gradle.lockfile index d9e046e2c2f..d4464fb68e4 100644 --- a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/gradle.lockfile @@ -36,11 +36,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.8.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -55,28 +58,28 @@ commons-io:commons-io:2.20.0=spotbugs de.thetaphi:forbiddenapis:3.10=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.cucumber:ci-environment:12.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:cucumber-core:5.4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.cucumber:cucumber-core:7.34.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:cucumber-core:7.34.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:cucumber-expressions:18.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:cucumber-expressions:8.3.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.cucumber:cucumber-gherkin-messages:7.34.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:cucumber-gherkin-messages:7.34.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:cucumber-gherkin-vintage:5.4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath io.cucumber:cucumber-gherkin:5.4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.cucumber:cucumber-gherkin:7.34.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:cucumber-gherkin:7.34.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:cucumber-java:5.4.0=testCompileClasspath,testRuntimeClasspath -io.cucumber:cucumber-java:7.34.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:cucumber-java:7.34.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:cucumber-json-formatter:0.3.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:cucumber-junit:5.4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.cucumber:cucumber-junit:7.34.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:cucumber-junit:7.34.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:cucumber-plugin:5.4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.cucumber:cucumber-plugin:7.34.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:cucumber-plugin:7.34.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:datatable:3.3.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.cucumber:datatable:7.34.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:datatable:7.34.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:docstring:5.4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.cucumber:docstring:7.34.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:docstring:7.34.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:gherkin:36.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:html-formatter:22.3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:junit-xml-formatter:0.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.cucumber:messages-ndjson:0.3.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:messages-ndjson:0.3.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:messages:30.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:pretty-formatter:2.4.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:query:14.7.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -127,6 +130,7 @@ org.jacoco:org.jacoco.core:0.8.14=latestDepTestRuntimeClasspath,testRuntimeClass org.jacoco:org.jacoco.report:0.8.14=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4-munit-0.7.28/gradle.lockfile b/dd-java-agent/instrumentation/junit/junit-4/junit-4-munit-0.7.28/gradle.lockfile index ad7d33e7ac9..35e7ffa1361 100644 --- a/dd-java-agent/instrumentation/junit/junit-4/junit-4-munit-0.7.28/gradle.lockfile +++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4-munit-0.7.28/gradle.lockfile @@ -40,11 +40,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.8.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc @@ -108,6 +111,7 @@ org.jline:jline-native:3.27.1=zinc org.jline:jline-terminal-jni:3.27.1=zinc org.jline:jline-terminal:3.27.1=zinc org.jline:jline:3.27.1=zinc +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/gradle.lockfile b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/gradle.lockfile index 3c21f2654b8..0c46109071a 100644 --- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/gradle.lockfile +++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/gradle.lockfile @@ -36,11 +36,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,compi com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.8.0=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath @@ -114,6 +117,7 @@ org.jetbrains.kotlin:kotlin-stdlib:1.6.21=compileClasspath,compileOnlyDependenci org.jetbrains.kotlin:kotlin-stdlib:2.1.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathLatestDepTest,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,latestDepTestApiDependenciesMetadata,latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains:annotations:13.0=compileClasspath,compileOnlyDependenciesMetadata,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathLatestDepTest,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/gradle.lockfile b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/gradle.lockfile index 6bfd887690a..10df7cd7e6b 100644 --- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/gradle.lockfile +++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/gradle.lockfile @@ -36,11 +36,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.8.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -94,6 +97,7 @@ org.jacoco:org.jacoco.core:0.8.14=latestDepTestRuntimeClasspath,testRuntimeClass org.jacoco:org.jacoco.report:0.8.14=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/gradle.lockfile b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/gradle.lockfile index a526a93c7db..93a0c325ec0 100644 --- a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/gradle.lockfile @@ -36,11 +36,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.8.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -55,28 +58,28 @@ commons-io:commons-io:2.20.0=spotbugs de.thetaphi:forbiddenapis:3.10=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.cucumber:ci-environment:12.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:cucumber-core:5.4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.cucumber:cucumber-core:7.34.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:cucumber-core:7.34.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:cucumber-expressions:18.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:cucumber-expressions:8.3.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.cucumber:cucumber-gherkin-messages:7.34.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:cucumber-gherkin-messages:7.34.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:cucumber-gherkin-vintage:5.4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath io.cucumber:cucumber-gherkin:5.4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.cucumber:cucumber-gherkin:7.34.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:cucumber-gherkin:7.34.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:cucumber-java:5.4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.cucumber:cucumber-java:7.34.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:cucumber-java:7.34.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:cucumber-json-formatter:0.3.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:cucumber-junit-platform-engine:5.4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.cucumber:cucumber-junit-platform-engine:7.34.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:cucumber-junit-platform-engine:7.34.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:cucumber-plugin:5.4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.cucumber:cucumber-plugin:7.34.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:cucumber-plugin:7.34.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:datatable:3.3.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.cucumber:datatable:7.34.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:datatable:7.34.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:docstring:5.4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.cucumber:docstring:7.34.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:docstring:7.34.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:gherkin:36.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:html-formatter:22.3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:junit-xml-formatter:0.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.cucumber:messages-ndjson:0.3.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:messages-ndjson:0.3.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:messages:30.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:pretty-formatter:2.4.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:query:14.7.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -126,6 +129,7 @@ org.jacoco:org.jacoco.core:0.8.14=latestDepTestRuntimeClasspath,testRuntimeClass org.jacoco:org.jacoco.report:0.8.14=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/gradle.lockfile b/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/gradle.lockfile index 3fceab0bec3..f0df0a49755 100644 --- a/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/gradle.lockfile @@ -37,11 +37,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.8.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -99,6 +102,7 @@ org.jacoco:org.jacoco.report:0.8.14=latestDepTestRuntimeClasspath,testRuntimeCla org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jetbrains:annotations:20.1.0=compileClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.7.2=compileClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/kafka/kafka-common/gradle.lockfile b/dd-java-agent/instrumentation/kafka/kafka-common/gradle.lockfile index a32773adcdf..3e0b3854c29 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/kafka/kafka-common/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -84,6 +87,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/gradle.lockfile b/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/gradle.lockfile index 45a2f45f203..542540ed1ef 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/gradle.lockfile +++ b/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/gradle.lockfile @@ -49,11 +49,15 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:20.0=compileClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -198,6 +202,7 @@ org.javassist:javassist:3.21.0-GA=compileClasspath org.javassist:javassist:3.26.0-GA=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/gradle.lockfile b/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/gradle.lockfile index a3b6982275e..e6db2f4ba6c 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/gradle.lockfile +++ b/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/gradle.lockfile @@ -44,11 +44,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -133,6 +136,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/kafka/kafka-streams-1.0/gradle.lockfile b/dd-java-agent/instrumentation/kafka/kafka-streams-1.0/gradle.lockfile index 2c848111cfc..ed9efa4788f 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-streams-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/kafka/kafka-streams-1.0/gradle.lockfile @@ -35,11 +35,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -89,6 +92,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/karate-1.0/gradle.lockfile b/dd-java-agent/instrumentation/karate-1.0/gradle.lockfile index b10186f25ff..f9d5c62708b 100644 --- a/dd-java-agent/instrumentation/karate-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/karate-1.0/gradle.lockfile @@ -45,11 +45,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,karat com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,karate131TestAnnotationProcessor,karate141TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=karate131TestCompileClasspath,karate131TestRuntimeClasspath,karate141TestCompileClasspath,karate141TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,karate131TestAnnotationProcessor,karate141TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=karate131TestCompileClasspath,karate131TestRuntimeClasspath,karate141TestCompileClasspath,karate141TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=karate131TestCompileClasspath,karate131TestRuntimeClasspath,karate141TestCompileClasspath,karate141TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,karate131TestAnnotationProcessor,karate141TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,karate131TestAnnotationProcessor,karate141TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=karate131TestCompileClasspath,karate131TestRuntimeClasspath,karate141TestCompileClasspath,karate141TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,karate131TestAnnotationProcessor,karate131TestCompileClasspath,karate131TestRuntimeClasspath,karate141TestAnnotationProcessor,karate141TestCompileClasspath,karate141TestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,karate131TestAnnotationProcessor,karate141TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=karate131TestCompileClasspath,karate131TestRuntimeClasspath,karate141TestCompileClasspath,karate141TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=karate131TestRuntimeClasspath,karate141TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.ibm.icu:icu4j:67.1=testRuntimeClasspath com.ibm.icu:icu4j:71.1=karate141TestRuntimeClasspath @@ -253,6 +256,7 @@ org.javassist:javassist:3.20.0-GA=karate131TestCompileClasspath,karate131TestRun org.javassist:javassist:3.29.0-GA=karate141TestCompileClasspath,karate141TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=karate131TestRuntimeClasspath,karate141TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=karate131TestRuntimeClasspath,karate141TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=karate131TestCompileClasspath,karate131TestRuntimeClasspath,karate141TestCompileClasspath,karate141TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=karate131TestCompileClasspath,karate131TestRuntimeClasspath,karate141TestCompileClasspath,karate141TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=karate131TestCompileClasspath,karate131TestRuntimeClasspath,karate141TestCompileClasspath,karate141TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=karate131TestCompileClasspath,karate131TestRuntimeClasspath,karate141TestCompileClasspath,karate141TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/kotlin-coroutines-1.3/gradle.lockfile b/dd-java-agent/instrumentation/kotlin-coroutines-1.3/gradle.lockfile index 9d1e099aa09..c758d8719da 100644 --- a/dd-java-agent/instrumentation/kotlin-coroutines-1.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/kotlin-coroutines-1.3/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,compi com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath @@ -108,6 +111,7 @@ org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinBuildToolsApiClass org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0=compileClasspath,compileOnlyDependenciesMetadata,testCompileClasspath,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath org.jetbrains:annotations:13.0=compileClasspath,compileOnlyDependenciesMetadata,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathLatestDepTest,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinCompilerPluginClasspathTestFixtures,kotlinKlibCommonizerClasspath,latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-4.0/gradle.lockfile b/dd-java-agent/instrumentation/lettuce/lettuce-4.0/gradle.lockfile index 37d9d20a7c8..b72c8937d99 100644 --- a/dd-java-agent/instrumentation/lettuce/lettuce-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/lettuce/lettuce-4.0/gradle.lockfile @@ -35,12 +35,15 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:18.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.guava:guava:19.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:18.0=compileClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -101,6 +104,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/gradle.lockfile b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/gradle.lockfile index 08e402179c7..ae028e1e9de 100644 --- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/gradle.lockfile @@ -40,11 +40,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.redis.testcontainers:testcontainers-redis:1.6.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.redis:redis-enterprise-admin:0.3.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -118,6 +121,7 @@ org.hamcrest:hamcrest:3.0=latestDepForkedTestCompileClasspath,latestDepForkedTes org.jctools:jctools-core-jdk11:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jetbrains:annotations:17.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/liberty/liberty-20.0/gradle.lockfile b/dd-java-agent/instrumentation/liberty/liberty-20.0/gradle.lockfile index 8e640af308f..901f00d65c1 100644 --- a/dd-java-agent/instrumentation/liberty/liberty-20.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/liberty/liberty-20.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath,webappCompileClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath,webappCompileClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath,webappCompileClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath,webappCompileClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath,webappCompileClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath,webappCompileClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath,webappCompileClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath,webappCompileClasspath @@ -85,6 +88,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath,webappCompileClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath,webappCompileClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/liberty/liberty-23.0/gradle.lockfile b/dd-java-agent/instrumentation/liberty/liberty-23.0/gradle.lockfile index de8174f8f50..d2e80e7f4b5 100644 --- a/dd-java-agent/instrumentation/liberty/liberty-23.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/liberty/liberty-23.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath,webappCompileClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath,webappCompileClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath,webappCompileClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath,webappCompileClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath,webappCompileClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath,webappCompileClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath,webappCompileClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath,webappCompileClasspath @@ -85,6 +88,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath,webappCompileClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath,webappCompileClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/log4j/log4j-1.2.4/gradle.lockfile b/dd-java-agent/instrumentation/log4j/log4j-1.2.4/gradle.lockfile index 92a599af5e5..c93193226a4 100644 --- a/dd-java-agent/instrumentation/log4j/log4j-1.2.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/log4j/log4j-1.2.4/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -84,6 +87,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/log4j/log4j-2.0/gradle.lockfile b/dd-java-agent/instrumentation/log4j/log4j-2.0/gradle.lockfile index 6935b70492e..d48719b34f9 100644 --- a/dd-java-agent/instrumentation/log4j/log4j-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/log4j/log4j-2.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -84,6 +87,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/log4j/log4j-2.7/gradle.lockfile b/dd-java-agent/instrumentation/log4j/log4j-2.7/gradle.lockfile index 4323557a62f..f0cfa6574fb 100644 --- a/dd-java-agent/instrumentation/log4j/log4j-2.7/gradle.lockfile +++ b/dd-java-agent/instrumentation/log4j/log4j-2.7/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -84,6 +87,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/logback-1.0/gradle.lockfile b/dd-java-agent/instrumentation/logback-1.0/gradle.lockfile index 3f9e68de637..5847af4f760 100644 --- a/dd-java-agent/instrumentation/logback-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/logback-1.0/gradle.lockfile @@ -34,11 +34,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -84,6 +87,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/mail/jakarta-mail-2.0.1/gradle.lockfile b/dd-java-agent/instrumentation/mail/jakarta-mail-2.0.1/gradle.lockfile index 0fc7d7f8e6b..b52d8c42b1d 100644 --- a/dd-java-agent/instrumentation/mail/jakarta-mail-2.0.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/mail/jakarta-mail-2.0.1/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -86,6 +89,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/mail/javax-mail-1.4.4/gradle.lockfile b/dd-java-agent/instrumentation/mail/javax-mail-1.4.4/gradle.lockfile index c9411a98500..82d204250d2 100644 --- a/dd-java-agent/instrumentation/mail/javax-mail-1.4.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/mail/javax-mail-1.4.4/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -85,6 +88,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/maven/maven-3.2.1/gradle.lockfile b/dd-java-agent/instrumentation/maven/maven-3.2.1/gradle.lockfile index 19d445441ec..ba68402cb27 100644 --- a/dd-java-agent/instrumentation/maven/maven-3.2.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/maven/maven-3.2.1/gradle.lockfile @@ -37,17 +37,16 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:10.0.1=compileClasspath -com.google.guava:guava:16.0.1=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.inject:guice:6.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.8.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -193,7 +192,7 @@ org.jacoco:org.jacoco.core:0.8.14=latestDepTestRuntimeClasspath,testRuntimeClass org.jacoco:org.jacoco.report:0.8.14=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath -org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/maven/maven-surefire-3.0/gradle.lockfile b/dd-java-agent/instrumentation/maven/maven-surefire-3.0/gradle.lockfile index 4cee93f01be..d1eb2a2e8f5 100644 --- a/dd-java-agent/instrumentation/maven/maven-surefire-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/maven/maven-surefire-3.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -92,6 +95,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-2.0/gradle.lockfile b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-2.0/gradle.lockfile index 2bae1e5872a..00396ae41b6 100644 --- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-2.0/gradle.lockfile @@ -44,11 +44,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -139,6 +142,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/gradle.lockfile b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/gradle.lockfile index 6e349f1ef89..5f5edd2ab2e 100644 --- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/gradle.lockfile @@ -46,11 +46,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -151,6 +154,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-common/gradle.lockfile b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-common/gradle.lockfile index 058affba2c5..2497383f4e3 100644 --- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-common/gradle.lockfile @@ -35,11 +35,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -108,6 +111,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/mongo/mongo-common/gradle.lockfile b/dd-java-agent/instrumentation/mongo/mongo-common/gradle.lockfile index 3d0a43ec243..5594c84153b 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/mongo/mongo-common/gradle.lockfile @@ -36,11 +36,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -88,6 +91,7 @@ org.hamcrest:hamcrest:3.0=testCompileClasspath,testFixturesCompileClasspath,test org.jctools:jctools-core-jdk11:4.0.6=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.jetbrains:annotations:17.0.0=testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/gradle.lockfile b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/gradle.lockfile index 76e638fdc8b..6aff11c1fe1 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/gradle.lockfile @@ -36,11 +36,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -88,6 +91,7 @@ org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClas org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jetbrains:annotations:17.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/gradle.lockfile b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/gradle.lockfile index b09a8d46b58..60428a339a9 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/gradle.lockfile @@ -36,11 +36,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -88,6 +91,7 @@ org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClas org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jetbrains:annotations:17.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.6/gradle.lockfile b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.6/gradle.lockfile index 6b0924712d1..c711a3d9e75 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.6/gradle.lockfile +++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.6/gradle.lockfile @@ -36,11 +36,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -88,6 +91,7 @@ org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClas org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jetbrains:annotations:17.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.8/gradle.lockfile b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.8/gradle.lockfile index b542ab58064..0ec3b088b33 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.8/gradle.lockfile @@ -36,11 +36,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -88,6 +91,7 @@ org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClas org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jetbrains:annotations:17.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/gradle.lockfile b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/gradle.lockfile index 072bbe9dd8f..22f095771c6 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/gradle.lockfile @@ -36,11 +36,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,mongo410ForkedTestAnnotationProcessor,mongo410TestAnnotationProcessor,mongo43ForkedTestAnnotationProcessor,mongo43TestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestCompileClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestCompileClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestCompileClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestCompileClasspath,mongo43TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,mongo410ForkedTestAnnotationProcessor,mongo410TestAnnotationProcessor,mongo43ForkedTestAnnotationProcessor,mongo43TestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestCompileClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestCompileClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestCompileClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestCompileClasspath,mongo43TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestCompileClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestCompileClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestCompileClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestCompileClasspath,mongo43TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,mongo410ForkedTestAnnotationProcessor,mongo410TestAnnotationProcessor,mongo43ForkedTestAnnotationProcessor,mongo43TestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,mongo410ForkedTestAnnotationProcessor,mongo410TestAnnotationProcessor,mongo43ForkedTestAnnotationProcessor,mongo43TestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestCompileClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestCompileClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestCompileClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestCompileClasspath,mongo43TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestAnnotationProcessor,mongo410ForkedTestCompileClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestAnnotationProcessor,mongo410TestCompileClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestAnnotationProcessor,mongo43ForkedTestCompileClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestAnnotationProcessor,mongo43TestCompileClasspath,mongo43TestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,mongo410ForkedTestAnnotationProcessor,mongo410TestAnnotationProcessor,mongo43ForkedTestAnnotationProcessor,mongo43TestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestCompileClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestCompileClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestCompileClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestCompileClasspath,mongo43TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestCompileClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestCompileClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestCompileClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestCompileClasspath,mongo43TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestCompileClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestCompileClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestCompileClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestCompileClasspath,mongo43TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -90,6 +93,7 @@ org.hamcrest:hamcrest:3.0=latestDepForkedTestCompileClasspath,latestDepForkedTes org.jctools:jctools-core-jdk11:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestRuntimeClasspath,testRuntimeClasspath org.jetbrains:annotations:17.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestCompileClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestCompileClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestCompileClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestCompileClasspath,mongo43TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestCompileClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestCompileClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestCompileClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestCompileClasspath,mongo43TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestCompileClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestCompileClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestCompileClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestCompileClasspath,mongo43TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestCompileClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestCompileClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestCompileClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestCompileClasspath,mongo43TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-async-3.3/gradle.lockfile b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-async-3.3/gradle.lockfile index c65b7e5a566..7cc8cadba6e 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-async-3.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-async-3.3/gradle.lockfile @@ -36,11 +36,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -88,6 +91,7 @@ org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClas org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jetbrains:annotations:17.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.1/gradle.lockfile b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.1/gradle.lockfile index fe90cd4b73f..953bab34498 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.1/gradle.lockfile @@ -36,11 +36,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -88,6 +91,7 @@ org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClas org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jetbrains:annotations:17.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.7/gradle.lockfile b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.7/gradle.lockfile index 4114e3766df..5437992098e 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.7/gradle.lockfile +++ b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.7/gradle.lockfile @@ -36,11 +36,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -88,6 +91,7 @@ org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClas org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jetbrains:annotations:17.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-sync-3.10/gradle.lockfile b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-sync-3.10/gradle.lockfile index 0e38465c9ef..abb2d202e12 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-sync-3.10/gradle.lockfile +++ b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-sync-3.10/gradle.lockfile @@ -36,11 +36,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -88,6 +91,7 @@ org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClas org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jetbrains:annotations:17.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/mule-4.5/gradle.lockfile b/dd-java-agent/instrumentation/mule-4.5/gradle.lockfile index e6a7786c768..ed6bbb81858 100644 --- a/dd-java-agent/instrumentation/mule-4.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/mule-4.5/gradle.lockfile @@ -77,22 +77,23 @@ com.google.code.gson:gson:2.13.1=latestDepForkedTestCompileClasspath,latestDepFo com.google.code.gson:gson:2.13.2=spotbugs com.google.code.gson:gson:2.8.9=compileClasspath com.google.code.gson:gson:2.9.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,mule46ForkedTestAnnotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -com.google.errorprone:error_prone_annotations:2.21.1=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath -com.google.errorprone:error_prone_annotations:2.40.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,mule46ForkedTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.errorprone:error_prone_annotations:2.43.0=latestMuleServices +com.google.errorprone:error_prone_annotations:2.47.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.5.1=mule46Services,muleServices -com.google.guava:failureaccess:1.0.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,mule46ForkedTestAnnotationProcessor,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -com.google.guava:failureaccess:1.0.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestMuleServices -com.google.guava:guava-parent:32.1.1-jre=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,mule46ForkedTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:failureaccess:1.0.2=latestMuleServices +com.google.guava:failureaccess:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava-parent:32.1.1-jre=compileClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,mule46ForkedTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:32.1.1-jre=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.guava:guava:32.1.3-jre=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath -com.google.guava:guava:33.4.0-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestMuleServices +com.google.guava:guava:32.1.1-jre=compileClasspath +com.google.guava:guava:33.4.0-jre=latestMuleServices +com.google.guava:guava:33.6.0-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestMuleServices,mule46ForkedTestAnnotationProcessor,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,mule46ForkedTestAnnotationProcessor,mule46ForkedTestCompileClasspath,testAnnotationProcessor,testCompileClasspath -com.google.j2objc:j2objc-annotations:3.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestMuleServices +com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,mule46ForkedTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.0.0=latestMuleServices +com.google.j2objc:j2objc-annotations:3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.6=latestDepForkedTestCompileClasspath,latestMuleServices,mule46Services,muleServices com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath com.googlecode.juniversalchardet:juniversalchardet:1.0.3=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -363,9 +364,9 @@ org.apache.xmlbeans:xmlbeans:5.3.0=latestDepForkedTestCompileClasspath,latestDep org.apfloat:apfloat:1.10.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=latestDepForkedTestCompileClasspath,mule46ForkedTestCompileClasspath,testCompileClasspath org.checkerframework:checker-qual:3.10.0=mule46Services,muleServices -org.checkerframework:checker-qual:3.33.0=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,mule46ForkedTestAnnotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -org.checkerframework:checker-qual:3.37.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath -org.checkerframework:checker-qual:3.43.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestMuleServices +org.checkerframework:checker-qual:3.12.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.33.0=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,mule46ForkedTestAnnotationProcessor,testAnnotationProcessor +org.checkerframework:checker-qual:3.43.0=latestMuleServices org.codehaus.groovy:groovy-ant:3.0.23=codenarc org.codehaus.groovy:groovy-docgenerator:3.0.23=codenarc org.codehaus.groovy:groovy-groovydoc:3.0.23=codenarc @@ -430,7 +431,7 @@ org.json:json:20230227=mule46Services,muleServices org.json:json:20231013=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestMuleServices,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath org.jsoup:jsoup:1.15.3=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jsoup:jsoup:1.21.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath -org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestMuleServices +org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestMuleServices,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -443,8 +444,7 @@ org.junit.platform:junit-platform-suite-api:1.14.1=latestDepForkedTestRuntimeCla org.junit.platform:junit-platform-suite-commons:1.14.1=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.0=spotbugs org.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.mockito:mockito-core:4.11.0=testRuntimeClasspath -org.mockito:mockito-core:4.4.0=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath +org.mockito:mockito-core:4.4.0=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath org.mozilla:rhino-engine:1.9.1=latestMuleServices org.mozilla:rhino:1.7.12=compileClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.mozilla:rhino:1.8.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/netty/netty-3.8/gradle.lockfile b/dd-java-agent/instrumentation/netty/netty-3.8/gradle.lockfile index 54512aa02b4..6da0ed6afa4 100644 --- a/dd-java-agent/instrumentation/netty/netty-3.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/netty/netty-3.8/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.ning:async-http-client:1.8.0=testCompileClasspath,testRuntimeClasspath com.ning:async-http-client:1.9.40=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -87,6 +90,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/netty/netty-4.0/gradle.lockfile b/dd-java-agent/instrumentation/netty/netty-4.0/gradle.lockfile index 4be53fda3aa..2835dc5c563 100644 --- a/dd-java-agent/instrumentation/netty/netty-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/netty/netty-4.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -113,6 +116,7 @@ org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClas org.javassist:javassist:3.20.0-GA=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/gradle.lockfile b/dd-java-agent/instrumentation/netty/netty-4.1/gradle.lockfile index 5957ecf3153..d148e0e20aa 100644 --- a/dd-java-agent/instrumentation/netty/netty-4.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/netty/netty-4.1/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -132,6 +135,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/netty/netty-buffer-4.0/gradle.lockfile b/dd-java-agent/instrumentation/netty/netty-buffer-4.0/gradle.lockfile index 20febaaccb5..c337a1662ef 100644 --- a/dd-java-agent/instrumentation/netty/netty-buffer-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/netty/netty-buffer-4.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDep4TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDep4TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDep4TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDep4TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDep4TestAnnotationProcessor,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDep4TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -88,6 +91,7 @@ org.hamcrest:hamcrest-core:1.3=latestDep4TestRuntimeClasspath,latestDepTestRunti org.hamcrest:hamcrest:3.0=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/netty/netty-common/gradle.lockfile b/dd-java-agent/instrumentation/netty/netty-common/gradle.lockfile index ff3a823af24..9a28f92cb6a 100644 --- a/dd-java-agent/instrumentation/netty/netty-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/netty/netty-common/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -88,6 +91,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/gradle.lockfile b/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/gradle.lockfile index ccf7f907182..d33491b874a 100644 --- a/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDep4TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDep4TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDep4TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDep4TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDep4TestAnnotationProcessor,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDep4TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -84,6 +87,7 @@ org.hamcrest:hamcrest-core:1.3=latestDep4TestRuntimeClasspath,latestDepTestRunti org.hamcrest:hamcrest:3.0=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/netty/netty-promise-4.0/gradle.lockfile b/dd-java-agent/instrumentation/netty/netty-promise-4.0/gradle.lockfile index c9ad30bd096..3ddfb37cb29 100644 --- a/dd-java-agent/instrumentation/netty/netty-promise-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/netty/netty-promise-4.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDep4TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDep4TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDep4TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDep4TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDep4TestAnnotationProcessor,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDep4TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -85,6 +88,7 @@ org.hamcrest:hamcrest-core:1.3=latestDep4TestRuntimeClasspath,latestDepTestRunti org.hamcrest:hamcrest:3.0=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/ognl-appsec-3.3.2/gradle.lockfile b/dd-java-agent/instrumentation/ognl-appsec-3.3.2/gradle.lockfile index 0fd5bf768fa..4c1b87707e5 100644 --- a/dd-java-agent/instrumentation/ognl-appsec-3.3.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/ognl-appsec-3.3.2/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -84,6 +87,7 @@ org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.28.0-GA=compileClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/okhttp/okhttp-2.2/gradle.lockfile b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/gradle.lockfile index f33b4516841..143af9005fe 100644 --- a/dd-java-agent/instrumentation/okhttp/okhttp-2.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -85,6 +88,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/okhttp/okhttp-3.0/gradle.lockfile b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/gradle.lockfile index 25a3878b1da..0501da8af1d 100644 --- a/dd-java-agent/instrumentation/okhttp/okhttp-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -84,6 +87,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/gradle.lockfile b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/gradle.lockfile index efa69aa4b34..5c65a333704 100644 --- a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/gradle.lockfile @@ -42,13 +42,16 @@ com.google.auto:auto-common:1.2.1=annotationProcessor,latestDepTestAnnotationPro com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.errorprone:error_prone_annotations:2.33.0=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.33.0=compileClasspath com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.openai:openai-java-client-okhttp:3.0.1=compileClasspath,testCompileClasspath,testRuntimeClasspath com.openai:openai-java-client-okhttp:4.41.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -118,6 +121,7 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10=latestDepTestRuntimeClasspath,tes org.jetbrains.kotlin:kotlin-stdlib:1.8.0=compileClasspath,latestDepTestCompileClasspath,testCompileClasspath org.jetbrains.kotlin:kotlin-stdlib:1.9.10=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jetbrains:annotations:13.0=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/opensearch/opensearch-common/gradle.lockfile b/dd-java-agent/instrumentation/opensearch/opensearch-common/gradle.lockfile index f895397b7e5..38373cc5491 100644 --- a/dd-java-agent/instrumentation/opensearch/opensearch-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/opensearch/opensearch-common/gradle.lockfile @@ -37,11 +37,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -114,6 +117,7 @@ org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.hdrhistogram:HdrHistogram:2.1.9=compileClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/opensearch/opensearch-rest-1.0/gradle.lockfile b/dd-java-agent/instrumentation/opensearch/opensearch-rest-1.0/gradle.lockfile index 63f403a85d2..41788342b6b 100644 --- a/dd-java-agent/instrumentation/opensearch/opensearch-rest-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/opensearch/opensearch-rest-1.0/gradle.lockfile @@ -38,11 +38,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -122,6 +125,7 @@ org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClas org.hdrhistogram:HdrHistogram:2.1.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/gradle.lockfile b/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/gradle.lockfile index c65ebda0c9c..64f71e5144e 100644 --- a/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/gradle.lockfile @@ -38,11 +38,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -122,6 +125,7 @@ org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClas org.hdrhistogram:HdrHistogram:2.1.9=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/opentelemetry/gradle.lockfile b/dd-java-agent/instrumentation/opentelemetry/gradle.lockfile index 5349155c572..77381bc076f 100644 --- a/dd-java-agent/instrumentation/opentelemetry/gradle.lockfile +++ b/dd-java-agent/instrumentation/opentelemetry/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -82,6 +85,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/gradle.lockfile b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/gradle.lockfile index 16e8fd2ddc6..74d3553000f 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/gradle.lockfile @@ -33,11 +33,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -89,6 +92,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.27/gradle.lockfile b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.27/gradle.lockfile index 7885fbba54a..df2a992ffc0 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.27/gradle.lockfile +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.27/gradle.lockfile @@ -33,11 +33,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -88,6 +91,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/gradle.lockfile b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/gradle.lockfile index 52b08a174b7..c52d062c290 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/gradle.lockfile @@ -33,11 +33,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -89,6 +92,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/gradle.lockfile b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/gradle.lockfile index d0013451922..a336d6ca602 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/gradle.lockfile +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/gradle.lockfile @@ -41,11 +41,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -96,6 +99,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/gradle.lockfile b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/gradle.lockfile index 1bb88f5f135..9a120f65eb4 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/gradle.lockfile +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/gradle.lockfile @@ -33,11 +33,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latest1xDepTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latest1xDepTestCompileClasspath,latest1xDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latest1xDepTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latest1xDepTestCompileClasspath,latest1xDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latest1xDepTestCompileClasspath,latest1xDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latest1xDepTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latest1xDepTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latest1xDepTestCompileClasspath,latest1xDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latest1xDepTestAnnotationProcessor,latest1xDepTestCompileClasspath,latest1xDepTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latest1xDepTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latest1xDepTestCompileClasspath,latest1xDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latest1xDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latest1xDepTestCompileClasspath,latest1xDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latest1xDepTestCompileClasspath,latest1xDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -93,6 +96,7 @@ org.hamcrest:hamcrest-core:1.3=latest1xDepTestRuntimeClasspath,latestDepTestRunt org.hamcrest:hamcrest:3.0=latest1xDepTestCompileClasspath,latest1xDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latest1xDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latest1xDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latest1xDepTestCompileClasspath,latest1xDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latest1xDepTestCompileClasspath,latest1xDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latest1xDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latest1xDepTestCompileClasspath,latest1xDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.26/gradle.lockfile b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.26/gradle.lockfile index 3529086cfa4..abf686a2057 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.26/gradle.lockfile +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.26/gradle.lockfile @@ -33,11 +33,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -89,6 +92,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-0.31/gradle.lockfile b/dd-java-agent/instrumentation/opentracing/opentracing-0.31/gradle.lockfile index 7a05c0211bb..41b3274c5cb 100644 --- a/dd-java-agent/instrumentation/opentracing/opentracing-0.31/gradle.lockfile +++ b/dd-java-agent/instrumentation/opentracing/opentracing-0.31/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -85,6 +88,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-0.32/gradle.lockfile b/dd-java-agent/instrumentation/opentracing/opentracing-0.32/gradle.lockfile index 8ac117a2538..d97e721a84e 100644 --- a/dd-java-agent/instrumentation/opentracing/opentracing-0.32/gradle.lockfile +++ b/dd-java-agent/instrumentation/opentracing/opentracing-0.32/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -88,6 +91,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-common/gradle.lockfile b/dd-java-agent/instrumentation/opentracing/opentracing-common/gradle.lockfile index e9d363e50e2..5e66d0bb20c 100644 --- a/dd-java-agent/instrumentation/opentracing/opentracing-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/opentracing/opentracing-common/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -85,6 +88,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/org-json-20230227/gradle.lockfile b/dd-java-agent/instrumentation/org-json-20230227/gradle.lockfile index 392d23d5c9e..2de3c806c2c 100644 --- a/dd-java-agent/instrumentation/org-json-20230227/gradle.lockfile +++ b/dd-java-agent/instrumentation/org-json-20230227/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -84,6 +87,7 @@ org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeCl org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.json:json:20230227=compileClasspath,testCompileClasspath,testRuntimeClasspath org.json:json:20250107=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/osgi-4.3/gradle.lockfile b/dd-java-agent/instrumentation/osgi-4.3/gradle.lockfile index b1e6868aa66..625ad6a8181 100644 --- a/dd-java-agent/instrumentation/osgi-4.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/osgi-4.3/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -82,6 +85,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/owasp-esapi-2.1/gradle.lockfile b/dd-java-agent/instrumentation/owasp-esapi-2.1/gradle.lockfile index b499a982d36..f0389f718ab 100644 --- a/dd-java-agent/instrumentation/owasp-esapi-2.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/owasp-esapi-2.1/gradle.lockfile @@ -33,11 +33,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,csiCo com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -120,6 +123,7 @@ org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClas org.htmlunit:neko-htmlunit:4.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/gradle.lockfile b/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/gradle.lockfile index b7489945f9e..eb314e86f67 100644 --- a/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/gradle.lockfile @@ -36,11 +36,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -103,6 +106,7 @@ org.jline:jline-native:3.27.1=zinc org.jline:jline-terminal-jni:3.27.1=zinc org.jline:jline-terminal:3.27.1=zinc org.jline:jline:3.27.1=zinc +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/gradle.lockfile b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/gradle.lockfile index 96ad6445a93..45f5a05bb68 100644 --- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/gradle.lockfile @@ -48,11 +48,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,baseTestAnnotationProc com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,baseTestAnnotationProcessor,iastTestAnnotationProcessor,latestDepIastTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestPekko10TestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPekko10TestCompileClasspath,latestPekko10TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,baseTestAnnotationProcessor,iastTestAnnotationProcessor,latestDepIastTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestPekko10TestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPekko10TestCompileClasspath,latestPekko10TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPekko10TestCompileClasspath,latestPekko10TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,baseTestAnnotationProcessor,iastTestAnnotationProcessor,latestDepIastTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestPekko10TestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,baseTestAnnotationProcessor,iastTestAnnotationProcessor,latestDepIastTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestPekko10TestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPekko10TestCompileClasspath,latestPekko10TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,baseTestAnnotationProcessor,baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestAnnotationProcessor,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepIastTestAnnotationProcessor,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPekko10TestAnnotationProcessor,latestPekko10TestCompileClasspath,latestPekko10TestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,baseTestAnnotationProcessor,iastTestAnnotationProcessor,latestDepIastTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestPekko10TestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPekko10TestCompileClasspath,latestPekko10TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=baseTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestPekko10TestRuntimeClasspath,testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.squareup.moshi:moshi:1.11.0=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPekko10TestCompileClasspath,latestPekko10TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -136,6 +139,7 @@ org.jline:jline-native:3.27.1=zinc org.jline:jline-terminal-jni:3.27.1=zinc org.jline:jline-terminal:3.27.1=zinc org.jline:jline:3.27.1=zinc +org.jspecify:jspecify:1.0.0=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPekko10TestCompileClasspath,latestPekko10TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPekko10TestCompileClasspath,latestPekko10TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=baseTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestPekko10TestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPekko10TestCompileClasspath,latestPekko10TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/play-ws/play-ws-1.0/gradle.lockfile b/dd-java-agent/instrumentation/play-ws/play-ws-1.0/gradle.lockfile index bd7ef75ad0c..c1bef47f362 100644 --- a/dd-java-agent/instrumentation/play-ws/play-ws-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/play-ws/play-ws-1.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -106,6 +109,7 @@ org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeCl org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.joda:joda-convert:1.7=compileClasspath,testCompileClasspath,testRuntimeClasspath org.joda:joda-convert:1.9.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/play-ws/play-ws-2.0/gradle.lockfile b/dd-java-agent/instrumentation/play-ws/play-ws-2.0/gradle.lockfile index b6678e307df..c7805218f19 100644 --- a/dd-java-agent/instrumentation/play-ws/play-ws-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/play-ws/play-ws-2.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -104,6 +107,7 @@ org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClas org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.joda:joda-convert:1.9.2=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/play-ws/play-ws-2.1/gradle.lockfile b/dd-java-agent/instrumentation/play-ws/play-ws-2.1/gradle.lockfile index e5de2e5a4df..f70f5462254 100644 --- a/dd-java-agent/instrumentation/play-ws/play-ws-2.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/play-ws/play-ws-2.1/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.protobuf:protobuf-java:3.10.0=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -102,6 +105,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/play-ws/play-ws-common/gradle.lockfile b/dd-java-agent/instrumentation/play-ws/play-ws-common/gradle.lockfile index 7264f536bd9..db88ea6fc11 100644 --- a/dd-java-agent/instrumentation/play-ws/play-ws-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/play-ws/play-ws-common/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -94,6 +97,7 @@ org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath org.joda:joda-convert:1.7=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/play/play-2.3/gradle.lockfile b/dd-java-agent/instrumentation/play/play-2.3/gradle.lockfile index 66de6ec7812..7e4aa8e4315 100644 --- a/dd-java-agent/instrumentation/play/play-2.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/play/play-2.3/gradle.lockfile @@ -43,11 +43,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:16.0.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.ning:async-http-client:1.8.15=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -167,6 +170,7 @@ org.jline:jline-terminal:3.27.1=zinc org.jline:jline:3.27.1=zinc org.joda:joda-convert:1.6=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.json:json:20080701=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/play/play-2.4/gradle.lockfile b/dd-java-agent/instrumentation/play/play-2.4/gradle.lockfile index 6299c5fb5c8..ba4c513aa43 100644 --- a/dd-java-agent/instrumentation/play/play-2.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/play/play-2.4/gradle.lockfile @@ -40,14 +40,17 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:16.0.1=compileClasspath -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.inject.extensions:guice-assistedinject:4.0=compileClasspath com.google.inject:guice:4.0=compileClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -112,6 +115,7 @@ org.javassist:javassist:3.19.0-GA=compileClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath org.joda:joda-convert:1.7=compileClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/play/play-2.6/gradle.lockfile b/dd-java-agent/instrumentation/play/play-2.6/gradle.lockfile index 8f00f4ac07d..a438a705c36 100644 --- a/dd-java-agent/instrumentation/play/play-2.6/gradle.lockfile +++ b/dd-java-agent/instrumentation/play/play-2.6/gradle.lockfile @@ -42,18 +42,21 @@ com.google.auto:auto-common:1.2.1=annotationProcessor,testAnnotationProcessor com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testFixturesCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.code.gson:gson:2.8.0=testCompileClasspath,testFixturesCompileClasspath,testRuntimeClasspath -com.google.errorprone:error_prone_annotations:2.0.18=compileClasspath,testCompileClasspath,testFixturesCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.0.18=compileClasspath com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testFixturesRuntimeClasspath -com.google.guava:guava:22.0=compileClasspath,testCompileClasspath,testFixturesCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.guava:guava:22.0=compileClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.inject.extensions:guice-assistedinject:4.1.0=testCompileClasspath,testFixturesCompileClasspath,testRuntimeClasspath com.google.inject:guice:4.1.0=testCompileClasspath,testFixturesCompileClasspath,testRuntimeClasspath -com.google.j2objc:j2objc-annotations:1.1=compileClasspath,testCompileClasspath,testFixturesCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:1.1=compileClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testFixturesRuntimeClasspath,testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.novocode:junit-interface:0.11=testCompileClasspath,testFixturesCompileClasspath,testRuntimeClasspath @@ -139,7 +142,7 @@ org.codehaus.groovy:groovy-templates:3.0.23=codenarc org.codehaus.groovy:groovy-xml:3.0.23=codenarc org.codehaus.groovy:groovy:3.0.23=codenarc org.codehaus.groovy:groovy:3.0.25=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -org.codehaus.mojo:animal-sniffer-annotations:1.14=compileClasspath,testCompileClasspath,testFixturesCompileClasspath,testRuntimeClasspath +org.codehaus.mojo:animal-sniffer-annotations:1.14=compileClasspath org.codenarc:CodeNarc:3.7.0=codenarc org.dom4j:dom4j:2.2.0=spotbugs org.fluentlenium:fluentlenium-core:3.2.0=testCompileClasspath,testFixturesCompileClasspath,testRuntimeClasspath @@ -154,6 +157,7 @@ org.jline:jline-native:3.27.1=zinc org.jline:jline-terminal-jni:3.27.1=zinc org.jline:jline-terminal:3.27.1=zinc org.jline:jline:3.27.1=zinc +org.jspecify:jspecify:1.0.0=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.5/gradle.lockfile b/dd-java-agent/instrumentation/play/play-appsec-2.5/gradle.lockfile index 1ff1b487bb1..1ba682fd7c3 100644 --- a/dd-java-agent/instrumentation/play/play-appsec-2.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/gradle.lockfile @@ -50,14 +50,17 @@ com.google.code.gson:gson:2.13.2=spotbugs com.google.code.gson:gson:2.3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:16.0.1=compileClasspath -com.google.guava:guava:19.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.inject.extensions:guice-assistedinject:4.0=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.inject:guice:4.0=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.novocode:junit-interface:0.11=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -218,6 +221,7 @@ org.jline:jline-terminal-jni:3.27.1=zinc org.jline:jline-terminal:3.27.1=zinc org.jline:jline:3.27.1=zinc org.joda:joda-convert:1.8.1=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.6/gradle.lockfile b/dd-java-agent/instrumentation/play/play-appsec-2.6/gradle.lockfile index 972ee94eaab..fcdebcd348a 100644 --- a/dd-java-agent/instrumentation/play/play-appsec-2.6/gradle.lockfile +++ b/dd-java-agent/instrumentation/play/play-appsec-2.6/gradle.lockfile @@ -42,17 +42,21 @@ com.google.auto:auto-common:1.2.1=annotationProcessor,testAnnotationProcessor com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.code.gson:gson:2.8.0=testCompileClasspath,testRuntimeClasspath -com.google.errorprone:error_prone_annotations:2.0.18=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.0.18=compileClasspath com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:22.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:22.0=compileClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.inject.extensions:guice-assistedinject:4.1.0=testCompileClasspath,testRuntimeClasspath com.google.inject:guice:4.1.0=testCompileClasspath,testRuntimeClasspath -com.google.j2objc:j2objc-annotations:1.1=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:1.1=compileClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.novocode:junit-interface:0.11=testCompileClasspath,testRuntimeClasspath @@ -138,7 +142,7 @@ org.codehaus.groovy:groovy-templates:3.0.23=codenarc org.codehaus.groovy:groovy-xml:3.0.23=codenarc org.codehaus.groovy:groovy:3.0.23=codenarc org.codehaus.groovy:groovy:3.0.25=testCompileClasspath,testRuntimeClasspath -org.codehaus.mojo:animal-sniffer-annotations:1.14=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.mojo:animal-sniffer-annotations:1.14=compileClasspath org.codenarc:CodeNarc:3.7.0=codenarc org.dom4j:dom4j:2.2.0=spotbugs org.fluentlenium:fluentlenium-core:3.2.0=testCompileClasspath,testRuntimeClasspath @@ -153,6 +157,7 @@ org.jline:jline-native:3.27.1=zinc org.jline:jline-terminal-jni:3.27.1=zinc org.jline:jline-terminal:3.27.1=zinc org.jline:jline:3.27.1=zinc +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.7/gradle.lockfile b/dd-java-agent/instrumentation/play/play-appsec-2.7/gradle.lockfile index c6cbd87ea4f..641d505e456 100644 --- a/dd-java-agent/instrumentation/play/play-appsec-2.7/gradle.lockfile +++ b/dd-java-agent/instrumentation/play/play-appsec-2.7/gradle.lockfile @@ -57,20 +57,22 @@ com.google.code.gson:gson:2.10=latestDepTestRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.2.0=compileClasspath -com.google.errorprone:error_prone_annotations:2.21.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0=compileClasspath -com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:27.0-jre=compileClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:32.1.3-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.inject.extensions:guice-assistedinject:4.2.2=testCompileClasspath,testRuntimeClasspath com.google.inject.extensions:guice-assistedinject:6.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.inject:guice:4.2.2=testCompileClasspath,testRuntimeClasspath com.google.inject:guice:6.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.j2objc:j2objc-annotations:1.1=compileClasspath -com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath +com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.novocode:junit-interface:0.11=testCompileClasspath,testRuntimeClasspath @@ -228,7 +230,6 @@ org.atteo.classindex:classindex:3.4=testCompileClasspath,testRuntimeClasspath org.brotli:dec:0.1.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.checkerframework:checker-qual:2.5.2=compileClasspath org.checkerframework:checker-qual:3.33.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -org.checkerframework:checker-qual:3.37.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.groovy:groovy-ant:3.0.23=codenarc org.codehaus.groovy:groovy-docgenerator:3.0.23=codenarc org.codehaus.groovy:groovy-groovydoc:3.0.23=codenarc @@ -253,6 +254,7 @@ org.jline:jline-native:3.27.1=zinc org.jline:jline-terminal-jni:3.27.1=zinc org.jline:jline-terminal:3.27.1=zinc org.jline:jline:3.27.1=zinc +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/play/play-appsec-common/gradle.lockfile b/dd-java-agent/instrumentation/play/play-appsec-common/gradle.lockfile index acaa8bbff9c..0894814822a 100644 --- a/dd-java-agent/instrumentation/play/play-appsec-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/play/play-appsec-common/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -82,6 +85,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/protobuf-3.0/gradle.lockfile b/dd-java-agent/instrumentation/protobuf-3.0/gradle.lockfile index 689081299d1..96d15b9a81a 100644 --- a/dd-java-agent/instrumentation/protobuf-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/protobuf-3.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,compi com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.google.protobuf:protobuf-java:3.0.0=compileClasspath,compileProtoPath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.google.protobuf:protoc:3.0.0=protobufToolsLocator_protoc com.google.re2j:re2j:1.8=testCompileProtoPath,testRuntimeClasspath @@ -84,6 +87,7 @@ org.hamcrest:hamcrest-core:1.3=testCompileProtoPath,testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testCompileProtoPath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=testCompileProtoPath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testCompileProtoPath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/quartz-2.0/gradle.lockfile b/dd-java-agent/instrumentation/quartz-2.0/gradle.lockfile index 157765e4f17..4cf9fdf91cb 100644 --- a/dd-java-agent/instrumentation/quartz-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/quartz-2.0/gradle.lockfile @@ -33,11 +33,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,version40TestAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version40TestCompileClasspath,version40TestRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,version40TestAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version40TestCompileClasspath,version40TestRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version40TestCompileClasspath,version40TestRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,version40TestAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,version40TestAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version40TestCompileClasspath,version40TestRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath,version40TestAnnotationProcessor,version40TestCompileClasspath,version40TestRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,version40TestAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version40TestCompileClasspath,version40TestRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath,version40TestRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version40TestCompileClasspath,version40TestRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version40TestCompileClasspath,version40TestRuntimeClasspath @@ -87,6 +90,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version40TestCompileClasspath,version40TestRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath,version40TestRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath,version40TestRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version40TestCompileClasspath,version40TestRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version40TestCompileClasspath,version40TestRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath,version40TestRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version40TestCompileClasspath,version40TestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/gradle.lockfile b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/gradle.lockfile index 5d329104ac2..faef1db6759 100644 --- a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/gradle.lockfile +++ b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/gradle.lockfile @@ -37,11 +37,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,latestReactorTestAnnotationProcessor,reactorTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestReactorTestCompileClasspath,latestReactorTestRuntimeClasspath,reactorTestCompileClasspath,reactorTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,latestReactorTestAnnotationProcessor,reactorTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestReactorTestCompileClasspath,latestReactorTestRuntimeClasspath,reactorTestCompileClasspath,reactorTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestReactorTestCompileClasspath,latestReactorTestRuntimeClasspath,reactorTestCompileClasspath,reactorTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,latestReactorTestAnnotationProcessor,reactorTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestReactorTestAnnotationProcessor,reactorTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestReactorTestCompileClasspath,latestReactorTestRuntimeClasspath,reactorTestCompileClasspath,reactorTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestReactorTestAnnotationProcessor,latestReactorTestCompileClasspath,latestReactorTestRuntimeClasspath,reactorTestAnnotationProcessor,reactorTestCompileClasspath,reactorTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,latestReactorTestAnnotationProcessor,reactorTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestReactorTestCompileClasspath,latestReactorTestRuntimeClasspath,reactorTestCompileClasspath,reactorTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,latestReactorTestRuntimeClasspath,reactorTestRuntimeClasspath,testRuntimeClasspath com.rabbitmq:amqp-client:2.7.0=compileClasspath com.rabbitmq:amqp-client:2.8.1=testCompileClasspath,testRuntimeClasspath @@ -112,6 +115,7 @@ org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClas org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,latestReactorTestRuntimeClasspath,reactorTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,latestReactorTestRuntimeClasspath,reactorTestRuntimeClasspath,testRuntimeClasspath org.jetbrains:annotations:17.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestReactorTestCompileClasspath,latestReactorTestRuntimeClasspath,reactorTestCompileClasspath,reactorTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestReactorTestCompileClasspath,latestReactorTestRuntimeClasspath,reactorTestCompileClasspath,reactorTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestReactorTestCompileClasspath,latestReactorTestRuntimeClasspath,reactorTestCompileClasspath,reactorTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,latestReactorTestRuntimeClasspath,reactorTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestReactorTestCompileClasspath,latestReactorTestRuntimeClasspath,reactorTestCompileClasspath,reactorTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/ratpack-1.5/gradle.lockfile b/dd-java-agent/instrumentation/ratpack-1.5/gradle.lockfile index 4991be373f9..c082400b8e6 100644 --- a/dd-java-agent/instrumentation/ratpack-1.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/ratpack-1.5/gradle.lockfile @@ -49,19 +49,20 @@ com.google.auto:auto-common:1.2.1=annotationProcessor,latestDepTestAnnotationPro com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.errorprone:error_prone_annotations:2.4.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor -com.google.guava:guava:21.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.guava:guava:28.2-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:21.0=compileClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.inject.extensions:guice-multibindings:4.1.0=testCompileClasspath,testRuntimeClasspath com.google.inject.extensions:guice-multibindings:4.2.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.inject:guice:4.1.0=testCompileClasspath,testRuntimeClasspath com.google.inject:guice:4.2.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.google.j2objc:j2objc-annotations:1.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -183,6 +184,7 @@ org.javassist:javassist:3.19.0-GA=compileClasspath,testCompileClasspath,testRunt org.javassist:javassist:3.22.0-GA=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/reactive-streams-1.0/gradle.lockfile b/dd-java-agent/instrumentation/reactive-streams-1.0/gradle.lockfile index b0f58caf7b3..22e689397b6 100644 --- a/dd-java-agent/instrumentation/reactive-streams-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/reactive-streams-1.0/gradle.lockfile @@ -33,11 +33,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -86,6 +89,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/reactor-core-3.1/gradle.lockfile b/dd-java-agent/instrumentation/reactor-core-3.1/gradle.lockfile index cdc82152c06..60374c20080 100644 --- a/dd-java-agent/instrumentation/reactor-core-3.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/reactor-core-3.1/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -94,7 +97,7 @@ org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClas org.hdrhistogram:HdrHistogram:2.2.2=latestDepTestRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath -org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/reactor-netty-1.0/gradle.lockfile b/dd-java-agent/instrumentation/reactor-netty-1.0/gradle.lockfile index 0ed4ede925e..40d98318355 100644 --- a/dd-java-agent/instrumentation/reactor-netty-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/reactor-netty-1.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -123,7 +126,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath -org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/rediscala-1.8/gradle.lockfile b/dd-java-agent/instrumentation/rediscala-1.8/gradle.lockfile index e757f7432a3..8d5369ea10f 100644 --- a/dd-java-agent/instrumentation/rediscala-1.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/rediscala-1.8/gradle.lockfile @@ -35,11 +35,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -90,6 +93,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/redisson/redisson-2.0.0/gradle.lockfile b/dd-java-agent/instrumentation/redisson/redisson-2.0.0/gradle.lockfile index 45cecfb8c50..ec24d4c6fae 100644 --- a/dd-java-agent/instrumentation/redisson/redisson-2.0.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/redisson/redisson-2.0.0/gradle.lockfile @@ -47,11 +47,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.redis.testcontainers:testcontainers-redis:1.6.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.redis:redis-enterprise-admin:0.3.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -120,6 +123,7 @@ org.hamcrest:hamcrest:3.0=latestDepForkedTestCompileClasspath,latestDepForkedTes org.jctools:jctools-core-jdk11:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jetbrains:annotations:17.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/redisson/redisson-2.3.0/gradle.lockfile b/dd-java-agent/instrumentation/redisson/redisson-2.3.0/gradle.lockfile index 38668f42f11..808ddcfc271 100644 --- a/dd-java-agent/instrumentation/redisson/redisson-2.3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/redisson/redisson-2.3.0/gradle.lockfile @@ -48,11 +48,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.redis.testcontainers:testcontainers-redis:1.6.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.redis:redis-enterprise-admin:0.3.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -130,6 +133,7 @@ org.jctools:jctools-core:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTest org.jetbrains:annotations:17.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jodd:jodd-bean:3.7.1=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jodd:jodd-core:3.7.1=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/redisson/redisson-3.10.3/gradle.lockfile b/dd-java-agent/instrumentation/redisson/redisson-3.10.3/gradle.lockfile index 519250eeab3..c43f87b6508 100644 --- a/dd-java-agent/instrumentation/redisson/redisson-3.10.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/redisson/redisson-3.10.3/gradle.lockfile @@ -54,11 +54,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.redis.testcontainers:testcontainers-redis:1.6.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.redis:redis-enterprise-admin:0.3.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -141,6 +144,7 @@ org.jetbrains:annotations:17.0.0=latestDepForkedTestCompileClasspath,latestDepFo org.jodd:jodd-bean:5.0.8=compileClasspath,testCompileClasspath,testRuntimeClasspath org.jodd:jodd-core:5.0.8=compileClasspath,testCompileClasspath,testRuntimeClasspath org.jodd:jodd-util:6.3.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/renaissance-0.7/gradle.lockfile b/dd-java-agent/instrumentation/renaissance-0.7/gradle.lockfile index 32aaffd36f8..6fb63b71d6a 100644 --- a/dd-java-agent/instrumentation/renaissance-0.7/gradle.lockfile +++ b/dd-java-agent/instrumentation/renaissance-0.7/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -82,6 +85,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/gradle.lockfile b/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/gradle.lockfile index 9d3aa92ef76..f9f26f1b304 100644 --- a/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -104,7 +107,7 @@ org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClas org.hdrhistogram:HdrHistogram:2.2.2=latestDepTestRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath -org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/gradle.lockfile b/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/gradle.lockfile index e66c8fe0e58..30e4156af81 100644 --- a/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -107,7 +110,7 @@ org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClas org.hdrhistogram:HdrHistogram:2.2.2=latestDepTestRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath -org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.0/gradle.lockfile b/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.0/gradle.lockfile index 630571c8bd9..c44a49611e5 100644 --- a/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -94,6 +97,7 @@ org.jboss.resteasy:jaxrs-api:3.0.0.Final=compileClasspath org.jboss.resteasy:resteasy-jaxrs:3.0.0.Final=compileClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.1/gradle.lockfile b/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.1/gradle.lockfile index 38d3913ad92..d17737647d1 100644 --- a/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.1/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -95,6 +98,7 @@ org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec:1.0.0.Final=compi org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.0_spec:1.0.1.Beta1=compileClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/resteasy/resteasy-3.0/gradle.lockfile b/dd-java-agent/instrumentation/resteasy/resteasy-3.0/gradle.lockfile index 054d0d2d0ab..7d39e5ef3b2 100644 --- a/dd-java-agent/instrumentation/resteasy/resteasy-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/resteasy/resteasy-3.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -94,6 +97,7 @@ org.jboss.resteasy:resteasy-client:3.0.0.Final=compileClasspath,testCompileClass org.jboss.resteasy:resteasy-jaxrs:3.0.0.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/restlet-2.2/gradle.lockfile b/dd-java-agent/instrumentation/restlet-2.2/gradle.lockfile index c37c53db6db..abf6cd89fb7 100644 --- a/dd-java-agent/instrumentation/restlet-2.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/restlet-2.2/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,baseForkedTestAnnotati com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,baseForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,baseForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,baseForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,baseForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,baseForkedTestAnnotationProcessor,baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,baseForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=baseForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -82,6 +85,7 @@ org.hamcrest:hamcrest-core:1.3=baseForkedTestRuntimeClasspath,latestDepTestRunti org.hamcrest:hamcrest:3.0=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=baseForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=baseForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=baseForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/gradle.lockfile b/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/gradle.lockfile index 422fe4a2093..43ba8da4f8f 100644 --- a/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepJava11TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepJava11TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepJava11TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepJava11TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepJava11TestAnnotationProcessor,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepJava11TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepJava11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -88,6 +91,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepJava11TestRuntimeClasspath,latestDepTest org.hamcrest:hamcrest:3.0=latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepJava11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepJava11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepJava11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-1.1.1/gradle.lockfile b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-1.1.1/gradle.lockfile index e456db03ce7..926e59f5bb8 100644 --- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-1.1.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-1.1.1/gradle.lockfile @@ -52,11 +52,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:17.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -144,6 +147,7 @@ org.hibernate:hibernate-validator:5.1.1.Final=testCompileClasspath,testRuntimeCl org.jboss.logging:jboss-logging:3.1.3.GA=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/gradle.lockfile b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/gradle.lockfile index bfaa8910933..26ced497466 100644 --- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/gradle.lockfile @@ -46,14 +46,15 @@ com.google.auto:auto-common:1.2.1=annotationProcessor,latestDepTestAnnotationPro com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,nestedTestAnnotationProcessor,nestedTestCompileClasspath,nestedTestRuntimeClasspath,resteasy31TestAnnotationProcessor,resteasy31TestCompileClasspath,resteasy31TestRuntimeClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,nestedTestAnnotationProcessor,resteasy31TestAnnotationProcessor,testAnnotationProcessor -com.google.errorprone:error_prone_annotations:2.3.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,nestedTestCompileClasspath,nestedTestRuntimeClasspath,resteasy31TestCompileClasspath,resteasy31TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,nestedTestAnnotationProcessor,nestedTestCompileClasspath,nestedTestRuntimeClasspath,resteasy31TestAnnotationProcessor,resteasy31TestCompileClasspath,resteasy31TestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -com.google.guava:guava:30.1-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,nestedTestCompileClasspath,nestedTestRuntimeClasspath,resteasy31TestCompileClasspath,resteasy31TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,nestedTestCompileClasspath,nestedTestRuntimeClasspath,resteasy31TestCompileClasspath,resteasy31TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,nestedTestAnnotationProcessor,resteasy31TestAnnotationProcessor,testAnnotationProcessor +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,nestedTestCompileClasspath,nestedTestRuntimeClasspath,resteasy31TestCompileClasspath,resteasy31TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,nestedTestAnnotationProcessor,resteasy31TestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,nestedTestCompileClasspath,nestedTestRuntimeClasspath,resteasy31TestCompileClasspath,resteasy31TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,nestedTestAnnotationProcessor,nestedTestCompileClasspath,nestedTestRuntimeClasspath,resteasy31TestAnnotationProcessor,resteasy31TestCompileClasspath,resteasy31TestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -com.google.j2objc:j2objc-annotations:1.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,nestedTestCompileClasspath,nestedTestRuntimeClasspath,resteasy31TestCompileClasspath,resteasy31TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,nestedTestAnnotationProcessor,resteasy31TestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,nestedTestCompileClasspath,nestedTestRuntimeClasspath,resteasy31TestCompileClasspath,resteasy31TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,nestedTestRuntimeClasspath,resteasy31TestRuntimeClasspath,testRuntimeClasspath com.helger:profiler:1.1.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,nestedTestCompileClasspath,nestedTestRuntimeClasspath,resteasy31TestCompileClasspath,resteasy31TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,nestedTestCompileClasspath,nestedTestRuntimeClasspath,resteasy31TestCompileClasspath,resteasy31TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -140,7 +141,6 @@ org.apache.logging.log4j:log4j-core:2.25.2=spotbugs org.apiguardian:apiguardian-api:1.1.2=latestDepTestCompileClasspath,nestedTestCompileClasspath,resteasy31TestCompileClasspath,testCompileClasspath org.assertj:assertj-core:3.18.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,nestedTestCompileClasspath,nestedTestRuntimeClasspath,resteasy31TestCompileClasspath,resteasy31TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.checkerframework:checker-qual:3.33.0=annotationProcessor,latestDepTestAnnotationProcessor,nestedTestAnnotationProcessor,resteasy31TestAnnotationProcessor,testAnnotationProcessor -org.checkerframework:checker-qual:3.5.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,nestedTestCompileClasspath,nestedTestRuntimeClasspath,resteasy31TestCompileClasspath,resteasy31TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.groovy:groovy-ant:3.0.23=codenarc org.codehaus.groovy:groovy-docgenerator:3.0.23=codenarc org.codehaus.groovy:groovy-groovydoc:3.0.23=codenarc @@ -203,6 +203,7 @@ org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec:1.0.1.Final=latestDepTestCom org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.3_spec:1.0.0.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,nestedTestRuntimeClasspath,resteasy31TestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,nestedTestRuntimeClasspath,resteasy31TestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,nestedTestCompileClasspath,nestedTestRuntimeClasspath,resteasy31TestCompileClasspath,resteasy31TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,nestedTestCompileClasspath,nestedTestRuntimeClasspath,resteasy31TestCompileClasspath,resteasy31TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,nestedTestRuntimeClasspath,resteasy31TestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,nestedTestCompileClasspath,nestedTestRuntimeClasspath,resteasy31TestCompileClasspath,resteasy31TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-1.1/gradle.lockfile b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-1.1/gradle.lockfile index 8f42d00d2ac..1bf44d82b29 100644 --- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-1.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-1.1/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -87,6 +90,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-1.0/gradle.lockfile b/dd-java-agent/instrumentation/rxjava/rxjava-1.0/gradle.lockfile index a287e9e4541..8fff88cef26 100644 --- a/dd-java-agent/instrumentation/rxjava/rxjava-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/rxjava/rxjava-1.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -83,6 +86,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-2.0/gradle.lockfile b/dd-java-agent/instrumentation/rxjava/rxjava-2.0/gradle.lockfile index e188215c803..61fa3b9fb9a 100644 --- a/dd-java-agent/instrumentation/rxjava/rxjava-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/rxjava/rxjava-2.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -88,6 +91,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/scala/scala-2.10.7/gradle.lockfile b/dd-java-agent/instrumentation/scala/scala-2.10.7/gradle.lockfile index e11fe2c7464..013213897c1 100644 --- a/dd-java-agent/instrumentation/scala/scala-2.10.7/gradle.lockfile +++ b/dd-java-agent/instrumentation/scala/scala-2.10.7/gradle.lockfile @@ -36,11 +36,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,csiCo com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath @@ -97,6 +100,7 @@ org.jline:jline-native:3.27.1=zinc org.jline:jline-terminal-jni:3.27.1=zinc org.jline:jline-terminal:3.27.1=zinc org.jline:jline:3.27.1=zinc +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/gradle.lockfile b/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/gradle.lockfile index 67e1d582a84..141b7881d38 100644 --- a/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/gradle.lockfile @@ -36,11 +36,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latest11TestAnnotationProcessor,latest12TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latest11TestCompileClasspath,latest11TestRuntimeClasspath,latest12TestCompileClasspath,latest12TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latest11TestAnnotationProcessor,latest12TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latest11TestCompileClasspath,latest11TestRuntimeClasspath,latest12TestCompileClasspath,latest12TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latest11TestCompileClasspath,latest11TestRuntimeClasspath,latest12TestCompileClasspath,latest12TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latest11TestAnnotationProcessor,latest12TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latest11TestAnnotationProcessor,latest12TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latest11TestCompileClasspath,latest11TestRuntimeClasspath,latest12TestCompileClasspath,latest12TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latest11TestAnnotationProcessor,latest11TestCompileClasspath,latest11TestRuntimeClasspath,latest12TestAnnotationProcessor,latest12TestCompileClasspath,latest12TestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latest11TestAnnotationProcessor,latest12TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latest11TestCompileClasspath,latest11TestRuntimeClasspath,latest12TestCompileClasspath,latest12TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latest11TestRuntimeClasspath,latest12TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.squareup.moshi:moshi:1.11.0=latest11TestCompileClasspath,latest11TestRuntimeClasspath,latest12TestCompileClasspath,latest12TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -97,6 +100,7 @@ org.jline:jline-native:3.27.1=zinc org.jline:jline-terminal-jni:3.27.1=zinc org.jline:jline-terminal:3.27.1=zinc org.jline:jline:3.27.1=zinc +org.jspecify:jspecify:1.0.0=latest11TestCompileClasspath,latest11TestRuntimeClasspath,latest12TestCompileClasspath,latest12TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latest11TestCompileClasspath,latest11TestRuntimeClasspath,latest12TestCompileClasspath,latest12TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latest11TestRuntimeClasspath,latest12TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latest11TestCompileClasspath,latest11TestRuntimeClasspath,latest12TestCompileClasspath,latest12TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.10/gradle.lockfile b/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.10/gradle.lockfile index 76a85c360b0..12416bc953a 100644 --- a/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.10/gradle.lockfile +++ b/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.10/gradle.lockfile @@ -36,11 +36,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -97,6 +100,7 @@ org.jline:jline-native:3.27.1=zinc org.jline:jline-terminal-jni:3.27.1=zinc org.jline:jline-terminal:3.27.1=zinc org.jline:jline:3.27.1=zinc +org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.13/gradle.lockfile b/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.13/gradle.lockfile index edcee3ecfce..8ef90b14224 100644 --- a/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.13/gradle.lockfile +++ b/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.13/gradle.lockfile @@ -36,11 +36,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -97,6 +100,7 @@ org.jline:jline-native:3.27.1=zinc org.jline:jline-terminal-jni:3.27.1=zinc org.jline:jline-terminal:3.27.1=zinc org.jline:jline:3.27.1=zinc +org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-common/gradle.lockfile b/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-common/gradle.lockfile index 8f2c420fab1..1c018f8aac3 100644 --- a/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-common/gradle.lockfile @@ -36,11 +36,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath @@ -97,6 +100,7 @@ org.jline:jline-native:3.27.1=zinc org.jline:jline-terminal-jni:3.27.1=zinc org.jline:jline-terminal:3.27.1=zinc org.jline:jline:3.27.1=zinc +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/scalatest-3.0.8/gradle.lockfile b/dd-java-agent/instrumentation/scalatest-3.0.8/gradle.lockfile index 3460cc355ca..618383089ea 100644 --- a/dd-java-agent/instrumentation/scalatest-3.0.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/scalatest-3.0.8/gradle.lockfile @@ -40,11 +40,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.8.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc @@ -108,6 +111,7 @@ org.jline:jline-native:3.27.1=zinc org.jline:jline-terminal-jni:3.27.1=zinc org.jline:jline-terminal:3.27.1=zinc org.jline:jline:3.27.1=zinc +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/selenium-3.13/gradle.lockfile b/dd-java-agent/instrumentation/selenium-3.13/gradle.lockfile index 984f8e4dabd..06c3100bda7 100644 --- a/dd-java-agent/instrumentation/selenium-3.13/gradle.lockfile +++ b/dd-java-agent/instrumentation/selenium-3.13/gradle.lockfile @@ -34,20 +34,19 @@ com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnno com.google.auto:auto-common:1.2.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs -com.google.errorprone:error_prone_annotations:2.1.3=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.1.3=compileClasspath com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.google.guava:guava:20.0=testFixturesCompileClasspath,testFixturesRuntimeClasspath -com.google.guava:guava:25.0-jre=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.guava:guava:25.0-jre=compileClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor -com.google.j2objc:j2objc-annotations:1.1=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:1.1=compileClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.8.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.shapesecurity:salvation2:3.0.1=testCompileClasspath,testRuntimeClasspath @@ -113,7 +112,7 @@ org.apache.logging.log4j:log4j-api:2.25.2=spotbugs org.apache.logging.log4j:log4j-core:2.25.2=spotbugs org.apiguardian:apiguardian-api:1.1.2=latestDepTestCompileClasspath,testCompileClasspath,testFixturesCompileClasspath org.brotli:dec:0.1.2=testCompileClasspath,testRuntimeClasspath -org.checkerframework:checker-compat-qual:2.0.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.checkerframework:checker-compat-qual:2.0.0=compileClasspath org.checkerframework:checker-qual:3.33.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor org.codehaus.groovy:groovy-ant:3.0.23=codenarc org.codehaus.groovy:groovy-docgenerator:3.0.23=codenarc @@ -124,7 +123,7 @@ org.codehaus.groovy:groovy-templates:3.0.23=codenarc org.codehaus.groovy:groovy-xml:3.0.23=codenarc org.codehaus.groovy:groovy:3.0.23=codenarc org.codehaus.groovy:groovy:3.0.25=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testRuntimeClasspath -org.codehaus.mojo:animal-sniffer-annotations:1.14=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.mojo:animal-sniffer-annotations:1.14=compileClasspath org.codenarc:CodeNarc:3.7.0=codenarc org.dom4j:dom4j:2.2.0=spotbugs org.eclipse.jetty.websocket:websocket-api:9.4.50.v20221201=testCompileClasspath,testRuntimeClasspath @@ -149,7 +148,7 @@ org.jacoco:org.jacoco.core:0.8.14=latestDepTestRuntimeClasspath,testFixturesRunt org.jacoco:org.jacoco.report:0.8.14=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.0/gradle.lockfile b/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.0/gradle.lockfile index aeb516c3f07..0608ebc6872 100644 --- a/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.0/gradle.lockfile @@ -33,11 +33,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.protobuf:protobuf-bom:3.25.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -106,6 +109,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.56/gradle.lockfile b/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.56/gradle.lockfile index f880931c142..2656b90b0b8 100644 --- a/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.56/gradle.lockfile +++ b/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.56/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -89,6 +92,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/gradle.lockfile b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/gradle.lockfile index 73ba88a3b48..b1167524b6f 100644 --- a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,csiCo com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -84,6 +87,7 @@ org.hamcrest:hamcrest-core:1.3=testFixturesRuntimeClasspath,testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testFixturesCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testFixturesRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=testFixturesRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/gradle.lockfile b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/gradle.lockfile index f7ee5ccf0c0..3f5fc5d9aa4 100644 --- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -98,6 +101,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/gradle.lockfile b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/gradle.lockfile index 430901102ef..e404e99dabe 100644 --- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,csiCo com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -106,6 +109,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepForkedTestRuntimeClasspath,latestDepTest org.hamcrest:hamcrest:3.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/gradle.lockfile b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/gradle.lockfile index 99b4f1d5d02..4ed0cf87ad0 100644 --- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,csiCo com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -82,6 +85,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/gradle.lockfile b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/gradle.lockfile index 08c765efe5f..a4019a1db29 100644 --- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/gradle.lockfile +++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -85,6 +88,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/slick-3.2/gradle.lockfile b/dd-java-agent/instrumentation/slick-3.2/gradle.lockfile index b4d1bef6306..358dd72acd1 100644 --- a/dd-java-agent/instrumentation/slick-3.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/slick-3.2/gradle.lockfile @@ -36,11 +36,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.h2database:h2:1.4.197=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc @@ -102,6 +105,7 @@ org.jline:jline-native:3.27.1=zinc org.jline:jline-terminal-jni:3.27.1=zinc org.jline:jline-terminal:3.27.1=zinc org.jline:jline:3.27.1=zinc +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/snakeyaml-1.33/gradle.lockfile b/dd-java-agent/instrumentation/snakeyaml-1.33/gradle.lockfile index 67decf4c904..64a4f5fb8f1 100644 --- a/dd-java-agent/instrumentation/snakeyaml-1.33/gradle.lockfile +++ b/dd-java-agent/instrumentation/snakeyaml-1.33/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -82,6 +85,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spark/spark-executor-common/gradle.lockfile b/dd-java-agent/instrumentation/spark/spark-executor-common/gradle.lockfile index 73993a95449..e824c3f689b 100644 --- a/dd-java-agent/instrumentation/spark/spark-executor-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/spark/spark-executor-common/gradle.lockfile @@ -55,14 +55,17 @@ com.google.code.gson:gson:2.2.4=baseTestCompileClasspath,baseTestRuntimeClasspat com.google.crypto.tink:tink:1.9.0=latest212DepTestCompileClasspath,latest212DepTestRuntimeClasspath,latest213DepTestCompileClasspath,latest213DepTestRuntimeClasspath com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,baseTestAnnotationProcessor,latest212DepTestAnnotationProcessor,latest213DepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=baseTestCompileClasspath,baseTestRuntimeClasspath,latest212DepTestCompileClasspath,latest212DepTestRuntimeClasspath,latest213DepTestCompileClasspath,latest213DepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.flatbuffers:flatbuffers-java:1.12.0=latest212DepTestCompileClasspath,latest212DepTestRuntimeClasspath,latest213DepTestCompileClasspath,latest213DepTestRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,baseTestAnnotationProcessor,latest212DepTestAnnotationProcessor,latest213DepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:16.0.1=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath,latest212DepTestCompileClasspath,latest212DepTestRuntimeClasspath,latest213DepTestCompileClasspath,latest213DepTestRuntimeClasspath -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=baseTestCompileClasspath,baseTestRuntimeClasspath,latest212DepTestCompileClasspath,latest212DepTestRuntimeClasspath,latest213DepTestCompileClasspath,latest213DepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:16.0.1=compileClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,baseTestAnnotationProcessor,latest212DepTestAnnotationProcessor,latest213DepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,baseTestAnnotationProcessor,latest212DepTestAnnotationProcessor,latest213DepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=baseTestCompileClasspath,baseTestRuntimeClasspath,latest212DepTestCompileClasspath,latest212DepTestRuntimeClasspath,latest213DepTestCompileClasspath,latest213DepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,baseTestAnnotationProcessor,baseTestCompileClasspath,baseTestRuntimeClasspath,latest212DepTestAnnotationProcessor,latest212DepTestCompileClasspath,latest212DepTestRuntimeClasspath,latest213DepTestAnnotationProcessor,latest213DepTestCompileClasspath,latest213DepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.inject:guice:3.0=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,baseTestAnnotationProcessor,latest212DepTestAnnotationProcessor,latest213DepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=baseTestCompileClasspath,baseTestRuntimeClasspath,latest212DepTestCompileClasspath,latest212DepTestRuntimeClasspath,latest213DepTestCompileClasspath,latest213DepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.protobuf:protobuf-java:2.5.0=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath com.google.protobuf:protobuf-java:3.19.6=latest212DepTestCompileClasspath,latest212DepTestRuntimeClasspath,latest213DepTestCompileClasspath,latest213DepTestRuntimeClasspath com.google.re2j:re2j:1.8=baseTestRuntimeClasspath,latest212DepTestRuntimeClasspath,latest213DepTestRuntimeClasspath,testRuntimeClasspath @@ -356,6 +359,7 @@ org.json4s:json4s-jackson_2.13:3.7.0-M11=latest213DepTestCompileClasspath,latest org.json4s:json4s-scalap_2.12:3.5.3=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath org.json4s:json4s-scalap_2.12:3.7.0-M11=latest212DepTestCompileClasspath,latest212DepTestRuntimeClasspath org.json4s:json4s-scalap_2.13:3.7.0-M11=latest213DepTestCompileClasspath,latest213DepTestRuntimeClasspath +org.jspecify:jspecify:1.0.0=baseTestCompileClasspath,baseTestRuntimeClasspath,latest212DepTestCompileClasspath,latest212DepTestRuntimeClasspath,latest213DepTestCompileClasspath,latest213DepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=baseTestCompileClasspath,baseTestRuntimeClasspath,latest212DepTestCompileClasspath,latest212DepTestRuntimeClasspath,latest213DepTestCompileClasspath,latest213DepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=baseTestRuntimeClasspath,latest212DepTestRuntimeClasspath,latest213DepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=baseTestCompileClasspath,baseTestRuntimeClasspath,latest212DepTestCompileClasspath,latest212DepTestRuntimeClasspath,latest213DepTestCompileClasspath,latest213DepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spark/sparkjava-2.3/gradle.lockfile b/dd-java-agent/instrumentation/spark/sparkjava-2.3/gradle.lockfile index 0b2e2c9e094..f64a04e7326 100644 --- a/dd-java-agent/instrumentation/spark/sparkjava-2.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/spark/sparkjava-2.3/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.sparkjava:spark-core:2.3=compileClasspath com.sparkjava:spark-core:2.4=testCompileClasspath,testRuntimeClasspath @@ -126,6 +129,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spray-1.3/gradle.lockfile b/dd-java-agent/instrumentation/spray-1.3/gradle.lockfile index cc42b79e664..8525f43cd73 100644 --- a/dd-java-agent/instrumentation/spray-1.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/spray-1.3/gradle.lockfile @@ -37,11 +37,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath @@ -110,6 +113,7 @@ org.jline:jline-native:3.27.1=zinc org.jline:jline-terminal-jni:3.27.1=zinc org.jline:jline-terminal:3.27.1=zinc org.jline:jline:3.27.1=zinc +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-beans-3.1/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-beans-3.1/gradle.lockfile index 5b0d23c155d..827ef5afe25 100644 --- a/dd-java-agent/instrumentation/spring/spring-beans-3.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-beans-3.1/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -83,6 +86,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-boot-1.3/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-boot-1.3/gradle.lockfile index e7b53e69f43..50169515003 100644 --- a/dd-java-agent/instrumentation/spring/spring-boot-1.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-boot-1.3/gradle.lockfile @@ -35,13 +35,15 @@ com.google.auto:auto-common:1.2.1=annotationProcessor,boot1LatestDepForkedTestAn com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,boot1LatestDepForkedTestAnnotationProcessor,boot1LatestDepForkedTestCompileClasspath,boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestAnnotationProcessor,boot1LatestDepTestCompileClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestAnnotationProcessor,boot2ForkedTestCompileClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestAnnotationProcessor,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestAnnotationProcessor,boot2LatestDepTestCompileClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestAnnotationProcessor,boot2TestCompileClasspath,boot2TestRuntimeClasspath,boot3ForkedTestAnnotationProcessor,boot3ForkedTestCompileClasspath,boot3ForkedTestRuntimeClasspath,boot3TestAnnotationProcessor,boot3TestCompileClasspath,boot3TestRuntimeClasspath,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,boot1LatestDepForkedTestAnnotationProcessor,boot1LatestDepTestAnnotationProcessor,boot2ForkedTestAnnotationProcessor,boot2LatestDepForkedTestAnnotationProcessor,boot2LatestDepTestAnnotationProcessor,boot2TestAnnotationProcessor,boot3ForkedTestAnnotationProcessor,boot3TestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.errorprone:error_prone_annotations:2.38.0=latestDepForkedTestCompileClasspath,latestDepTestCompileClasspath com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=boot1LatestDepForkedTestCompileClasspath,boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestCompileClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestCompileClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestCompileClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestCompileClasspath,boot2TestRuntimeClasspath,boot3ForkedTestCompileClasspath,boot3ForkedTestRuntimeClasspath,boot3TestCompileClasspath,boot3TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,boot1LatestDepForkedTestAnnotationProcessor,boot1LatestDepTestAnnotationProcessor,boot2ForkedTestAnnotationProcessor,boot2LatestDepForkedTestAnnotationProcessor,boot2LatestDepTestAnnotationProcessor,boot2TestAnnotationProcessor,boot3ForkedTestAnnotationProcessor,boot3TestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=boot1LatestDepForkedTestCompileClasspath,boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestCompileClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestCompileClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestCompileClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestCompileClasspath,boot2TestRuntimeClasspath,boot3ForkedTestCompileClasspath,boot3ForkedTestRuntimeClasspath,boot3TestCompileClasspath,boot3TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=boot1LatestDepForkedTestCompileClasspath,boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestCompileClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestCompileClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestCompileClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestCompileClasspath,boot2TestRuntimeClasspath,boot3ForkedTestCompileClasspath,boot3ForkedTestRuntimeClasspath,boot3TestCompileClasspath,boot3TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,boot1LatestDepForkedTestAnnotationProcessor,boot1LatestDepTestAnnotationProcessor,boot2ForkedTestAnnotationProcessor,boot2LatestDepForkedTestAnnotationProcessor,boot2LatestDepTestAnnotationProcessor,boot2TestAnnotationProcessor,boot3ForkedTestAnnotationProcessor,boot3TestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,boot1LatestDepForkedTestAnnotationProcessor,boot1LatestDepTestAnnotationProcessor,boot2ForkedTestAnnotationProcessor,boot2LatestDepForkedTestAnnotationProcessor,boot2LatestDepTestAnnotationProcessor,boot2TestAnnotationProcessor,boot3ForkedTestAnnotationProcessor,boot3TestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=boot1LatestDepForkedTestCompileClasspath,boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestCompileClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestCompileClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestCompileClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestCompileClasspath,boot2TestRuntimeClasspath,boot3ForkedTestCompileClasspath,boot3ForkedTestRuntimeClasspath,boot3TestCompileClasspath,boot3TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,boot1LatestDepForkedTestAnnotationProcessor,boot1LatestDepForkedTestCompileClasspath,boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestAnnotationProcessor,boot1LatestDepTestCompileClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestAnnotationProcessor,boot2ForkedTestCompileClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestAnnotationProcessor,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestAnnotationProcessor,boot2LatestDepTestCompileClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestAnnotationProcessor,boot2TestCompileClasspath,boot2TestRuntimeClasspath,boot3ForkedTestAnnotationProcessor,boot3ForkedTestCompileClasspath,boot3ForkedTestRuntimeClasspath,boot3TestAnnotationProcessor,boot3TestCompileClasspath,boot3TestRuntimeClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,boot1LatestDepForkedTestAnnotationProcessor,boot1LatestDepTestAnnotationProcessor,boot2ForkedTestAnnotationProcessor,boot2LatestDepForkedTestAnnotationProcessor,boot2LatestDepTestAnnotationProcessor,boot2TestAnnotationProcessor,boot3ForkedTestAnnotationProcessor,boot3TestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=boot1LatestDepForkedTestCompileClasspath,boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestCompileClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestCompileClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestCompileClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestCompileClasspath,boot2TestRuntimeClasspath,boot3ForkedTestCompileClasspath,boot3ForkedTestRuntimeClasspath,boot3TestCompileClasspath,boot3TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestRuntimeClasspath,boot3ForkedTestRuntimeClasspath,boot3TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=boot1LatestDepForkedTestCompileClasspath,boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestCompileClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestCompileClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestCompileClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestCompileClasspath,boot2TestRuntimeClasspath,boot3ForkedTestCompileClasspath,boot3ForkedTestRuntimeClasspath,boot3TestCompileClasspath,boot3TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=boot1LatestDepForkedTestCompileClasspath,boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestCompileClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestCompileClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestCompileClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestCompileClasspath,boot2TestRuntimeClasspath,boot3ForkedTestCompileClasspath,boot3ForkedTestRuntimeClasspath,boot3TestCompileClasspath,boot3TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -93,7 +95,7 @@ org.hamcrest:hamcrest-core:1.3=boot1LatestDepForkedTestRuntimeClasspath,boot1Lat org.hamcrest:hamcrest:3.0=boot1LatestDepForkedTestCompileClasspath,boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestCompileClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestCompileClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestCompileClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestCompileClasspath,boot2TestRuntimeClasspath,boot3ForkedTestCompileClasspath,boot3ForkedTestRuntimeClasspath,boot3TestCompileClasspath,boot3TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestRuntimeClasspath,boot3ForkedTestRuntimeClasspath,boot3TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestRuntimeClasspath,boot3ForkedTestRuntimeClasspath,boot3TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.jspecify:jspecify:1.0.0=boot1LatestDepForkedTestCompileClasspath,boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestCompileClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestCompileClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestCompileClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestCompileClasspath,boot2TestRuntimeClasspath,boot3ForkedTestCompileClasspath,boot3ForkedTestRuntimeClasspath,boot3TestCompileClasspath,boot3TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=boot1LatestDepForkedTestCompileClasspath,boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestCompileClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestCompileClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestCompileClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestCompileClasspath,boot2TestRuntimeClasspath,boot3ForkedTestCompileClasspath,boot3ForkedTestRuntimeClasspath,boot3TestCompileClasspath,boot3TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestRuntimeClasspath,boot3ForkedTestRuntimeClasspath,boot3TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=boot1LatestDepForkedTestCompileClasspath,boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestCompileClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestCompileClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestCompileClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestCompileClasspath,boot2TestRuntimeClasspath,boot3ForkedTestCompileClasspath,boot3ForkedTestRuntimeClasspath,boot3TestCompileClasspath,boot3TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/gradle.lockfile index 35383a07138..855efaa7a8f 100644 --- a/dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/gradle.lockfile @@ -42,13 +42,15 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:15.0=compileClasspath -com.google.guava:guava:19.0=testRuntimeClasspath -com.google.guava:guava:20.0=testCompileClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.jayway.jsonpath:json-path:2.4.0=testCompileClasspath,testRuntimeClasspath com.netflix.archaius:archaius-core:0.7.6=compileClasspath,testCompileClasspath,testRuntimeClasspath @@ -161,6 +163,7 @@ org.hdrhistogram:HdrHistogram:2.1.12=testCompileClasspath,testRuntimeClasspath org.hdrhistogram:HdrHistogram:2.1.9=compileClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-core-3.2.2/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-core-3.2.2/gradle.lockfile index c8b1860acd2..1766d06275a 100644 --- a/dd-java-agent/instrumentation/spring/spring-core-3.2.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-core-3.2.2/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -83,6 +86,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-data-1.8/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-data-1.8/gradle.lockfile index 5a29e25a17a..be127aa91ec 100644 --- a/dd-java-agent/instrumentation/spring/spring-data-1.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-data-1.8/gradle.lockfile @@ -34,11 +34,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:18.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.infradna.tool:bridge-method-annotation:1.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.mysema.commons:mysema-commons-lang:0.2.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -102,6 +105,7 @@ org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.0.Final=late org.jboss:jandex:1.1.0.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-jms-3.1/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-jms-3.1/gradle.lockfile index 3197ba35ddb..fd22438ec62 100644 --- a/dd-java-agent/instrumentation/spring/spring-jms-3.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-jms-3.1/gradle.lockfile @@ -33,11 +33,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -97,6 +100,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepForkedTestCompileClasspath,latestDepFork org.hamcrest:hamcrest:3.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-messaging-4.0/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-messaging-4.0/gradle.lockfile index 2fac9a546e7..6f0f7bb56f0 100644 --- a/dd-java-agent/instrumentation/spring/spring-messaging-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-messaging-4.0/gradle.lockfile @@ -44,14 +44,16 @@ com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnno com.google.auto:auto-common:1.2.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,compileOnlyDependenciesMetadata,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs -com.google.errorprone:error_prone_annotations:2.10.0=latestDepTestRuntimeClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/gradle.lockfile index 04ced3e4a94..fb012a15a1a 100644 --- a/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/gradle.lockfile @@ -39,11 +39,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.rabbitmq:amqp-client:5.0.0=compileClasspath com.rabbitmq:amqp-client:5.14.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -104,6 +107,7 @@ org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClas org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jetbrains:annotations:17.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/gradle.lockfile index 607d075c84b..c7c6cc6cbf0 100644 --- a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/gradle.lockfile @@ -42,11 +42,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestSpring5TestAnnotationProcessor,spring6TestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestSpring5TestAnnotationProcessor,spring6TestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestSpring5TestAnnotationProcessor,spring6TestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestSpring5TestAnnotationProcessor,spring6TestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestAnnotationProcessor,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestAnnotationProcessor,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestSpring5TestAnnotationProcessor,spring6TestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath com.h2database:h2:1.4.199=spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.h2database:h2:2.2.224=latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath @@ -103,8 +106,7 @@ net.javacrumbs.shedlock:shedlock-spring:4.21.0=latestDepForkedTestCompileClasspa net.javacrumbs.shedlock:shedlock-spring:4.48.0=latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath net.sf.saxon:Saxon-HE:12.9=spotbugs org.antlr:antlr4-runtime:4.10.1=spring6TestRuntimeClasspath -org.antlr:antlr4-runtime:4.13.0=latestDepForkedTestCompileClasspath,latestDepTestCompileClasspath -org.antlr:antlr4-runtime:4.13.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +org.antlr:antlr4-runtime:4.13.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.ant:ant-antlr:1.10.14=codenarc org.apache.ant:ant-junit:1.10.14=codenarc org.apache.bcel:bcel:6.11.0=spotbugs @@ -166,6 +168,7 @@ org.jboss:jandex:2.1.3.Final=testCompileClasspath,testRuntimeClasspath org.jboss:jandex:2.4.2.Final=latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -214,7 +217,7 @@ org.springframework.boot:spring-boot-actuator:2.4.0=latestDepForkedTestCompileCl org.springframework.boot:spring-boot-autoconfigure:2.4.0=testCompileClasspath,testRuntimeClasspath org.springframework.boot:spring-boot-autoconfigure:2.7.18=latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath org.springframework.boot:spring-boot-autoconfigure:3.0.0=spring6TestCompileClasspath,spring6TestRuntimeClasspath -org.springframework.boot:spring-boot-autoconfigure:3.5.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-autoconfigure:3.5.16=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter-actuator:2.4.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.springframework.boot:spring-boot-starter-aop:2.4.0=testCompileClasspath,testRuntimeClasspath org.springframework.boot:spring-boot-starter-aop:2.7.18=latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath @@ -222,31 +225,31 @@ org.springframework.boot:spring-boot-starter-aop:3.0.0=spring6TestCompileClasspa org.springframework.boot:spring-boot-starter-data-jpa:2.4.0=testCompileClasspath,testRuntimeClasspath org.springframework.boot:spring-boot-starter-data-jpa:2.7.18=latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath org.springframework.boot:spring-boot-starter-data-jpa:3.0.0=spring6TestCompileClasspath,spring6TestRuntimeClasspath -org.springframework.boot:spring-boot-starter-data-jpa:3.5.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-data-jpa:3.5.16=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter-jdbc:2.4.0=testCompileClasspath,testRuntimeClasspath org.springframework.boot:spring-boot-starter-jdbc:2.7.18=latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath org.springframework.boot:spring-boot-starter-jdbc:3.0.0=spring6TestCompileClasspath,spring6TestRuntimeClasspath -org.springframework.boot:spring-boot-starter-jdbc:3.5.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-jdbc:3.5.16=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter-logging:2.4.0=testCompileClasspath,testRuntimeClasspath org.springframework.boot:spring-boot-starter-logging:2.7.18=latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath org.springframework.boot:spring-boot-starter-logging:3.0.0=spring6TestCompileClasspath,spring6TestRuntimeClasspath -org.springframework.boot:spring-boot-starter-logging:3.5.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-logging:3.5.16=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter:2.4.0=testCompileClasspath,testRuntimeClasspath org.springframework.boot:spring-boot-starter:2.7.18=latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath org.springframework.boot:spring-boot-starter:3.0.0=spring6TestCompileClasspath,spring6TestRuntimeClasspath -org.springframework.boot:spring-boot-starter:3.5.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter:3.5.16=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot:2.4.0=testCompileClasspath,testRuntimeClasspath org.springframework.boot:spring-boot:2.7.18=latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath org.springframework.boot:spring-boot:3.0.0=spring6TestCompileClasspath,spring6TestRuntimeClasspath -org.springframework.boot:spring-boot:3.5.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot:3.5.16=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.data:spring-data-commons:2.4.1=testCompileClasspath,testRuntimeClasspath org.springframework.data:spring-data-commons:2.7.18=latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath org.springframework.data:spring-data-commons:3.0.0=spring6TestCompileClasspath,spring6TestRuntimeClasspath -org.springframework.data:spring-data-commons:3.5.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.data:spring-data-commons:3.5.13=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.data:spring-data-jpa:2.4.1=testCompileClasspath,testRuntimeClasspath org.springframework.data:spring-data-jpa:2.7.18=latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath org.springframework.data:spring-data-jpa:3.0.0=spring6TestCompileClasspath,spring6TestRuntimeClasspath -org.springframework.data:spring-data-jpa:3.5.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.data:spring-data-jpa:3.5.13=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-aop:5.0.0.RELEASE=compileClasspath org.springframework:spring-aop:5.3.39=latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath org.springframework:spring-aop:5.3.4=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/gradle.lockfile index 30eb66d5dd2..531f0081b0d 100644 --- a/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/gradle.lockfile @@ -46,11 +46,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.6.0=testCompileClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.7.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -116,6 +119,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-security/spring-security-6.0/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-security/spring-security-6.0/gradle.lockfile index e981945a5bc..de107c635a1 100644 --- a/dd-java-agent/instrumentation/spring/spring-security/spring-security-6.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-security/spring-security-6.0/gradle.lockfile @@ -48,11 +48,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.7.0=testCompileClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -127,6 +130,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -170,27 +174,27 @@ org.snakeyaml:snakeyaml-engine:2.9=buildTimeInstrumentationPlugin,latestDepTestR org.spockframework:spock-bom:2.4-groovy-3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.spockframework:spock-core:2.4-groovy-3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.springframework.boot:spring-boot-autoconfigure:3.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-autoconfigure:3.5.15=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-autoconfigure:3.5.16=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter-json:3.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-json:3.5.15=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-json:3.5.16=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter-logging:3.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-logging:3.5.15=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-logging:3.5.16=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter-security:3.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-security:3.5.15=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-security:3.5.16=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter-test:3.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-test:3.5.15=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-test:3.5.16=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter-tomcat:3.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-tomcat:3.5.15=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-tomcat:3.5.16=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter-web:3.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-web:3.5.15=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-web:3.5.16=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter:3.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter:3.5.15=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter:3.5.16=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-test-autoconfigure:3.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-test-autoconfigure:3.5.15=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-test-autoconfigure:3.5.16=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-test:3.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-test:3.5.15=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-test:3.5.16=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot:3.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot:3.5.15=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot:3.5.16=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.security:spring-security-config:6.0.0=testCompileClasspath,testRuntimeClasspath org.springframework.security:spring-security-config:6.5.11=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.security:spring-security-core:6.0.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/gradle.lockfile index fcada36bfae..2e1f8dad61d 100644 --- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/gradle.lockfile @@ -54,11 +54,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,iastT com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,iastTestAnnotationProcessor,latestBoot20TestAnnotationProcessor,latestBoot24TestAnnotationProcessor,latestBoot2LatestTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestIast24TestAnnotationProcessor,latestIast3TestAnnotationProcessor,latestIastTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=iastTestCompileClasspath,iastTestRuntimeClasspath,latestBoot20TestCompileClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestCompileClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestCompileClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestIast24TestCompileClasspath,latestIast24TestRuntimeClasspath,latestIast3TestCompileClasspath,latestIast3TestRuntimeClasspath,latestIastTestCompileClasspath,latestIastTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,iastTestAnnotationProcessor,latestBoot20TestAnnotationProcessor,latestBoot24TestAnnotationProcessor,latestBoot2LatestTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestIast24TestAnnotationProcessor,latestIast3TestAnnotationProcessor,latestIastTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=iastTestCompileClasspath,iastTestRuntimeClasspath,latestBoot20TestCompileClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestCompileClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestCompileClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestIast24TestCompileClasspath,latestIast24TestRuntimeClasspath,latestIast3TestCompileClasspath,latestIast3TestRuntimeClasspath,latestIastTestCompileClasspath,latestIastTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=iastTestCompileClasspath,iastTestRuntimeClasspath,latestBoot20TestCompileClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestCompileClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestCompileClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestIast24TestCompileClasspath,latestIast24TestRuntimeClasspath,latestIast3TestCompileClasspath,latestIast3TestRuntimeClasspath,latestIastTestCompileClasspath,latestIastTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,iastTestAnnotationProcessor,latestBoot20TestAnnotationProcessor,latestBoot24TestAnnotationProcessor,latestBoot2LatestTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestIast24TestAnnotationProcessor,latestIast3TestAnnotationProcessor,latestIastTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,iastTestAnnotationProcessor,latestBoot20TestAnnotationProcessor,latestBoot24TestAnnotationProcessor,latestBoot2LatestTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestIast24TestAnnotationProcessor,latestIast3TestAnnotationProcessor,latestIastTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=iastTestCompileClasspath,iastTestRuntimeClasspath,latestBoot20TestCompileClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestCompileClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestCompileClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestIast24TestCompileClasspath,latestIast24TestRuntimeClasspath,latestIast3TestCompileClasspath,latestIast3TestRuntimeClasspath,latestIastTestCompileClasspath,latestIastTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,iastTestAnnotationProcessor,iastTestCompileClasspath,iastTestRuntimeClasspath,latestBoot20TestAnnotationProcessor,latestBoot20TestCompileClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestAnnotationProcessor,latestBoot24TestCompileClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestAnnotationProcessor,latestBoot2LatestTestCompileClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestIast24TestAnnotationProcessor,latestIast24TestCompileClasspath,latestIast24TestRuntimeClasspath,latestIast3TestAnnotationProcessor,latestIast3TestCompileClasspath,latestIast3TestRuntimeClasspath,latestIastTestAnnotationProcessor,latestIastTestCompileClasspath,latestIastTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,iastTestAnnotationProcessor,latestBoot20TestAnnotationProcessor,latestBoot24TestAnnotationProcessor,latestBoot2LatestTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestIast24TestAnnotationProcessor,latestIast3TestAnnotationProcessor,latestIastTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=iastTestCompileClasspath,iastTestRuntimeClasspath,latestBoot20TestCompileClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestCompileClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestCompileClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestIast24TestCompileClasspath,latestIast24TestRuntimeClasspath,latestIast3TestCompileClasspath,latestIast3TestRuntimeClasspath,latestIastTestCompileClasspath,latestIastTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=iastTestRuntimeClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestIast24TestRuntimeClasspath,latestIast3TestRuntimeClasspath,latestIastTestRuntimeClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.4.0=iastTestCompileClasspath,iastTestRuntimeClasspath,latestBoot20TestCompileClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestCompileClasspath,latestBoot24TestRuntimeClasspath,latestIast24TestCompileClasspath,latestIast24TestRuntimeClasspath,latestIast3TestCompileClasspath,latestIast3TestRuntimeClasspath com.jayway.jsonpath:json-path:2.7.0=latestBoot2LatestTestCompileClasspath,latestBoot2LatestTestRuntimeClasspath,latestIastTestCompileClasspath,latestIastTestRuntimeClasspath @@ -197,6 +200,7 @@ org.hibernate.validator:hibernate-validator:6.0.16.Final=iastTestCompileClasspat org.jboss.logging:jboss-logging:3.3.2.Final=iastTestCompileClasspath,iastTestRuntimeClasspath,latestBoot20TestCompileClasspath,latestBoot20TestRuntimeClasspath,latestIast3TestCompileClasspath,latestIast3TestRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=iastTestRuntimeClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestIast24TestRuntimeClasspath,latestIast3TestRuntimeClasspath,latestIastTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=iastTestRuntimeClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestIast24TestRuntimeClasspath,latestIast3TestRuntimeClasspath,latestIastTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=iastTestCompileClasspath,iastTestRuntimeClasspath,latestBoot20TestCompileClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestCompileClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestCompileClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestIast24TestCompileClasspath,latestIast24TestRuntimeClasspath,latestIast3TestCompileClasspath,latestIast3TestRuntimeClasspath,latestIastTestCompileClasspath,latestIastTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=iastTestCompileClasspath,iastTestRuntimeClasspath,latestBoot20TestCompileClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestCompileClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestCompileClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestIast24TestCompileClasspath,latestIast24TestRuntimeClasspath,latestIast3TestCompileClasspath,latestIast3TestRuntimeClasspath,latestIastTestCompileClasspath,latestIastTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=iastTestRuntimeClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestIast24TestRuntimeClasspath,latestIast3TestRuntimeClasspath,latestIastTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=iastTestCompileClasspath,iastTestRuntimeClasspath,latestBoot20TestCompileClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestCompileClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestCompileClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestIast24TestCompileClasspath,latestIast24TestRuntimeClasspath,latestIast3TestCompileClasspath,latestIast3TestRuntimeClasspath,latestIastTestCompileClasspath,latestIastTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-6.0/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-6.0/gradle.lockfile index 5af1ac45679..36a270e7fba 100644 --- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-6.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-6.0/gradle.lockfile @@ -50,11 +50,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,bootTestAnnotationProc com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,bootTestAnnotationProcessor,iastTestAnnotationProcessor,latestDepBootTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,bootTestAnnotationProcessor,iastTestAnnotationProcessor,latestDepBootTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,bootTestAnnotationProcessor,iastTestAnnotationProcessor,latestDepBootTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,bootTestAnnotationProcessor,iastTestAnnotationProcessor,latestDepBootTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,bootTestAnnotationProcessor,bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestAnnotationProcessor,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepBootTestAnnotationProcessor,latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,bootTestAnnotationProcessor,iastTestAnnotationProcessor,latestDepBootTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=bootTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.7.0=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath @@ -173,7 +176,7 @@ org.hamcrest:hamcrest-core:1.3=bootTestRuntimeClasspath,iastTestRuntimeClasspath org.hamcrest:hamcrest:3.0=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=bootTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=bootTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -org.jspecify:jspecify:1.0.0=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.jspecify:jspecify:1.0.0=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=bootTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -222,25 +225,25 @@ org.spockframework:spock-bom:2.4-groovy-3.0=bootTestCompileClasspath,bootTestRun org.spockframework:spock-core:2.4-groovy-3.0=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.spockframework:spock-spring:2.4-groovy-3.0=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.springframework.boot:spring-boot-autoconfigure:3.0.0=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath -org.springframework.boot:spring-boot-autoconfigure:3.5.15=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath +org.springframework.boot:spring-boot-autoconfigure:3.5.16=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath org.springframework.boot:spring-boot-starter-json:3.0.0=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath -org.springframework.boot:spring-boot-starter-json:3.5.15=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-json:3.5.16=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath org.springframework.boot:spring-boot-starter-logging:3.0.0=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath -org.springframework.boot:spring-boot-starter-logging:3.5.15=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-logging:3.5.16=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath org.springframework.boot:spring-boot-starter-reactor-netty:3.0.0=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath -org.springframework.boot:spring-boot-starter-reactor-netty:3.5.15=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-reactor-netty:3.5.16=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath org.springframework.boot:spring-boot-starter-test:3.0.0=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath -org.springframework.boot:spring-boot-starter-test:3.5.15=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-test:3.5.16=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath org.springframework.boot:spring-boot-starter-webflux:3.0.0=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath -org.springframework.boot:spring-boot-starter-webflux:3.5.15=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-webflux:3.5.16=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath org.springframework.boot:spring-boot-starter:3.0.0=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath -org.springframework.boot:spring-boot-starter:3.5.15=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath +org.springframework.boot:spring-boot-starter:3.5.16=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath org.springframework.boot:spring-boot-test-autoconfigure:3.0.0=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath -org.springframework.boot:spring-boot-test-autoconfigure:3.5.15=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath +org.springframework.boot:spring-boot-test-autoconfigure:3.5.16=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath org.springframework.boot:spring-boot-test:3.0.0=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath -org.springframework.boot:spring-boot-test:3.5.15=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath +org.springframework.boot:spring-boot-test:3.5.16=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath org.springframework.boot:spring-boot:3.0.0=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath -org.springframework.boot:spring-boot:3.5.15=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath +org.springframework.boot:spring-boot:3.5.16=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath org.springframework:spring-aop:6.0.2=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath org.springframework:spring-aop:6.2.19=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-beans:6.0.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/gradle.lockfile index e1338693049..653b5e3498e 100644 --- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/gradle.lockfile @@ -44,11 +44,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.2.0=testCompileClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.7.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -145,6 +148,7 @@ org.jboss.resteasy:resteasy-jettison-provider:3.0.0.Final=latestDepForkedTestCom org.jboss.resteasy:resteasy-spring:3.0.0.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/gradle.lockfile index d490b688ef4..96173d81d9d 100644 --- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/gradle.lockfile @@ -39,11 +39,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,csiCo com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.jayway.jsonpath:json-path:2.7.0=testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath @@ -103,6 +106,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/gradle.lockfile index f9b442c736b..19f9c6483e8 100644 --- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/gradle.lockfile @@ -51,10 +51,12 @@ com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestD com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.google.errorprone:error_prone_annotations:2.48.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.7.0=testCompileClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -132,6 +134,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -176,28 +179,28 @@ org.spockframework:spock-bom:2.4-groovy-3.0=latestDepTestCompileClasspath,latest org.spockframework:spock-core:2.4-groovy-3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.spockframework:spock-spring:2.4-groovy-3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.springframework.boot:spring-boot-autoconfigure:3.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-autoconfigure:3.5.15=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-autoconfigure:3.5.16=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter-json:3.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-json:3.5.15=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-json:3.5.16=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter-logging:3.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-logging:3.5.15=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-logging:3.5.16=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter-security:3.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-security:3.5.15=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-security:3.5.16=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter-test:3.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-test:3.5.15=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-test:3.5.16=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter-tomcat:3.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-tomcat:3.5.15=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-tomcat:3.5.16=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter-web:3.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-web:3.5.15=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.springframework.boot:spring-boot-starter-websocket:3.5.15=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-web:3.5.16=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-websocket:3.5.16=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter:3.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter:3.5.15=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter:3.5.16=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-test-autoconfigure:3.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-test-autoconfigure:3.5.15=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-test-autoconfigure:3.5.16=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-test:3.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-test:3.5.15=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-test:3.5.16=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot:3.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot:3.5.15=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot:3.5.16=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.security:spring-security-config:6.0.0=testCompileClasspath,testRuntimeClasspath org.springframework.security:spring-security-config:6.5.11=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.security:spring-security-core:6.0.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-ws-2.0/gradle.lockfile b/dd-java-agent/instrumentation/spring/spring-ws-2.0/gradle.lockfile index fe199cba20c..83d886239f0 100644 --- a/dd-java-agent/instrumentation/spring/spring-ws-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring/spring-ws-2.0/gradle.lockfile @@ -40,11 +40,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -105,6 +108,7 @@ org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClas org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jdom:jdom:2.0.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spymemcached-2.10/gradle.lockfile b/dd-java-agent/instrumentation/spymemcached-2.10/gradle.lockfile index 6d8992feb21..496ef013d48 100644 --- a/dd-java-agent/instrumentation/spymemcached-2.10/gradle.lockfile +++ b/dd-java-agent/instrumentation/spymemcached-2.10/gradle.lockfile @@ -36,11 +36,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -90,6 +93,7 @@ org.hamcrest:hamcrest:3.0=latestDepForkedTestCompileClasspath,latestDepForkedTes org.jctools:jctools-core-jdk11:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jetbrains:annotations:17.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/synapse-3.0/gradle.lockfile b/dd-java-agent/instrumentation/synapse-3.0/gradle.lockfile index 31b66e2a303..da4df0457d3 100644 --- a/dd-java-agent/instrumentation/synapse-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/synapse-3.0/gradle.lockfile @@ -33,11 +33,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.mchange:c3p0:0.9.5.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.mchange:mchange-commons-java:0.2.15=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -158,6 +161,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/testng/testng-6.4/gradle.lockfile b/dd-java-agent/instrumentation/testng/testng-6.4/gradle.lockfile index 0ba461f55d0..f115ce74137 100644 --- a/dd-java-agent/instrumentation/testng/testng-6.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/testng/testng-6.4/gradle.lockfile @@ -37,11 +37,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.jayway.jsonpath:json-path:2.8.0=testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath @@ -98,6 +101,7 @@ org.jacoco:org.jacoco.core:0.8.14=testRuntimeClasspath org.jacoco:org.jacoco.report:0.8.14=testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/testng/testng-7.0/gradle.lockfile b/dd-java-agent/instrumentation/testng/testng-7.0/gradle.lockfile index 1f4d6a46d5c..4d79c1aa80f 100644 --- a/dd-java-agent/instrumentation/testng/testng-7.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/testng/testng-7.0/gradle.lockfile @@ -37,11 +37,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,testng751TestAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,testng751TestCompileClasspath,testng751TestRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,testng751TestAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,testng751TestCompileClasspath,testng751TestRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,testng751TestCompileClasspath,testng751TestRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,testng751TestAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,testng751TestAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,testng751TestCompileClasspath,testng751TestRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath,testng751TestAnnotationProcessor,testng751TestCompileClasspath,testng751TestRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,testng751TestAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,testng751TestCompileClasspath,testng751TestRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath,testng751TestRuntimeClasspath com.jayway.jsonpath:json-path:2.8.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,testng751TestCompileClasspath,testng751TestRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,testng751TestCompileClasspath,testng751TestRuntimeClasspath @@ -97,6 +100,7 @@ org.jacoco:org.jacoco.report:0.8.14=latestDepTestRuntimeClasspath,testRuntimeCla org.jcommander:jcommander:1.83=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath,testng751TestRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath,testng751TestRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,testng751TestCompileClasspath,testng751TestRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,testng751TestCompileClasspath,testng751TestRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath,testng751TestRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,testng751TestCompileClasspath,testng751TestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/testng/testng-common/gradle.lockfile b/dd-java-agent/instrumentation/testng/testng-common/gradle.lockfile index e72fd9c5a2f..0ec85cb109f 100644 --- a/dd-java-agent/instrumentation/testng/testng-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/testng/testng-common/gradle.lockfile @@ -37,11 +37,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testFixturesRuntimeClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.8.0=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -98,6 +101,7 @@ org.jacoco:org.jacoco.core:0.8.14=testFixturesRuntimeClasspath,testRuntimeClassp org.jacoco:org.jacoco.report:0.8.14=testFixturesRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testFixturesRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=testFixturesRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/thymeleaf-3.0/gradle.lockfile b/dd-java-agent/instrumentation/thymeleaf-3.0/gradle.lockfile index 0f43f2e0a67..81b368d29c5 100644 --- a/dd-java-agent/instrumentation/thymeleaf-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/thymeleaf-3.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -88,6 +91,7 @@ org.javassist:javassist:3.20.0-GA=compileClasspath,testCompileClasspath,testRunt org.javassist:javassist:3.29.0-GA=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/gradle.lockfile b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/gradle.lockfile index 710de77cf82..ff38fbd91a1 100644 --- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/gradle.lockfile +++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -82,6 +85,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/gradle.lockfile b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/gradle.lockfile index b94952e5cbb..fb74d64b6f1 100644 --- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -82,6 +85,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/gradle.lockfile b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/gradle.lockfile index d7242ded074..3b31f5e73ca 100644 --- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/gradle.lockfile +++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -82,6 +85,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/tinylog-2.0/gradle.lockfile b/dd-java-agent/instrumentation/tinylog-2.0/gradle.lockfile index 26cf100e81a..f34675a8e2a 100644 --- a/dd-java-agent/instrumentation/tinylog-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/tinylog-2.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -82,6 +85,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-5.5/gradle.lockfile b/dd-java-agent/instrumentation/tomcat/tomcat-5.5/gradle.lockfile index 23ac2e03675..cedc43d9a93 100644 --- a/dd-java-agent/instrumentation/tomcat/tomcat-5.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/tomcat/tomcat-5.5/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latest10ForkedTestAnnotationProcessor,latest10TestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,tomcat9TestAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latest10ForkedTestAnnotationProcessor,latest10TestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,tomcat9TestAnnotationProcessor -com.google.guava:guava:20.0=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latest10ForkedTestAnnotationProcessor,latest10TestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,tomcat9TestAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latest10ForkedTestAnnotationProcessor,latest10TestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,tomcat9TestAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latest10ForkedTestAnnotationProcessor,latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestAnnotationProcessor,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath,tomcat9TestAnnotationProcessor,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latest10ForkedTestAnnotationProcessor,latest10TestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,tomcat9TestAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath com.google.re2j:re2j:1.8=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath @@ -106,6 +109,7 @@ org.hamcrest:hamcrest-core:1.3=latest10ForkedTestRuntimeClasspath,latest10TestRu org.hamcrest:hamcrest:3.0=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath org.jctools:jctools-core:4.0.6=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath +org.jspecify:jspecify:1.0.0=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-9.0/gradle.lockfile b/dd-java-agent/instrumentation/tomcat/tomcat-9.0/gradle.lockfile index 7bb6510633b..4ad5aad6839 100644 --- a/dd-java-agent/instrumentation/tomcat/tomcat-9.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/tomcat/tomcat-9.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -93,6 +96,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-5.5/gradle.lockfile b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-5.5/gradle.lockfile index f5926a4adad..389e44116da 100644 --- a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-5.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-5.5/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -83,6 +86,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-6.0/gradle.lockfile b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-6.0/gradle.lockfile index f52bf0c73b7..04a4d83858c 100644 --- a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-6.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-6.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -85,6 +88,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/gradle.lockfile b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/gradle.lockfile index 839c4bdb801..09ac5e0fdf9 100644 --- a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -90,6 +93,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-common/gradle.lockfile b/dd-java-agent/instrumentation/tomcat/tomcat-common/gradle.lockfile index 3739eda9af4..cd71d638ac4 100644 --- a/dd-java-agent/instrumentation/tomcat/tomcat-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/tomcat/tomcat-common/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -83,6 +86,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/twilio-0.0.1/gradle.lockfile b/dd-java-agent/instrumentation/twilio-0.0.1/gradle.lockfile index 5fed45af3c0..33000688057 100644 --- a/dd-java-agent/instrumentation/twilio-0.0.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/twilio-0.0.1/gradle.lockfile @@ -44,12 +44,15 @@ com.google.code.gson:gson:2.10.1=latestDepTestCompileClasspath,latestDepTestRunt com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:18.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:18.0=compileClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -117,6 +120,7 @@ org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClas org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.json:json:20240303=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/unbescape-1.1/gradle.lockfile b/dd-java-agent/instrumentation/unbescape-1.1/gradle.lockfile index d85ec8a6ef0..c7c6ce08518 100644 --- a/dd-java-agent/instrumentation/unbescape-1.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/unbescape-1.1/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,csiCo com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -82,6 +85,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/undertow/undertow-2.0/gradle.lockfile b/dd-java-agent/instrumentation/undertow/undertow-2.0/gradle.lockfile index 0d8b459a717..028afaea1e5 100644 --- a/dd-java-agent/instrumentation/undertow/undertow-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/undertow/undertow-2.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -101,6 +104,7 @@ org.jboss.xnio:xnio-nio:3.3.8.Final=testRuntimeClasspath org.jboss.xnio:xnio-nio:3.8.16.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/undertow/undertow-2.2/gradle.lockfile b/dd-java-agent/instrumentation/undertow/undertow-2.2/gradle.lockfile index 5c240a257d3..1e9207ba64d 100644 --- a/dd-java-agent/instrumentation/undertow/undertow-2.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/undertow/undertow-2.2/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latest22ForkedTestAnnotationProcessor,latest22TestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latest22ForkedTestCompileClasspath,latest22ForkedTestRuntimeClasspath,latest22TestCompileClasspath,latest22TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latest22ForkedTestAnnotationProcessor,latest22TestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latest22ForkedTestCompileClasspath,latest22ForkedTestRuntimeClasspath,latest22TestCompileClasspath,latest22TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latest22ForkedTestCompileClasspath,latest22ForkedTestRuntimeClasspath,latest22TestCompileClasspath,latest22TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latest22ForkedTestAnnotationProcessor,latest22TestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latest22ForkedTestAnnotationProcessor,latest22TestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latest22ForkedTestCompileClasspath,latest22ForkedTestRuntimeClasspath,latest22TestCompileClasspath,latest22TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latest22ForkedTestAnnotationProcessor,latest22ForkedTestCompileClasspath,latest22ForkedTestRuntimeClasspath,latest22TestAnnotationProcessor,latest22TestCompileClasspath,latest22TestRuntimeClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latest22ForkedTestAnnotationProcessor,latest22TestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latest22ForkedTestCompileClasspath,latest22ForkedTestRuntimeClasspath,latest22TestCompileClasspath,latest22TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latest22ForkedTestRuntimeClasspath,latest22TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latest22ForkedTestCompileClasspath,latest22ForkedTestRuntimeClasspath,latest22TestCompileClasspath,latest22TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latest22ForkedTestCompileClasspath,latest22ForkedTestRuntimeClasspath,latest22TestCompileClasspath,latest22TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -116,6 +119,7 @@ org.jboss.xnio:xnio-nio:3.8.4.Final=testRuntimeClasspath org.jboss.xnio:xnio-nio:3.8.7.Final=latest22ForkedTestRuntimeClasspath,latest22TestRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latest22ForkedTestRuntimeClasspath,latest22TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latest22ForkedTestRuntimeClasspath,latest22TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latest22ForkedTestCompileClasspath,latest22ForkedTestRuntimeClasspath,latest22TestCompileClasspath,latest22TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latest22ForkedTestCompileClasspath,latest22ForkedTestRuntimeClasspath,latest22TestCompileClasspath,latest22TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latest22ForkedTestRuntimeClasspath,latest22TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latest22ForkedTestCompileClasspath,latest22ForkedTestRuntimeClasspath,latest22TestCompileClasspath,latest22TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/undertow/undertow-common/gradle.lockfile b/dd-java-agent/instrumentation/undertow/undertow-common/gradle.lockfile index a770855676e..59a47ea1251 100644 --- a/dd-java-agent/instrumentation/undertow/undertow-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/undertow/undertow-common/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -85,6 +88,7 @@ org.jboss.logging:jboss-logging:3.3.0.Final=compileClasspath org.jboss.xnio:xnio-api:3.3.8.Final=compileClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/valkey-java-5.3/gradle.lockfile b/dd-java-agent/instrumentation/valkey-java-5.3/gradle.lockfile index 64925369db9..baf343661e0 100644 --- a/dd-java-agent/instrumentation/valkey-java-5.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/valkey-java-5.3/gradle.lockfile @@ -34,11 +34,14 @@ com.google.code.gson:gson:2.10.1=compileClasspath,latestDepTestCompileClasspath, com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -88,6 +91,7 @@ org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClas org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.json:json:20240303=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/velocity-1.5/gradle.lockfile b/dd-java-agent/instrumentation/velocity-1.5/gradle.lockfile index 599e76a94fe..21eb6676d10 100644 --- a/dd-java-agent/instrumentation/velocity-1.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/velocity-1.5/gradle.lockfile @@ -34,11 +34,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,csiCo com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -105,6 +108,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/gradle.lockfile b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/gradle.lockfile index c657ed1e650..5da29feb506 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/gradle.lockfile @@ -43,11 +43,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.protobuf:protobuf-java:3.11.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -128,6 +131,7 @@ org.hamcrest:hamcrest:3.0=latestDepForkedTestCompileClasspath,latestDepForkedTes org.jctools:jctools-core-jdk11:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jetbrains:annotations:17.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/gradle.lockfile b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/gradle.lockfile index 64a715cf80b..521fd433e75 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/gradle.lockfile @@ -40,11 +40,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.protobuf:protobuf-java:3.11.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -126,6 +129,7 @@ org.hamcrest:hamcrest:3.0=latestDepForkedTestCompileClasspath,latestDepForkedTes org.jctools:jctools-core-jdk11:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jetbrains:annotations:17.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.4.2/gradle.lockfile b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.4.2/gradle.lockfile index 66423e9c13b..ae78e82f8cd 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.4.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.4.2/gradle.lockfile @@ -35,11 +35,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -101,6 +104,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepForkedTestRuntimeClasspath,latestDepTest org.hamcrest:hamcrest:3.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/gradle.lockfile b/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/gradle.lockfile index 9bb64f21f6a..098526b74c4 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/gradle.lockfile @@ -40,11 +40,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.ongres.scram:client:2.1=latestDepForkedTestCompileClasspath,latestDepTestCompileClasspath,testCompileClasspath,testRuntimeClasspath com.ongres.scram:common:2.1=latestDepForkedTestCompileClasspath,latestDepTestCompileClasspath,testCompileClasspath,testRuntimeClasspath @@ -133,6 +136,7 @@ org.hamcrest:hamcrest:3.0=latestDepForkedTestCompileClasspath,latestDepForkedTes org.jctools:jctools-core-jdk11:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jetbrains:annotations:17.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.4.2/gradle.lockfile b/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.4.2/gradle.lockfile index 8978f0fe1b0..86199fdf0fd 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.4.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.4.2/gradle.lockfile @@ -35,11 +35,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -101,6 +104,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepForkedTestRuntimeClasspath,latestDepTest org.hamcrest:hamcrest:3.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/gradle.lockfile b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/gradle.lockfile index 604badfed6c..4033aad3065 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/gradle.lockfile @@ -48,11 +48,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,redis4xForkedTestAnnotationProcessor,redis4xTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,redis4xForkedTestAnnotationProcessor,redis4xTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,redis4xForkedTestAnnotationProcessor,redis4xTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,redis4xForkedTestAnnotationProcessor,redis4xTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestAnnotationProcessor,redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestAnnotationProcessor,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,redis4xForkedTestAnnotationProcessor,redis4xTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestRuntimeClasspath,testRuntimeClasspath com.redis.testcontainers:testcontainers-redis:1.6.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.redis:redis-enterprise-admin:0.3.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -164,6 +167,7 @@ org.hamcrest:hamcrest:3.0=latestDepForkedTestCompileClasspath,latestDepForkedTes org.jctools:jctools-core-jdk11:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestRuntimeClasspath,testRuntimeClasspath org.jetbrains:annotations:17.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-stubs/gradle.lockfile b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-stubs/gradle.lockfile index 1cd09830585..d15c65a4f2e 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-stubs/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-stubs/gradle.lockfile @@ -35,11 +35,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -99,6 +102,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/vertx/vertx-rx-3.5/gradle.lockfile b/dd-java-agent/instrumentation/vertx/vertx-rx-3.5/gradle.lockfile index 9c783a18348..124faf96716 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-rx-3.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx/vertx-rx-3.5/gradle.lockfile @@ -39,11 +39,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -136,6 +139,7 @@ org.hdrhistogram:HdrHistogram:2.1.10=latestDepForkedTestCompileClasspath,latestD org.hdrhistogram:HdrHistogram:2.1.9=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/gradle.lockfile b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/gradle.lockfile index 3e7326d9618..41cb05b34e3 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/gradle.lockfile @@ -35,11 +35,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -99,6 +102,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/gradle.lockfile b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/gradle.lockfile index 16bd3404fbc..93cb77fcd83 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/gradle.lockfile @@ -39,11 +39,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -125,6 +128,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepForkedTestRuntimeClasspath,latestDepTest org.hamcrest:hamcrest:3.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.5/gradle.lockfile b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.5/gradle.lockfile index 36044f02c2b..b85bcbd6b62 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.5/gradle.lockfile @@ -39,11 +39,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -123,6 +126,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepForkedTestRuntimeClasspath,latestDepTest org.hamcrest:hamcrest:3.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.9/gradle.lockfile b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.9/gradle.lockfile index be29715ea0d..99277637ea2 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.9/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.9/gradle.lockfile @@ -35,11 +35,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -103,6 +106,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/gradle.lockfile b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/gradle.lockfile index 92798278f4b..c9842f0048b 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/gradle.lockfile @@ -35,11 +35,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -124,6 +127,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepForkedTestRuntimeClasspath,latestDepTest org.hamcrest:hamcrest:3.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/gradle.lockfile b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/gradle.lockfile index 6a0db76a9d9..88958e45237 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/gradle.lockfile @@ -36,12 +36,15 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -88,22 +91,22 @@ io.netty:netty-transport:4.2.0.RC1=compileClasspath,testCompileClasspath,testRun io.netty:netty-transport:4.2.15.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.sqreen:libsqreen:17.3.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath io.vertx:vertx-auth-common:5.0.0.CR3=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.vertx:vertx-auth-common:5.1.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-auth-common:5.1.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.vertx:vertx-bridge-common:5.0.0.CR3=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.vertx:vertx-bridge-common:5.1.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-bridge-common:5.1.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.vertx:vertx-core-logging:5.0.0.CR3=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.vertx:vertx-core-logging:5.1.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-core-logging:5.1.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.vertx:vertx-core:5.0.0.CR3=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.vertx:vertx-core:5.1.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.vertx:vertx-eventbus-bridge-common:5.1.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-core:5.1.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-eventbus-bridge-common:5.1.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.vertx:vertx-uri-template:5.0.0.CR3=testCompileClasspath,testRuntimeClasspath -io.vertx:vertx-uri-template:5.1.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-uri-template:5.1.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.vertx:vertx-web-client:5.0.0.CR3=testCompileClasspath,testRuntimeClasspath -io.vertx:vertx-web-client:5.1.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-web-client:5.1.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.vertx:vertx-web-common:5.0.0.CR3=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.vertx:vertx-web-common:5.1.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-web-common:5.1.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.vertx:vertx-web:5.0.0.CR3=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.vertx:vertx-web:5.1.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-web:5.1.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.0=spotbugs junit:junit:4.13.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -137,6 +140,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepForkedTestRuntimeClasspath,latestDepTest org.hamcrest:hamcrest:3.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/weaver-0.9/gradle.lockfile b/dd-java-agent/instrumentation/weaver-0.9/gradle.lockfile index 66bb21dc293..4e8cd23d319 100644 --- a/dd-java-agent/instrumentation/weaver-0.9/gradle.lockfile +++ b/dd-java-agent/instrumentation/weaver-0.9/gradle.lockfile @@ -47,11 +47,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,weaver084TestAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,weaver084TestCompileClasspath,weaver084TestRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,weaver084TestAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,weaver084TestCompileClasspath,weaver084TestRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,weaver084TestCompileClasspath,weaver084TestRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,weaver084TestAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,weaver084TestAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,weaver084TestCompileClasspath,weaver084TestRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath,weaver084TestAnnotationProcessor,weaver084TestCompileClasspath,weaver084TestRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,weaver084TestAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,weaver084TestCompileClasspath,weaver084TestRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath,weaver084TestRuntimeClasspath com.jayway.jsonpath:json-path:2.8.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,weaver084TestCompileClasspath,weaver084TestRuntimeClasspath com.lmax:disruptor:3.4.2=zinc @@ -115,6 +118,7 @@ org.jline:jline-native:3.27.1=zinc org.jline:jline-terminal-jni:3.27.1=zinc org.jline:jline-terminal:3.27.1=zinc org.jline:jline:3.27.1=zinc +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,weaver084TestCompileClasspath,weaver084TestRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,weaver084TestCompileClasspath,weaver084TestRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath,weaver084TestRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,weaver084TestCompileClasspath,weaver084TestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/websocket/jakarta-websocket-2.0/gradle.lockfile b/dd-java-agent/instrumentation/websocket/jakarta-websocket-2.0/gradle.lockfile index 97bcbbc3360..9d5686a2f05 100644 --- a/dd-java-agent/instrumentation/websocket/jakarta-websocket-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/websocket/jakarta-websocket-2.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -108,6 +111,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/gradle.lockfile b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/gradle.lockfile index 2227c54ca1b..67223ef7ff8 100644 --- a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -104,6 +107,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10.0/gradle.lockfile b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10.0/gradle.lockfile index bf9c850d8ff..1d1be46d1d3 100644 --- a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -128,6 +131,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-11.0/gradle.lockfile b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-11.0/gradle.lockfile index 5baf92d455d..4642bfed48e 100644 --- a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-11.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-11.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -129,6 +132,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-12.0/gradle.lockfile b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-12.0/gradle.lockfile index f313a171e02..46afefe8693 100644 --- a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-12.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-12.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -183,6 +186,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/websphere-jmx-8.5/gradle.lockfile b/dd-java-agent/instrumentation/websphere-jmx-8.5/gradle.lockfile index d1add566eab..10ff4136569 100644 --- a/dd-java-agent/instrumentation/websphere-jmx-8.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/websphere-jmx-8.5/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -82,6 +85,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/wildfly-9.0/gradle.lockfile b/dd-java-agent/instrumentation/wildfly-9.0/gradle.lockfile index c634c4c47b3..c592f8532ed 100644 --- a/dd-java-agent/instrumentation/wildfly-9.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/wildfly-9.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.googlecode.javaewah:JavaEWAH:1.2.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -164,6 +167,7 @@ org.jboss:staxmapper:1.4.0.Final=testCompileClasspath,testRuntimeClasspath org.jboss:staxmapper:1.5.0.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -212,135 +216,135 @@ org.wildfly.common:wildfly-common:1.6.0.Final=testCompileClasspath,testRuntimeCl org.wildfly.common:wildfly-common:2.0.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.core:wildfly-controller-client:1.0.0.Final=compileClasspath org.wildfly.core:wildfly-controller-client:21.1.0.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.core:wildfly-controller-client:33.0.0.Beta3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.core:wildfly-controller-client:33.0.0.Beta4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.core:wildfly-controller:1.0.0.Final=compileClasspath org.wildfly.core:wildfly-controller:21.1.0.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.core:wildfly-controller:33.0.0.Beta3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.core:wildfly-controller:33.0.0.Beta4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.core:wildfly-core-management-client:21.1.0.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.core:wildfly-core-management-client:33.0.0.Beta3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.core:wildfly-core-management-client:33.0.0.Beta4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.core:wildfly-core-security-api:1.0.0.Final=compileClasspath org.wildfly.core:wildfly-core-security:1.0.0.Final=compileClasspath org.wildfly.core:wildfly-core-security:21.1.0.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.core:wildfly-core-security:33.0.0.Beta3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.core:wildfly-core-security:33.0.0.Beta4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.core:wildfly-deployment-repository:1.0.0.Final=compileClasspath org.wildfly.core:wildfly-deployment-repository:21.1.0.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.core:wildfly-deployment-repository:33.0.0.Beta3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.core:wildfly-deployment-repository:33.0.0.Beta4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.core:wildfly-domain-http-interface:1.0.0.Final=compileClasspath org.wildfly.core:wildfly-domain-http-interface:21.1.0.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.core:wildfly-domain-http-interface:33.0.0.Beta3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.core:wildfly-domain-http-interface:33.0.0.Beta4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.core:wildfly-domain-management:1.0.0.Final=compileClasspath org.wildfly.core:wildfly-domain-management:21.1.0.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.core:wildfly-domain-management:33.0.0.Beta3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.core:wildfly-domain-management:33.0.0.Beta4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.core:wildfly-embedded:21.1.0.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.core:wildfly-embedded:33.0.0.Beta3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.wildfly.core:wildfly-io-spi:33.0.0.Beta3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.core:wildfly-embedded:33.0.0.Beta4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.core:wildfly-io-spi:33.0.0.Beta4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.core:wildfly-io:1.0.0.Final=compileClasspath org.wildfly.core:wildfly-io:21.1.0.Final=testCompileClasspath,testRuntimeClasspath org.wildfly.core:wildfly-network:1.0.0.Final=compileClasspath org.wildfly.core:wildfly-network:21.1.0.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.core:wildfly-network:33.0.0.Beta3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.core:wildfly-network:33.0.0.Beta4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.core:wildfly-platform-mbean:1.0.0.Final=compileClasspath org.wildfly.core:wildfly-platform-mbean:21.1.0.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.core:wildfly-platform-mbean:33.0.0.Beta3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.core:wildfly-platform-mbean:33.0.0.Beta4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.core:wildfly-process-controller:1.0.0.Final=compileClasspath org.wildfly.core:wildfly-process-controller:21.1.0.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.core:wildfly-process-controller:33.0.0.Beta3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.core:wildfly-process-controller:33.0.0.Beta4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.core:wildfly-protocol:1.0.0.Final=compileClasspath org.wildfly.core:wildfly-protocol:21.1.0.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.core:wildfly-protocol:33.0.0.Beta3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.core:wildfly-protocol:33.0.0.Beta4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.core:wildfly-remoting:1.0.0.Final=compileClasspath org.wildfly.core:wildfly-remoting:21.1.0.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.core:wildfly-remoting:33.0.0.Beta3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.core:wildfly-remoting:33.0.0.Beta4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.core:wildfly-request-controller:1.0.0.Final=compileClasspath org.wildfly.core:wildfly-self-contained:1.0.0.Final=compileClasspath org.wildfly.core:wildfly-server:1.0.0.Final=compileClasspath org.wildfly.core:wildfly-server:21.1.0.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.core:wildfly-server:33.0.0.Beta3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.wildfly.core:wildfly-service:33.0.0.Beta3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.core:wildfly-server:33.0.0.Beta4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.core:wildfly-service:33.0.0.Beta4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.core:wildfly-version:1.0.0.Final=compileClasspath org.wildfly.core:wildfly-version:21.1.0.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.core:wildfly-version:33.0.0.Beta3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.core:wildfly-version:33.0.0.Beta4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.security.elytron-web:undertow-server:4.0.0.Final=testCompileClasspath,testRuntimeClasspath org.wildfly.security.elytron-web:undertow-server:4.2.1.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.security:wildfly-elytron-asn1:2.2.1.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.security:wildfly-elytron-asn1:2.9.1.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.security:wildfly-elytron-asn1:2.9.2.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.security:wildfly-elytron-audit:2.2.1.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.security:wildfly-elytron-audit:2.9.1.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.security:wildfly-elytron-audit:2.9.2.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.security:wildfly-elytron-auth-server-deprecated:2.2.1.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.security:wildfly-elytron-auth-server-deprecated:2.9.1.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.security:wildfly-elytron-auth-server-deprecated:2.9.2.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.security:wildfly-elytron-auth-server-http:2.2.1.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.security:wildfly-elytron-auth-server-http:2.9.1.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.security:wildfly-elytron-auth-server-http:2.9.2.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.security:wildfly-elytron-auth-server-sasl:2.2.1.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.security:wildfly-elytron-auth-server-sasl:2.9.1.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.security:wildfly-elytron-auth-server-sasl:2.9.2.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.security:wildfly-elytron-auth-server:2.2.1.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.security:wildfly-elytron-auth-server:2.9.1.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.security:wildfly-elytron-auth-server:2.9.2.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.security:wildfly-elytron-auth-util:2.2.1.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.security:wildfly-elytron-auth-util:2.9.1.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.security:wildfly-elytron-auth-util:2.9.2.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.security:wildfly-elytron-auth:2.2.1.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.security:wildfly-elytron-auth:2.9.1.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.security:wildfly-elytron-auth:2.9.2.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.security:wildfly-elytron-base:2.2.1.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.security:wildfly-elytron-base:2.9.1.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.security:wildfly-elytron-base:2.9.2.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.security:wildfly-elytron-client:2.2.1.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.security:wildfly-elytron-client:2.9.1.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.security:wildfly-elytron-client:2.9.2.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.security:wildfly-elytron-credential-source-impl:2.2.1.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.security:wildfly-elytron-credential-source-impl:2.9.1.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.security:wildfly-elytron-credential-source-impl:2.9.2.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.security:wildfly-elytron-credential-store:2.2.1.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.security:wildfly-elytron-credential-store:2.9.1.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.security:wildfly-elytron-credential-store:2.9.2.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.security:wildfly-elytron-credential:2.2.1.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.security:wildfly-elytron-credential:2.9.1.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.security:wildfly-elytron-credential:2.9.2.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.security:wildfly-elytron-encryption:2.2.1.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.security:wildfly-elytron-encryption:2.9.1.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.security:wildfly-elytron-encryption:2.9.2.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.security:wildfly-elytron-http-util:2.2.1.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.security:wildfly-elytron-http-util:2.9.1.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.security:wildfly-elytron-http-util:2.9.2.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.security:wildfly-elytron-http:2.2.1.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.security:wildfly-elytron-http:2.9.1.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.security:wildfly-elytron-http:2.9.2.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.security:wildfly-elytron-keystore:2.2.1.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.security:wildfly-elytron-keystore:2.9.1.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.security:wildfly-elytron-keystore:2.9.2.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.security:wildfly-elytron-mechanism-digest:2.2.1.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.security:wildfly-elytron-mechanism-digest:2.9.1.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.security:wildfly-elytron-mechanism-digest:2.9.2.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.security:wildfly-elytron-mechanism-gssapi:2.2.1.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.security:wildfly-elytron-mechanism-gssapi:2.9.1.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.security:wildfly-elytron-mechanism-gssapi:2.9.2.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.security:wildfly-elytron-mechanism:2.2.1.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.security:wildfly-elytron-mechanism:2.9.1.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.security:wildfly-elytron-mechanism:2.9.2.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.security:wildfly-elytron-password-impl:2.2.1.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.security:wildfly-elytron-password-impl:2.9.1.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.security:wildfly-elytron-password-impl:2.9.2.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.security:wildfly-elytron-permission:2.2.1.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.security:wildfly-elytron-permission:2.9.1.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.security:wildfly-elytron-permission:2.9.2.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.security:wildfly-elytron-provider-util:2.2.1.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.security:wildfly-elytron-provider-util:2.9.1.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.security:wildfly-elytron-provider-util:2.9.2.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.security:wildfly-elytron-realm:2.2.1.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.security:wildfly-elytron-realm:2.9.1.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.security:wildfly-elytron-realm:2.9.2.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.security:wildfly-elytron-sasl-anonymous:2.2.1.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.security:wildfly-elytron-sasl-anonymous:2.9.1.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.security:wildfly-elytron-sasl-anonymous:2.9.2.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.security:wildfly-elytron-sasl-auth-util:1.20.2.Final=testCompileClasspath,testRuntimeClasspath org.wildfly.security:wildfly-elytron-sasl-auth-util:2.5.0.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.security:wildfly-elytron-sasl-digest:2.2.1.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.security:wildfly-elytron-sasl-digest:2.9.1.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.security:wildfly-elytron-sasl-digest:2.9.2.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.security:wildfly-elytron-sasl-localuser:2.2.1.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.security:wildfly-elytron-sasl-localuser:2.9.1.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.security:wildfly-elytron-sasl-localuser:2.9.2.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.security:wildfly-elytron-sasl:2.2.1.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.security:wildfly-elytron-sasl:2.9.1.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.security:wildfly-elytron-sasl:2.9.2.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.security:wildfly-elytron-security-manager-action:2.2.1.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.security:wildfly-elytron-security-manager-action:2.9.1.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.security:wildfly-elytron-security-manager-action:2.9.2.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.security:wildfly-elytron-security-manager:2.2.1.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.security:wildfly-elytron-security-manager:2.9.1.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.security:wildfly-elytron-security-manager:2.9.2.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.security:wildfly-elytron-ssh-util:2.2.1.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.security:wildfly-elytron-ssh-util:2.9.1.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.security:wildfly-elytron-ssh-util:2.9.2.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.security:wildfly-elytron-ssl:2.2.1.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.security:wildfly-elytron-ssl:2.9.1.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.security:wildfly-elytron-ssl:2.9.2.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.security:wildfly-elytron-util:2.2.1.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.security:wildfly-elytron-util:2.9.1.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.security:wildfly-elytron-util:2.9.2.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.security:wildfly-elytron-x500-cert-acme:2.2.1.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.security:wildfly-elytron-x500-cert-acme:2.9.1.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.security:wildfly-elytron-x500-cert-acme:2.9.2.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.security:wildfly-elytron-x500-cert-util:2.2.1.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.security:wildfly-elytron-x500-cert-util:2.9.1.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.security:wildfly-elytron-x500-cert-util:2.9.2.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.security:wildfly-elytron-x500-cert:2.2.1.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.security:wildfly-elytron-x500-cert:2.9.1.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.security:wildfly-elytron-x500-cert:2.9.2.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.security:wildfly-elytron-x500:2.2.1.Final=testCompileClasspath,testRuntimeClasspath -org.wildfly.security:wildfly-elytron-x500:2.9.1.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.wildfly.security:wildfly-elytron-x500:2.9.2.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.wildfly.security:wildfly-security-manager:1.1.2.Final=compileClasspath org.wildfly:wildfly-dist:21.0.0.Final=wildflyTest -org.wildfly:wildfly-dist:40.0.1.Final=wildflyLatestDepTest +org.wildfly:wildfly-dist:41.0.0.Beta1=wildflyLatestDepTest org.wildfly:wildfly-ee:9.0.0.Final=compileClasspath org.wildfly:wildfly-naming:9.0.0.Final=compileClasspath org.xmlresolver:xmlresolver:5.3.3=spotbugs diff --git a/dd-java-agent/instrumentation/ws/jakarta-ws-annotations-3.0/gradle.lockfile b/dd-java-agent/instrumentation/ws/jakarta-ws-annotations-3.0/gradle.lockfile index d948d6fb682..6f2b57208b5 100644 --- a/dd-java-agent/instrumentation/ws/jakarta-ws-annotations-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/ws/jakarta-ws-annotations-3.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -83,6 +86,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-1.1/gradle.lockfile b/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-1.1/gradle.lockfile index 791b4012446..1c210de1b6c 100644 --- a/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-1.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-1.1/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotb com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -83,6 +86,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-2.0/gradle.lockfile b/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-2.0/gradle.lockfile index 108927b9922..5b693e21a71 100644 --- a/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-2.0/gradle.lockfile @@ -32,11 +32,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -91,6 +94,7 @@ org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspat org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/zio/zio-2.0/gradle.lockfile b/dd-java-agent/instrumentation/zio/zio-2.0/gradle.lockfile index 255dff72e76..426496eee0d 100644 --- a/dd-java-agent/instrumentation/zio/zio-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/zio/zio-2.0/gradle.lockfile @@ -36,11 +36,14 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=latestDepTestRuntimeClasspath,testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -107,6 +110,7 @@ org.jline:jline-native:3.27.1=zinc org.jline:jline-terminal-jni:3.27.1=zinc org.jline:jline-terminal:3.27.1=zinc org.jline:jline:3.27.1=zinc +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/apm-tracing-disabled/gradle.lockfile b/dd-smoke-tests/apm-tracing-disabled/gradle.lockfile index 8e09dd6285e..ab70f4353c1 100644 --- a/dd-smoke-tests/apm-tracing-disabled/gradle.lockfile +++ b/dd-smoke-tests/apm-tracing-disabled/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -79,6 +83,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/appsec/gradle.lockfile b/dd-smoke-tests/appsec/gradle.lockfile index 6da92add6f8..de0d9f2d3c3 100644 --- a/dd-smoke-tests/appsec/gradle.lockfile +++ b/dd-smoke-tests/appsec/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=runtimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -72,6 +76,7 @@ org.hamcrest:hamcrest-core:1.3=runtimeClasspath,testRuntimeClasspath org.hamcrest:hamcrest:3.0=compileClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=runtimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=runtimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/appsec/spring-tomcat7/gradle.lockfile b/dd-smoke-tests/appsec/spring-tomcat7/gradle.lockfile index 46520d69e37..e882dab09e1 100644 --- a/dd-smoke-tests/appsec/spring-tomcat7/gradle.lockfile +++ b/dd-smoke-tests/appsec/spring-tomcat7/gradle.lockfile @@ -29,7 +29,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -78,6 +82,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/appsec/springboot-graphql/gradle.lockfile b/dd-smoke-tests/appsec/springboot-graphql/gradle.lockfile index 1b84de5c4da..98778f67d82 100644 --- a/dd-smoke-tests/appsec/springboot-graphql/gradle.lockfile +++ b/dd-smoke-tests/appsec/springboot-graphql/gradle.lockfile @@ -37,7 +37,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.graphql-java:graphql-java:18.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.graphql-java:java-dataloader:3.1.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -91,6 +95,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/appsec/springboot-grpc/gradle.lockfile b/dd-smoke-tests/appsec/springboot-grpc/gradle.lockfile index 23ced86fcb5..31d29f42ec6 100644 --- a/dd-smoke-tests/appsec/springboot-grpc/gradle.lockfile +++ b/dd-smoke-tests/appsec/springboot-grpc/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -72,6 +76,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/appsec/springboot-security/gradle.lockfile b/dd-smoke-tests/appsec/springboot-security/gradle.lockfile index c2c6d475298..6f62b1a5c2c 100644 --- a/dd-smoke-tests/appsec/springboot-security/gradle.lockfile +++ b/dd-smoke-tests/appsec/springboot-security/gradle.lockfile @@ -37,7 +37,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.h2database:h2:2.1.212=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.5.0=testCompileClasspath,testRuntimeClasspath @@ -104,6 +108,7 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.0=compileClasspath,runtimeClasspath, org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:1.5.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains:annotations:13.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/appsec/springboot/gradle.lockfile b/dd-smoke-tests/appsec/springboot/gradle.lockfile index 0721078c813..71743a339de 100644 --- a/dd-smoke-tests/appsec/springboot/gradle.lockfile +++ b/dd-smoke-tests/appsec/springboot/gradle.lockfile @@ -31,13 +31,18 @@ com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath +com.github.junrar:junrar:7.5.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.h2database:h2:2.1.212=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath @@ -100,6 +105,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath @@ -129,7 +135,8 @@ org.ow2.asm:asm:9.9.1=testCompileClasspath,testRuntimeClasspath org.slf4j:jcl-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath org.slf4j:jul-to-slf4j:1.7.32=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:log4j-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath -org.slf4j:slf4j-api:1.7.32=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:1.7.32=compileClasspath,testCompileClasspath +org.slf4j:slf4j-api:1.7.36=runtimeClasspath,testRuntimeClasspath org.slf4j:slf4j-api:2.0.17=spotbugs,spotbugsSlf4j org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j org.spockframework:spock-bom:2.4-groovy-3.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/armeria-grpc/gradle.lockfile b/dd-smoke-tests/armeria-grpc/gradle.lockfile index 5b3a1dace82..a3549e77642 100644 --- a/dd-smoke-tests/armeria-grpc/gradle.lockfile +++ b/dd-smoke-tests/armeria-grpc/gradle.lockfile @@ -30,12 +30,16 @@ com.google.api.grpc:proto-google-common-protos:2.17.0=compileClasspath,compilePr com.google.code.findbugs:jsr305:3.0.2=compileClasspath,compileProtoPath,runtimeClasspath,spotbugs,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.google.code.gson:gson:2.10.1=testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs -com.google.errorprone:error_prone_annotations:2.18.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.18.0=compileClasspath,compileProtoPath,runtimeClasspath com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:failureaccess:1.0.1=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.google.guava:guava:31.1-android=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.1=compileClasspath,compileProtoPath,runtimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.google.guava:guava:31.1-android=compileClasspath,compileProtoPath,runtimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.google.j2objc:j2objc-annotations:1.3=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:1.3=compileClasspath,compileProtoPath,runtimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.google.protobuf:protobuf-java:3.22.3=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.google.protobuf:protoc:3.22.3=protobufToolsLocator_protoc com.google.re2j:re2j:1.8=testCompileProtoPath,testRuntimeClasspath @@ -82,7 +86,7 @@ org.apache.logging.log4j:log4j-api:2.25.2=spotbugs org.apache.logging.log4j:log4j-core:2.25.2=spotbugs org.apache.tomcat:annotations-api:6.0.53=testCompileClasspath,testCompileProtoPath org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath -org.checkerframework:checker-qual:3.12.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +org.checkerframework:checker-qual:3.12.0=compileClasspath,compileProtoPath,runtimeClasspath org.codehaus.groovy:groovy-ant:3.0.23=codenarc org.codehaus.groovy:groovy-docgenerator:3.0.23=codenarc org.codehaus.groovy:groovy-groovydoc:3.0.23=codenarc @@ -100,6 +104,7 @@ org.hamcrest:hamcrest-core:1.3=testCompileProtoPath,testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testCompileProtoPath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=testCompileProtoPath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testCompileProtoPath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath diff --git a/dd-smoke-tests/backend-mock/gradle.lockfile b/dd-smoke-tests/backend-mock/gradle.lockfile index d4db288c66c..5dd9dcc8a2f 100644 --- a/dd-smoke-tests/backend-mock/gradle.lockfile +++ b/dd-smoke-tests/backend-mock/gradle.lockfile @@ -32,7 +32,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=runtimeClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.8.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -84,6 +88,7 @@ org.jacoco:org.jacoco.core:0.8.14=runtimeClasspath,testRuntimeClasspath org.jacoco:org.jacoco.report:0.8.14=runtimeClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=runtimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=runtimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=runtimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/cli/gradle.lockfile b/dd-smoke-tests/cli/gradle.lockfile index 41347104f9b..1d0a72ff489 100644 --- a/dd-smoke-tests/cli/gradle.lockfile +++ b/dd-smoke-tests/cli/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -73,6 +77,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/concurrent/java-21/gradle.lockfile b/dd-smoke-tests/concurrent/java-21/gradle.lockfile index f2b2dc6fc9b..56916a670d1 100644 --- a/dd-smoke-tests/concurrent/java-21/gradle.lockfile +++ b/dd-smoke-tests/concurrent/java-21/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -76,6 +80,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/concurrent/java-25/gradle.lockfile b/dd-smoke-tests/concurrent/java-25/gradle.lockfile index 347071a64ef..1a79e002a7f 100644 --- a/dd-smoke-tests/concurrent/java-25/gradle.lockfile +++ b/dd-smoke-tests/concurrent/java-25/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -77,6 +81,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/concurrent/java-8/gradle.lockfile b/dd-smoke-tests/concurrent/java-8/gradle.lockfile index 2ec1ccd1542..af763c4fa72 100644 --- a/dd-smoke-tests/concurrent/java-8/gradle.lockfile +++ b/dd-smoke-tests/concurrent/java-8/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -76,6 +80,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/crashtracking/gradle.lockfile b/dd-smoke-tests/crashtracking/gradle.lockfile index 4f7ca1fdf76..7a084df202c 100644 --- a/dd-smoke-tests/crashtracking/gradle.lockfile +++ b/dd-smoke-tests/crashtracking/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -76,6 +80,7 @@ org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.javadelight:delight-fileupload:0.0.5=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/custom-systemloader/gradle.lockfile b/dd-smoke-tests/custom-systemloader/gradle.lockfile index 1102e29c73a..83de46c2e4f 100644 --- a/dd-smoke-tests/custom-systemloader/gradle.lockfile +++ b/dd-smoke-tests/custom-systemloader/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -74,6 +78,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/debugger-integration-tests/gradle.lockfile b/dd-smoke-tests/debugger-integration-tests/gradle.lockfile index c3fd4d672ae..f5aaa7cbcbb 100644 --- a/dd-smoke-tests/debugger-integration-tests/gradle.lockfile +++ b/dd-smoke-tests/debugger-integration-tests/gradle.lockfile @@ -36,7 +36,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -90,6 +94,7 @@ org.hamcrest:hamcrest-core:1.3=compileClasspath,runtimeClasspath,testCompileClas org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/dynamic-config/gradle.lockfile b/dd-smoke-tests/dynamic-config/gradle.lockfile index 2b02ed13d79..4f0f310fb18 100644 --- a/dd-smoke-tests/dynamic-config/gradle.lockfile +++ b/dd-smoke-tests/dynamic-config/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -76,6 +80,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/field-injection/gradle.lockfile b/dd-smoke-tests/field-injection/gradle.lockfile index 94be84bbfd2..cef95e44f36 100644 --- a/dd-smoke-tests/field-injection/gradle.lockfile +++ b/dd-smoke-tests/field-injection/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -73,6 +77,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/gradle.lockfile b/dd-smoke-tests/gradle.lockfile index 2124e5fb238..f2b1b5d1cea 100644 --- a/dd-smoke-tests/gradle.lockfile +++ b/dd-smoke-tests/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=runtimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -73,6 +77,7 @@ org.hamcrest:hamcrest-core:1.3=runtimeClasspath,testRuntimeClasspath org.hamcrest:hamcrest:3.0=compileClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=runtimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=runtimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=compileClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=compileClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/gradle/gradle.lockfile b/dd-smoke-tests/gradle/gradle.lockfile index c111ec8a928..d191f801e09 100644 --- a/dd-smoke-tests/gradle/gradle.lockfile +++ b/dd-smoke-tests/gradle/gradle.lockfile @@ -32,7 +32,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.jayway.jsonpath:json-path:2.8.0=testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath @@ -84,6 +88,7 @@ org.jacoco:org.jacoco.core:0.8.14=testRuntimeClasspath org.jacoco:org.jacoco.report:0.8.14=testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/grpc-1.5/gradle.lockfile b/dd-smoke-tests/grpc-1.5/gradle.lockfile index 122e6d76bf3..66f8a0fcde0 100644 --- a/dd-smoke-tests/grpc-1.5/gradle.lockfile +++ b/dd-smoke-tests/grpc-1.5/gradle.lockfile @@ -33,14 +33,18 @@ com.google.auto.value:auto-value-annotations:1.10.2=compileClasspath,compileProt com.google.code.findbugs:jsr305:3.0.2=compileClasspath,compileProtoPath,runtimeClasspath,spotbugs,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.code.gson:gson:2.10.1=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs -com.google.errorprone:error_prone_annotations:2.20.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.20.0=compileClasspath,compileProtoPath,runtimeClasspath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:failureaccess:1.0.1=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.google.guava:guava:32.0.1-jre=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.1=compileClasspath,compileProtoPath,runtimeClasspath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.google.guava:guava:32.0.1-jre=compileClasspath,compileProtoPath,runtimeClasspath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.http-client:google-http-client-gson:1.41.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.http-client:google-http-client:1.41.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.google.j2objc:j2objc-annotations:2.8=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:2.8=compileClasspath,compileProtoPath,runtimeClasspath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.google.protobuf:protobuf-java-util:3.24.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.protobuf:protobuf-java:3.24.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.protobuf:protoc:3.24.0=protobufToolsLocator_protoc @@ -122,7 +126,7 @@ org.apache.httpcomponents:httpcore:4.4.15=compileClasspath,compileProtoPath,runt org.apache.logging.log4j:log4j-api:2.25.2=spotbugs org.apache.logging.log4j:log4j-core:2.25.2=spotbugs org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath -org.checkerframework:checker-qual:3.33.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.33.0=compileClasspath,compileProtoPath,runtimeClasspath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath org.codehaus.groovy:groovy-ant:3.0.23=codenarc org.codehaus.groovy:groovy-docgenerator:3.0.23=codenarc org.codehaus.groovy:groovy-groovydoc:3.0.23=codenarc @@ -144,6 +148,7 @@ org.jctools:jctools-core:4.0.6=testCompileProtoPath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib-common:1.4.20=compileProtoPath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:1.4.20=compileProtoPath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath org.jetbrains:annotations:13.0=compileProtoPath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testCompileProtoPath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath diff --git a/dd-smoke-tests/iast-propagation/gradle.lockfile b/dd-smoke-tests/iast-propagation/gradle.lockfile index 17ed808a681..250e45dc557 100644 --- a/dd-smoke-tests/iast-propagation/gradle.lockfile +++ b/dd-smoke-tests/iast-propagation/gradle.lockfile @@ -41,7 +41,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,compileOnlyDependenciesMetadata,spotbugs,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath @@ -128,6 +132,7 @@ org.jline:jline-native:3.27.1=zinc org.jline:jline-terminal-jni:3.27.1=zinc org.jline:jline-terminal:3.27.1=zinc org.jline:jline:3.27.1=zinc +org.jspecify:jspecify:1.0.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath diff --git a/dd-smoke-tests/iast-util/gradle.lockfile b/dd-smoke-tests/iast-util/gradle.lockfile index bdbc3d1bd49..bab8fcdc01e 100644 --- a/dd-smoke-tests/iast-util/gradle.lockfile +++ b/dd-smoke-tests/iast-util/gradle.lockfile @@ -33,7 +33,11 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.10=compileClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -103,6 +107,7 @@ org.hibernate:hibernate-validator:5.3.6.Final=compileClasspath org.jboss.logging:jboss-logging:3.3.0.Final=compileClasspath org.jctools:jctools-core-jdk11:4.0.6=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/iast-util/iast-util-11/gradle.lockfile b/dd-smoke-tests/iast-util/iast-util-11/gradle.lockfile index 0b7f1de2fa0..29453d05df5 100644 --- a/dd-smoke-tests/iast-util/iast-util-11/gradle.lockfile +++ b/dd-smoke-tests/iast-util/iast-util-11/gradle.lockfile @@ -35,7 +35,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -96,6 +100,7 @@ org.hibernate.validator:hibernate-validator:6.0.17.Final=compileClasspath org.jboss.logging:jboss-logging:3.3.2.Final=compileClasspath org.jctools:jctools-core-jdk11:4.0.6=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/iast-util/iast-util-17/gradle.lockfile b/dd-smoke-tests/iast-util/iast-util-17/gradle.lockfile index b19e297d644..dd1c3ca9789 100644 --- a/dd-smoke-tests/iast-util/iast-util-17/gradle.lockfile +++ b/dd-smoke-tests/iast-util/iast-util-17/gradle.lockfile @@ -36,7 +36,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -97,6 +101,7 @@ org.hibernate.validator:hibernate-validator:6.0.17.Final=compileClasspath org.jboss.logging:jboss-logging:3.3.2.Final=compileClasspath org.jctools:jctools-core-jdk11:4.0.6=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/java9-modules/gradle.lockfile b/dd-smoke-tests/java9-modules/gradle.lockfile index 5bf8254ee3d..f746883c9df 100644 --- a/dd-smoke-tests/java9-modules/gradle.lockfile +++ b/dd-smoke-tests/java9-modules/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -73,6 +77,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/jboss-modules/gradle.lockfile b/dd-smoke-tests/jboss-modules/gradle.lockfile index 2622584725a..c818b484964 100644 --- a/dd-smoke-tests/jboss-modules/gradle.lockfile +++ b/dd-smoke-tests/jboss-modules/gradle.lockfile @@ -28,7 +28,12 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:20.0=compileClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -79,6 +84,7 @@ org.jboss.modules:jboss-modules:1.3.0.Final=compileClasspath,jbossModulesV1 org.jboss.modules:jboss-modules:2.0.0.Final=jbossModulesV2 org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/jdk-tool-abort/gradle.lockfile b/dd-smoke-tests/jdk-tool-abort/gradle.lockfile index fcae27f11dc..0a4774a7fa3 100644 --- a/dd-smoke-tests/jdk-tool-abort/gradle.lockfile +++ b/dd-smoke-tests/jdk-tool-abort/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -73,6 +77,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/jersey-2/gradle.lockfile b/dd-smoke-tests/jersey-2/gradle.lockfile index 8de6eaf361e..d3fd5e887b7 100644 --- a/dd-smoke-tests/jersey-2/gradle.lockfile +++ b/dd-smoke-tests/jersey-2/gradle.lockfile @@ -28,8 +28,12 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:14.0.1=compileClasspath,runtimeClasspath,testFixturesRuntimeClasspath -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -109,6 +113,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/jersey-3/gradle.lockfile b/dd-smoke-tests/jersey-3/gradle.lockfile index 1f769d46bef..95f81af6773 100644 --- a/dd-smoke-tests/jersey-3/gradle.lockfile +++ b/dd-smoke-tests/jersey-3/gradle.lockfile @@ -33,7 +33,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -107,6 +111,7 @@ org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.25.0-GA=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/junit-console/gradle.lockfile b/dd-smoke-tests/junit-console/gradle.lockfile index 5887f8a62a9..10e6b51b3f5 100644 --- a/dd-smoke-tests/junit-console/gradle.lockfile +++ b/dd-smoke-tests/junit-console/gradle.lockfile @@ -32,7 +32,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.jayway.jsonpath:json-path:2.8.0=testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath @@ -84,6 +88,7 @@ org.jacoco:org.jacoco.core:0.8.14=testRuntimeClasspath org.jacoco:org.jacoco.report:0.8.14=testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/kafka-2/gradle.lockfile b/dd-smoke-tests/kafka-2/gradle.lockfile index 66a22568b47..d2348d01ee9 100644 --- a/dd-smoke-tests/kafka-2/gradle.lockfile +++ b/dd-smoke-tests/kafka-2/gradle.lockfile @@ -36,7 +36,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -114,6 +118,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/kafka-3/gradle.lockfile b/dd-smoke-tests/kafka-3/gradle.lockfile index 3f4d04ed63f..4218e87f225 100644 --- a/dd-smoke-tests/kafka-3/gradle.lockfile +++ b/dd-smoke-tests/kafka-3/gradle.lockfile @@ -36,7 +36,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -115,6 +119,7 @@ org.hamcrest:hamcrest-core:1.3=runtimeClasspath,testFixturesRuntimeClasspath,tes org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/lib-injection/gradle.lockfile b/dd-smoke-tests/lib-injection/gradle.lockfile index 4d2ab5e997d..5b29a340b19 100644 --- a/dd-smoke-tests/lib-injection/gradle.lockfile +++ b/dd-smoke-tests/lib-injection/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -75,6 +79,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/log-injection/gradle.lockfile b/dd-smoke-tests/log-injection/gradle.lockfile index 3fbb8e42a16..83a6504e92a 100644 --- a/dd-smoke-tests/log-injection/gradle.lockfile +++ b/dd-smoke-tests/log-injection/gradle.lockfile @@ -43,10 +43,14 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath com.google.flogger:flogger-slf4j-backend:0.5.1=floggerSlf4jBackend com.google.flogger:flogger-system-backend:0.5.1=floggerJULBackend,floggerSlf4jBackend com.google.flogger:flogger:0.5.1=compileClasspath,floggerInterface,floggerJULBackend,floggerSlf4jBackend -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.jayway.jsonpath:json-path:2.8.0=testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath @@ -125,6 +129,7 @@ org.jboss.logmanager:jboss-logmanager:1.2.0.GA=jbossBackend org.jboss.logmanager:jboss-logmanager:2.3.0.Alpha1=jbossBackendLatest org.jctools:jctools-core-jdk11:4.0.6=log4j2,log4j2Latest,testRuntimeClasspath org.jctools:jctools-core:4.0.6=log4j2,log4j2Latest,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/maven/gradle.lockfile b/dd-smoke-tests/maven/gradle.lockfile index c69c295a1f1..5af85e1365b 100644 --- a/dd-smoke-tests/maven/gradle.lockfile +++ b/dd-smoke-tests/maven/gradle.lockfile @@ -32,7 +32,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.jayway.jsonpath:json-path:2.8.0=testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath @@ -85,6 +89,7 @@ org.jacoco:org.jacoco.core:0.8.14=testRuntimeClasspath org.jacoco:org.jacoco.report:0.8.14=testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/openfeature/gradle.lockfile b/dd-smoke-tests/openfeature/gradle.lockfile index 4cf130afffc..fe8234be712 100644 --- a/dd-smoke-tests/openfeature/gradle.lockfile +++ b/dd-smoke-tests/openfeature/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -73,6 +77,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/opentelemetry/gradle.lockfile b/dd-smoke-tests/opentelemetry/gradle.lockfile index 71b21d626ca..e46193771a6 100644 --- a/dd-smoke-tests/opentelemetry/gradle.lockfile +++ b/dd-smoke-tests/opentelemetry/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -76,6 +80,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/opentracing/gradle.lockfile b/dd-smoke-tests/opentracing/gradle.lockfile index 77d9aaa89fd..e59a1da9ec6 100644 --- a/dd-smoke-tests/opentracing/gradle.lockfile +++ b/dd-smoke-tests/opentracing/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -77,6 +81,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/osgi/gradle.lockfile b/dd-smoke-tests/osgi/gradle.lockfile index 15c09e4166c..82a30e8fa68 100644 --- a/dd-smoke-tests/osgi/gradle.lockfile +++ b/dd-smoke-tests/osgi/gradle.lockfile @@ -28,7 +28,12 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=bundles,compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:20.0=bundles,compileClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -83,6 +88,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/play-2.4/gradle.lockfile b/dd-smoke-tests/play-2.4/gradle.lockfile index a330265f443..b65fe75f446 100644 --- a/dd-smoke-tests/play-2.4/gradle.lockfile +++ b/dd-smoke-tests/play-2.4/gradle.lockfile @@ -45,10 +45,15 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.code.gson:gson:2.2.4=javaScriptCompiler com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:16.0.1=play -com.google.guava:guava:18.0=compileClasspath,javaScriptCompiler,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:18.0=compileClasspath,javaScriptCompiler,runtimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath com.google.inject.extensions:guice-assistedinject:4.0=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.inject:guice:4.0=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.javascript:closure-compiler-externs:v20141215=javaScriptCompiler com.google.javascript:closure-compiler:v20141215=javaScriptCompiler com.google.protobuf:protobuf-java:2.5.0=javaScriptCompiler @@ -161,6 +166,7 @@ org.jline:jline-terminal-jni:3.27.1=zinc org.jline:jline-terminal:3.27.1=zinc org.jline:jline:3.27.1=zinc org.joda:joda-convert:1.7=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/play-2.5/gradle.lockfile b/dd-smoke-tests/play-2.5/gradle.lockfile index cfde32ba928..8309cb9f2a0 100644 --- a/dd-smoke-tests/play-2.5/gradle.lockfile +++ b/dd-smoke-tests/play-2.5/gradle.lockfile @@ -45,11 +45,16 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.code.gson:gson:2.2.4=javaScriptCompiler com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:16.0.1=play com.google.guava:guava:18.0=javaScriptCompiler -com.google.guava:guava:19.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:19.0=compileClasspath,runtimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath com.google.inject.extensions:guice-assistedinject:4.0=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.inject:guice:4.0=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.javascript:closure-compiler-externs:v20141215=javaScriptCompiler com.google.javascript:closure-compiler:v20141215=javaScriptCompiler com.google.protobuf:protobuf-java:2.5.0=javaScriptCompiler @@ -178,6 +183,7 @@ org.jline:jline-terminal-jni:3.27.1=zinc org.jline:jline-terminal:3.27.1=zinc org.jline:jline:3.27.1=zinc org.joda:joda-convert:1.8.1=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/play-2.6/gradle.lockfile b/dd-smoke-tests/play-2.6/gradle.lockfile index f1c99288cd2..74a540ecebc 100644 --- a/dd-smoke-tests/play-2.6/gradle.lockfile +++ b/dd-smoke-tests/play-2.6/gradle.lockfile @@ -43,13 +43,18 @@ com.google.code.findbugs:jsr305:1.3.9=javaScriptCompiler,play,runtimeClasspath com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.code.gson:gson:2.2.4=javaScriptCompiler -com.google.errorprone:error_prone_annotations:2.1.3=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.1.3=compileClasspath,play,runtimeClasspath com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:18.0=javaScriptCompiler -com.google.guava:guava:23.6.1-jre=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:23.6.1-jre=compileClasspath,play,runtimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath com.google.inject.extensions:guice-assistedinject:4.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.inject:guice:4.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.j2objc:j2objc-annotations:1.1=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:1.1=compileClasspath,play,runtimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.javascript:closure-compiler-externs:v20141215=javaScriptCompiler com.google.javascript:closure-compiler:v20141215=javaScriptCompiler com.google.protobuf:protobuf-java:2.5.0=javaScriptCompiler @@ -157,7 +162,7 @@ org.apache.logging.log4j:log4j-api:2.25.2=spotbugs org.apache.logging.log4j:log4j-core:2.17.1=zinc org.apache.logging.log4j:log4j-core:2.25.2=spotbugs org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath -org.checkerframework:checker-compat-qual:2.0.0=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.checkerframework:checker-compat-qual:2.0.0=compileClasspath,play,runtimeClasspath org.codehaus.groovy:groovy-ant:3.0.23=codenarc org.codehaus.groovy:groovy-docgenerator:3.0.23=codenarc org.codehaus.groovy:groovy-groovydoc:3.0.23=codenarc @@ -167,7 +172,7 @@ org.codehaus.groovy:groovy-templates:3.0.23=codenarc org.codehaus.groovy:groovy-xml:3.0.23=codenarc org.codehaus.groovy:groovy:3.0.23=codenarc org.codehaus.groovy:groovy:3.0.25=testCompileClasspath,testRuntimeClasspath -org.codehaus.mojo:animal-sniffer-annotations:1.14=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.mojo:animal-sniffer-annotations:1.14=compileClasspath,play,runtimeClasspath org.codenarc:CodeNarc:3.7.0=codenarc org.dom4j:dom4j:2.2.0=spotbugs org.fusesource.jansi:jansi:2.4.1=zinc @@ -184,6 +189,7 @@ org.jline:jline-terminal-jni:3.27.1=zinc org.jline:jline-terminal:3.27.1=zinc org.jline:jline:3.27.1=zinc org.joda:joda-convert:1.9.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/play-2.7/gradle.lockfile b/dd-smoke-tests/play-2.7/gradle.lockfile index ac58d3d2402..d583e278963 100644 --- a/dd-smoke-tests/play-2.7/gradle.lockfile +++ b/dd-smoke-tests/play-2.7/gradle.lockfile @@ -43,15 +43,19 @@ com.google.code.findbugs:jsr305:1.3.9=javaScriptCompiler com.google.code.findbugs:jsr305:3.0.2=compileClasspath,play,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.code.gson:gson:2.2.4=javaScriptCompiler -com.google.errorprone:error_prone_annotations:2.2.0=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.2.0=compileClasspath,play,runtimeClasspath com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:failureaccess:1.0.1=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.1=compileClasspath,play,runtimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:18.0=javaScriptCompiler -com.google.guava:guava:27.1-jre=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:27.1-jre=compileClasspath,play,runtimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.inject.extensions:guice-assistedinject:4.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.inject:guice:4.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.j2objc:j2objc-annotations:1.1=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:1.1=compileClasspath,play,runtimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.javascript:closure-compiler-externs:v20141215=javaScriptCompiler com.google.javascript:closure-compiler:v20141215=javaScriptCompiler com.google.protobuf:protobuf-java:2.5.0=javaScriptCompiler @@ -157,7 +161,7 @@ org.apache.logging.log4j:log4j-api:2.25.2=spotbugs org.apache.logging.log4j:log4j-core:2.17.1=zinc org.apache.logging.log4j:log4j-core:2.25.2=spotbugs org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath -org.checkerframework:checker-qual:2.5.2=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:2.5.2=compileClasspath,play,runtimeClasspath org.codehaus.groovy:groovy-ant:3.0.23=codenarc org.codehaus.groovy:groovy-docgenerator:3.0.23=codenarc org.codehaus.groovy:groovy-groovydoc:3.0.23=codenarc @@ -167,7 +171,7 @@ org.codehaus.groovy:groovy-templates:3.0.23=codenarc org.codehaus.groovy:groovy-xml:3.0.23=codenarc org.codehaus.groovy:groovy:3.0.23=codenarc org.codehaus.groovy:groovy:3.0.25=testCompileClasspath,testRuntimeClasspath -org.codehaus.mojo:animal-sniffer-annotations:1.17=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.mojo:animal-sniffer-annotations:1.17=compileClasspath,play,runtimeClasspath org.codenarc:CodeNarc:3.7.0=codenarc org.dom4j:dom4j:2.2.0=spotbugs org.fusesource.jansi:jansi:2.4.1=zinc @@ -184,6 +188,7 @@ org.jline:jline-terminal:3.27.1=zinc org.jline:jline:3.16.0=twirlCompiler org.jline:jline:3.27.1=zinc org.joda:joda-convert:1.9.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/play-2.8-otel/gradle.lockfile b/dd-smoke-tests/play-2.8-otel/gradle.lockfile index 9641dddff55..2ccea76d117 100644 --- a/dd-smoke-tests/play-2.8-otel/gradle.lockfile +++ b/dd-smoke-tests/play-2.8-otel/gradle.lockfile @@ -48,14 +48,18 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,play,runtimeClasspath,spo com.google.code.gson:gson:2.13.2=spotbugs com.google.code.gson:gson:2.2.4=javaScriptCompiler com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.errorprone:error_prone_annotations:2.5.1=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.guava:failureaccess:1.0.1=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.5.1=compileClasspath,play,runtimeClasspath +com.google.guava:failureaccess:1.0.1=compileClasspath,play,runtimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:18.0=javaScriptCompiler -com.google.guava:guava:30.1.1-jre=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:30.1.1-jre=compileClasspath,play,runtimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.inject.extensions:guice-assistedinject:5.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.inject:guice:5.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.j2objc:j2objc-annotations:1.3=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:1.3=compileClasspath,play,runtimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.javascript:closure-compiler-externs:v20141215=javaScriptCompiler com.google.javascript:closure-compiler:v20141215=javaScriptCompiler com.google.protobuf:protobuf-java:2.5.0=javaScriptCompiler @@ -158,7 +162,7 @@ org.apache.logging.log4j:log4j-api:2.25.2=spotbugs org.apache.logging.log4j:log4j-core:2.17.1=zinc org.apache.logging.log4j:log4j-core:2.25.2=spotbugs org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath -org.checkerframework:checker-qual:3.8.0=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.8.0=compileClasspath,play,runtimeClasspath org.codehaus.groovy:groovy-ant:3.0.23=codenarc org.codehaus.groovy:groovy-docgenerator:3.0.23=codenarc org.codehaus.groovy:groovy-groovydoc:3.0.23=codenarc @@ -183,6 +187,7 @@ org.jline:jline-terminal-jni:3.27.1=zinc org.jline:jline-terminal:3.27.1=zinc org.jline:jline:3.16.0=twirlCompiler org.jline:jline:3.27.1=zinc +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/play-2.8-split-routes/gradle.lockfile b/dd-smoke-tests/play-2.8-split-routes/gradle.lockfile index 4e8d0d9892e..3872336ac4c 100644 --- a/dd-smoke-tests/play-2.8-split-routes/gradle.lockfile +++ b/dd-smoke-tests/play-2.8-split-routes/gradle.lockfile @@ -48,14 +48,18 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,play,runtimeClasspath,spo com.google.code.gson:gson:2.13.2=spotbugs com.google.code.gson:gson:2.2.4=javaScriptCompiler com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.errorprone:error_prone_annotations:2.5.1=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.guava:failureaccess:1.0.1=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.5.1=compileClasspath,play,runtimeClasspath +com.google.guava:failureaccess:1.0.1=compileClasspath,play,runtimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:18.0=javaScriptCompiler -com.google.guava:guava:30.1.1-jre=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:30.1.1-jre=compileClasspath,play,runtimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.inject.extensions:guice-assistedinject:5.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.inject:guice:5.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.j2objc:j2objc-annotations:1.3=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:1.3=compileClasspath,play,runtimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.javascript:closure-compiler-externs:v20141215=javaScriptCompiler com.google.javascript:closure-compiler:v20141215=javaScriptCompiler com.google.protobuf:protobuf-java:2.5.0=javaScriptCompiler @@ -158,7 +162,7 @@ org.apache.logging.log4j:log4j-api:2.25.2=spotbugs org.apache.logging.log4j:log4j-core:2.17.1=zinc org.apache.logging.log4j:log4j-core:2.25.2=spotbugs org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath -org.checkerframework:checker-qual:3.8.0=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.8.0=compileClasspath,play,runtimeClasspath org.codehaus.groovy:groovy-ant:3.0.23=codenarc org.codehaus.groovy:groovy-docgenerator:3.0.23=codenarc org.codehaus.groovy:groovy-groovydoc:3.0.23=codenarc @@ -183,6 +187,7 @@ org.jline:jline-terminal-jni:3.27.1=zinc org.jline:jline-terminal:3.27.1=zinc org.jline:jline:3.16.0=twirlCompiler org.jline:jline:3.27.1=zinc +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/play-2.8/gradle.lockfile b/dd-smoke-tests/play-2.8/gradle.lockfile index 4b40fbd075b..f1abf238ce6 100644 --- a/dd-smoke-tests/play-2.8/gradle.lockfile +++ b/dd-smoke-tests/play-2.8/gradle.lockfile @@ -48,14 +48,18 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,play,runtimeClasspath,spo com.google.code.gson:gson:2.13.2=spotbugs com.google.code.gson:gson:2.2.4=javaScriptCompiler com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.errorprone:error_prone_annotations:2.5.1=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.guava:failureaccess:1.0.1=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.5.1=compileClasspath,play,runtimeClasspath +com.google.guava:failureaccess:1.0.1=compileClasspath,play,runtimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:18.0=javaScriptCompiler -com.google.guava:guava:30.1.1-jre=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:30.1.1-jre=compileClasspath,play,runtimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.inject.extensions:guice-assistedinject:5.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.inject:guice:5.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.j2objc:j2objc-annotations:1.3=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:1.3=compileClasspath,play,runtimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.javascript:closure-compiler-externs:v20141215=javaScriptCompiler com.google.javascript:closure-compiler:v20141215=javaScriptCompiler com.google.protobuf:protobuf-java:2.5.0=javaScriptCompiler @@ -164,7 +168,7 @@ org.apache.logging.log4j:log4j-api:2.25.2=spotbugs org.apache.logging.log4j:log4j-core:2.17.1=zinc org.apache.logging.log4j:log4j-core:2.25.2=spotbugs org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath -org.checkerframework:checker-qual:3.8.0=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.8.0=compileClasspath,play,runtimeClasspath org.codehaus.groovy:groovy-ant:3.0.23=codenarc org.codehaus.groovy:groovy-docgenerator:3.0.23=codenarc org.codehaus.groovy:groovy-groovydoc:3.0.23=codenarc @@ -189,6 +193,7 @@ org.jline:jline-terminal-jni:3.27.1=zinc org.jline:jline-terminal:3.27.1=zinc org.jline:jline:3.16.0=twirlCompiler org.jline:jline:3.27.1=zinc +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/profiling-integration-tests/gradle.lockfile b/dd-smoke-tests/profiling-integration-tests/gradle.lockfile index ebece392384..14c132f5932 100644 --- a/dd-smoke-tests/profiling-integration-tests/gradle.lockfile +++ b/dd-smoke-tests/profiling-integration-tests/gradle.lockfile @@ -33,7 +33,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=runtimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -87,6 +91,7 @@ org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.javadelight:delight-fileupload:0.0.5=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=runtimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=runtimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/quarkus-native/gradle.lockfile b/dd-smoke-tests/quarkus-native/gradle.lockfile index bd48b4e8b28..61fcc87e6f9 100644 --- a/dd-smoke-tests/quarkus-native/gradle.lockfile +++ b/dd-smoke-tests/quarkus-native/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -73,6 +77,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/quarkus/gradle.lockfile b/dd-smoke-tests/quarkus/gradle.lockfile index c5824d95fda..01b75520414 100644 --- a/dd-smoke-tests/quarkus/gradle.lockfile +++ b/dd-smoke-tests/quarkus/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -73,6 +77,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/ratpack-1.5/gradle.lockfile b/dd-smoke-tests/ratpack-1.5/gradle.lockfile index 7298f4680ea..310dea3ff0c 100644 --- a/dd-smoke-tests/ratpack-1.5/gradle.lockfile +++ b/dd-smoke-tests/ratpack-1.5/gradle.lockfile @@ -36,7 +36,12 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:21.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:21.0=compileClasspath,runtimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -93,6 +98,7 @@ org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.19.0-GA=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/resteasy/gradle.lockfile b/dd-smoke-tests/resteasy/gradle.lockfile index dc3fc5ff02e..8b7ed66b312 100644 --- a/dd-smoke-tests/resteasy/gradle.lockfile +++ b/dd-smoke-tests/resteasy/gradle.lockfile @@ -34,7 +34,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -114,6 +118,7 @@ org.jboss.xnio:xnio-api:3.3.6.Final=compileClasspath,runtimeClasspath,testCompil org.jboss.xnio:xnio-nio:3.3.6.Final=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/rum/gradle.lockfile b/dd-smoke-tests/rum/gradle.lockfile index 14a42cc1a6d..42433bb4543 100644 --- a/dd-smoke-tests/rum/gradle.lockfile +++ b/dd-smoke-tests/rum/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=runtimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -73,6 +77,7 @@ org.hamcrest:hamcrest-core:1.3=runtimeClasspath,testRuntimeClasspath org.hamcrest:hamcrest:3.0=compileClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=runtimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=runtimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/rum/tomcat-10/gradle.lockfile b/dd-smoke-tests/rum/tomcat-10/gradle.lockfile index 68f8f3eaf4d..a3649ba434e 100644 --- a/dd-smoke-tests/rum/tomcat-10/gradle.lockfile +++ b/dd-smoke-tests/rum/tomcat-10/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -79,6 +83,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/rum/tomcat-11/gradle.lockfile b/dd-smoke-tests/rum/tomcat-11/gradle.lockfile index 1921b36e17b..2446c7d9eaa 100644 --- a/dd-smoke-tests/rum/tomcat-11/gradle.lockfile +++ b/dd-smoke-tests/rum/tomcat-11/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -79,6 +83,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/rum/tomcat-9/gradle.lockfile b/dd-smoke-tests/rum/tomcat-9/gradle.lockfile index 1dd42b181f5..97e78dda93b 100644 --- a/dd-smoke-tests/rum/tomcat-9/gradle.lockfile +++ b/dd-smoke-tests/rum/tomcat-9/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -78,6 +82,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/rum/wildfly-15/gradle.lockfile b/dd-smoke-tests/rum/wildfly-15/gradle.lockfile index e92fd13269d..25260eee9dd 100644 --- a/dd-smoke-tests/rum/wildfly-15/gradle.lockfile +++ b/dd-smoke-tests/rum/wildfly-15/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -73,6 +77,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/sample-trace/gradle.lockfile b/dd-smoke-tests/sample-trace/gradle.lockfile index 587018c8da8..0c8c2e8d78f 100644 --- a/dd-smoke-tests/sample-trace/gradle.lockfile +++ b/dd-smoke-tests/sample-trace/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -73,6 +77,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/spring-boot-2.3-webmvc-jetty/gradle.lockfile b/dd-smoke-tests/spring-boot-2.3-webmvc-jetty/gradle.lockfile index 6a8654ebbb5..61f39baaca7 100644 --- a/dd-smoke-tests/spring-boot-2.3-webmvc-jetty/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-2.3-webmvc-jetty/gradle.lockfile @@ -36,7 +36,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.14.9=testCompileClasspath,testRuntimeClasspath @@ -110,6 +114,7 @@ org.hamcrest:hamcrest-core:2.2=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/spring-boot-2.4-webflux/gradle.lockfile b/dd-smoke-tests/spring-boot-2.4-webflux/gradle.lockfile index 4dfbb0a476e..336bf5bc6d4 100644 --- a/dd-smoke-tests/spring-boot-2.4-webflux/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-2.4-webflux/gradle.lockfile @@ -36,7 +36,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -101,6 +105,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/spring-boot-2.5-webflux/gradle.lockfile b/dd-smoke-tests/spring-boot-2.5-webflux/gradle.lockfile index 8776dd4e956..6110f5961ea 100644 --- a/dd-smoke-tests/spring-boot-2.5-webflux/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-2.5-webflux/gradle.lockfile @@ -37,7 +37,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -103,6 +107,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/spring-boot-2.6-webflux/gradle.lockfile b/dd-smoke-tests/spring-boot-2.6-webflux/gradle.lockfile index 72174c57afb..10a44e63261 100644 --- a/dd-smoke-tests/spring-boot-2.6-webflux/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-2.6-webflux/gradle.lockfile @@ -39,7 +39,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.h2database:h2:2.1.214=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath @@ -130,6 +134,7 @@ org.jboss.logging:jboss-logging:3.4.2.Final=compileClasspath,runtimeClasspath,te org.jboss:jandex:2.2.3.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/spring-boot-2.6-webmvc/gradle.lockfile b/dd-smoke-tests/spring-boot-2.6-webmvc/gradle.lockfile index 1ebac6665d6..3b199dc3e59 100644 --- a/dd-smoke-tests/spring-boot-2.6-webmvc/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-2.6-webmvc/gradle.lockfile @@ -38,7 +38,11 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.10=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.h2database:h2:2.1.214=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -127,6 +131,7 @@ org.jboss.logging:jboss-logging:3.4.2.Final=compileClasspath,runtimeClasspath,te org.jboss:jandex:2.2.3.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/spring-boot-2.7-webflux/gradle.lockfile b/dd-smoke-tests/spring-boot-2.7-webflux/gradle.lockfile index f28fdf4e3d2..045d1ab0e4e 100644 --- a/dd-smoke-tests/spring-boot-2.7-webflux/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-2.7-webflux/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -73,6 +77,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/spring-boot-3.0-native/gradle.lockfile b/dd-smoke-tests/spring-boot-3.0-native/gradle.lockfile index fa1651516f0..85c1dd2ae6c 100644 --- a/dd-smoke-tests/spring-boot-3.0-native/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-3.0-native/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -73,6 +77,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/spring-boot-3.0-webflux/gradle.lockfile b/dd-smoke-tests/spring-boot-3.0-webflux/gradle.lockfile index 7d6029f955d..8c2b379ce06 100644 --- a/dd-smoke-tests/spring-boot-3.0-webflux/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-3.0-webflux/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -73,6 +77,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/spring-boot-3.0-webmvc/gradle.lockfile b/dd-smoke-tests/spring-boot-3.0-webmvc/gradle.lockfile index 3f4232c6473..cd4d88e5674 100644 --- a/dd-smoke-tests/spring-boot-3.0-webmvc/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-3.0-webmvc/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -73,6 +77,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/spring-boot-3.3-webmvc/gradle.lockfile b/dd-smoke-tests/spring-boot-3.3-webmvc/gradle.lockfile index 6b6d45a6909..fc31de86314 100644 --- a/dd-smoke-tests/spring-boot-3.3-webmvc/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-3.3-webmvc/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -73,6 +77,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/spring-boot-rabbit/gradle.lockfile b/dd-smoke-tests/spring-boot-rabbit/gradle.lockfile index 3587f9c4597..fb8fffa75f7 100644 --- a/dd-smoke-tests/spring-boot-rabbit/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-rabbit/gradle.lockfile @@ -40,7 +40,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.rabbitmq:amqp-client:5.9.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath @@ -94,6 +98,7 @@ org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath org.jetbrains:annotations:17.0.0=testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/spring-security/gradle.lockfile b/dd-smoke-tests/spring-security/gradle.lockfile index c77b67821da..01567b2eff5 100644 --- a/dd-smoke-tests/spring-security/gradle.lockfile +++ b/dd-smoke-tests/spring-security/gradle.lockfile @@ -35,7 +35,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=compileClasspath,runtimeClasspat com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.nimbusds:nimbus-jose-jwt:9.24.4=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -94,6 +98,7 @@ org.hamcrest:hamcrest-core:1.3=runtimeClasspath,testFixturesRuntimeClasspath,tes org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-freemarker/gradle.lockfile b/dd-smoke-tests/springboot-freemarker/gradle.lockfile index c4a9c907ca0..6bca00840fa 100644 --- a/dd-smoke-tests/springboot-freemarker/gradle.lockfile +++ b/dd-smoke-tests/springboot-freemarker/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -79,6 +83,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-grpc/gradle.lockfile b/dd-smoke-tests/springboot-grpc/gradle.lockfile index 9d776d60236..43d027ba034 100644 --- a/dd-smoke-tests/springboot-grpc/gradle.lockfile +++ b/dd-smoke-tests/springboot-grpc/gradle.lockfile @@ -8,7 +8,7 @@ ch.qos.logback:logback-classic:1.1.11=compileClasspath,compileProtoPath,runtimeC ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath ch.qos.logback:logback-core:1.1.11=compileClasspath,runtimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -ch.qos.logback:logback-core:1.5.34=compileProtoPath +ch.qos.logback:logback-core:1.5.37=compileProtoPath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath @@ -55,18 +55,22 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,compileProtoPath,runtimeC com.google.code.gson:gson:2.13.2=spotbugs com.google.code.gson:gson:2.8.6=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.errorprone:error_prone_annotations:2.5.1=compileClasspath,testCompileClasspath -com.google.errorprone:error_prone_annotations:2.9.0=compileProtoPath,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath -com.google.guava:failureaccess:1.0.1=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.google.guava:guava:30.1.1-android=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.5.1=compileClasspath +com.google.errorprone:error_prone_annotations:2.9.0=compileProtoPath,runtimeClasspath +com.google.guava:failureaccess:1.0.1=compileClasspath,compileProtoPath,runtimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.google.guava:guava:30.1.1-android=compileClasspath,compileProtoPath,runtimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.google.http-client:google-http-client-jackson2:1.36.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.google.http-client:google-http-client:1.36.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.google.j2objc:j2objc-annotations:1.3=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:1.3=compileClasspath,compileProtoPath,runtimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.google.protobuf:protobuf-java-util:3.13.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.google.protobuf:protobuf-java:3.18.2=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.google.protobuf:protoc:3.17.3=protobufToolsLocator_protoc -com.google.re2j:re2j:1.7=testCompileProtoPath,testRuntimeClasspath +com.google.re2j:re2j:1.8=testCompileProtoPath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath @@ -142,6 +146,7 @@ org.hibernate:hibernate-validator:5.3.6.Final=compileClasspath,compileProtoPath, org.jboss.logging:jboss-logging:3.3.0.Final=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testCompileProtoPath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=testCompileProtoPath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testCompileProtoPath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-java-11/gradle.lockfile b/dd-smoke-tests/springboot-java-11/gradle.lockfile index 1a5bb7a663b..69332dd5141 100644 --- a/dd-smoke-tests/springboot-java-11/gradle.lockfile +++ b/dd-smoke-tests/springboot-java-11/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -79,6 +83,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-java-17/gradle.lockfile b/dd-smoke-tests/springboot-java-17/gradle.lockfile index 36d1b30d325..423f5b24ad3 100644 --- a/dd-smoke-tests/springboot-java-17/gradle.lockfile +++ b/dd-smoke-tests/springboot-java-17/gradle.lockfile @@ -29,7 +29,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -80,6 +84,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-jetty-jsp/gradle.lockfile b/dd-smoke-tests/springboot-jetty-jsp/gradle.lockfile index 6d72d72eb9a..1b719c266e4 100644 --- a/dd-smoke-tests/springboot-jetty-jsp/gradle.lockfile +++ b/dd-smoke-tests/springboot-jetty-jsp/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -79,6 +83,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-jpa/gradle.lockfile b/dd-smoke-tests/springboot-jpa/gradle.lockfile index 53f5ba632dd..2c1855504fe 100644 --- a/dd-smoke-tests/springboot-jpa/gradle.lockfile +++ b/dd-smoke-tests/springboot-jpa/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -73,6 +77,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-mongo/gradle.lockfile b/dd-smoke-tests/springboot-mongo/gradle.lockfile index 6ca1d9cd1c9..5343dfbd267 100644 --- a/dd-smoke-tests/springboot-mongo/gradle.lockfile +++ b/dd-smoke-tests/springboot-mongo/gradle.lockfile @@ -39,7 +39,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -92,6 +96,7 @@ org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath org.jetbrains:annotations:17.0.0=testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-openliberty-20/gradle.lockfile b/dd-smoke-tests/springboot-openliberty-20/gradle.lockfile index fc24a5a83e0..393bed44933 100644 --- a/dd-smoke-tests/springboot-openliberty-20/gradle.lockfile +++ b/dd-smoke-tests/springboot-openliberty-20/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -73,6 +77,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-openliberty-23/gradle.lockfile b/dd-smoke-tests/springboot-openliberty-23/gradle.lockfile index 533b24e734c..7936c5e67f3 100644 --- a/dd-smoke-tests/springboot-openliberty-23/gradle.lockfile +++ b/dd-smoke-tests/springboot-openliberty-23/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -73,6 +77,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-thymeleaf/gradle.lockfile b/dd-smoke-tests/springboot-thymeleaf/gradle.lockfile index a270ce5bed1..5eac2971958 100644 --- a/dd-smoke-tests/springboot-thymeleaf/gradle.lockfile +++ b/dd-smoke-tests/springboot-thymeleaf/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -79,6 +83,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-tomcat-jsp/gradle.lockfile b/dd-smoke-tests/springboot-tomcat-jsp/gradle.lockfile index ca2d6ff0dee..503b945e2ee 100644 --- a/dd-smoke-tests/springboot-tomcat-jsp/gradle.lockfile +++ b/dd-smoke-tests/springboot-tomcat-jsp/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -79,6 +83,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-tomcat/gradle.lockfile b/dd-smoke-tests/springboot-tomcat/gradle.lockfile index 9d3f20af65c..0e0e810ce7a 100644 --- a/dd-smoke-tests/springboot-tomcat/gradle.lockfile +++ b/dd-smoke-tests/springboot-tomcat/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -73,6 +77,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-velocity/gradle.lockfile b/dd-smoke-tests/springboot-velocity/gradle.lockfile index c7fc0f3645d..ab43ece584d 100644 --- a/dd-smoke-tests/springboot-velocity/gradle.lockfile +++ b/dd-smoke-tests/springboot-velocity/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -79,6 +83,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot/gradle.lockfile b/dd-smoke-tests/springboot/gradle.lockfile index 3fd8bf2440f..93a25fee355 100644 --- a/dd-smoke-tests/springboot/gradle.lockfile +++ b/dd-smoke-tests/springboot/gradle.lockfile @@ -35,16 +35,15 @@ com.github.jnr:jnr-x86asm:1.0.2=runtimeClasspath,testFixturesRuntimeClasspath,te com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.10=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs -com.google.errorprone:error_prone_annotations:2.3.4=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:failureaccess:1.0.1=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.google.guava:guava:20.0=compileClasspath,testCompileClasspath -com.google.guava:guava:30.0-jre=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.google.j2objc:j2objc-annotations:1.3=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.nimbusds:nimbus-jose-jwt:9.22=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -97,7 +96,6 @@ org.apache.tomcat.embed:tomcat-embed-el:8.5.35=compileClasspath,runtimeClasspath org.apache.tomcat.embed:tomcat-embed-websocket:8.5.35=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.apache.tomcat:tomcat-annotations-api:8.5.35=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath -org.checkerframework:checker-qual:3.5.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.codehaus.groovy:groovy-ant:3.0.23=codenarc org.codehaus.groovy:groovy-docgenerator:3.0.23=codenarc org.codehaus.groovy:groovy-groovydoc:3.0.23=codenarc @@ -116,6 +114,7 @@ org.hibernate:hibernate-validator:5.3.6.Final=compileClasspath,runtimeClasspath, org.jboss.logging:jboss-logging:3.3.0.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/tracer-flare/gradle.lockfile b/dd-smoke-tests/tracer-flare/gradle.lockfile index 11f148e5f29..5d4158de23e 100644 --- a/dd-smoke-tests/tracer-flare/gradle.lockfile +++ b/dd-smoke-tests/tracer-flare/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -73,6 +77,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/vertx-3.4/gradle.lockfile b/dd-smoke-tests/vertx-3.4/gradle.lockfile index 29e145f485e..4cea6ef92cf 100644 --- a/dd-smoke-tests/vertx-3.4/gradle.lockfile +++ b/dd-smoke-tests/vertx-3.4/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -78,6 +82,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/vertx-3.9-resteasy/gradle.lockfile b/dd-smoke-tests/vertx-3.9-resteasy/gradle.lockfile index ebf26fac017..87bb8d410b5 100644 --- a/dd-smoke-tests/vertx-3.9-resteasy/gradle.lockfile +++ b/dd-smoke-tests/vertx-3.9-resteasy/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -73,6 +77,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/vertx-3.9/gradle.lockfile b/dd-smoke-tests/vertx-3.9/gradle.lockfile index 2fc08a8aaf0..38583df1e8f 100644 --- a/dd-smoke-tests/vertx-3.9/gradle.lockfile +++ b/dd-smoke-tests/vertx-3.9/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -79,6 +83,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/vertx-4.2/gradle.lockfile b/dd-smoke-tests/vertx-4.2/gradle.lockfile index dadc238c0ff..43ec5b8e1aa 100644 --- a/dd-smoke-tests/vertx-4.2/gradle.lockfile +++ b/dd-smoke-tests/vertx-4.2/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -78,6 +82,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/websphere-jmx/gradle.lockfile b/dd-smoke-tests/websphere-jmx/gradle.lockfile index 837dc64e3bd..e7a274af664 100644 --- a/dd-smoke-tests/websphere-jmx/gradle.lockfile +++ b/dd-smoke-tests/websphere-jmx/gradle.lockfile @@ -32,7 +32,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -79,6 +83,7 @@ org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath org.jetbrains:annotations:17.0.0=testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/wildfly/gradle.lockfile b/dd-smoke-tests/wildfly/gradle.lockfile index 65270fc647a..3098cc68416 100644 --- a/dd-smoke-tests/wildfly/gradle.lockfile +++ b/dd-smoke-tests/wildfly/gradle.lockfile @@ -28,7 +28,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.8=testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath @@ -73,6 +77,7 @@ org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath org.jctools:jctools-core:4.0.6=testRuntimeClasspath +org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath From 6e2b8f5fab57199e9a5756a63dbfd7154008939c Mon Sep 17 00:00:00 2001 From: Stuart McCulloch Date: Mon, 29 Jun 2026 23:19:14 +0100 Subject: [PATCH 079/139] Extend WellKnownTagsTest coverage and migrate it to Java (#11790) Extend WellKnownTagsTest coverage and migrate it to Java Co-authored-by: devflow.devflow-routing-intake --- .../trace/api/WellKnownTagsTest.groovy | 19 ----------- .../datadog/trace/api/WellKnownTagsTest.java | 32 +++++++++++++++++++ 2 files changed, 32 insertions(+), 19 deletions(-) delete mode 100644 internal-api/src/test/groovy/datadog/trace/api/WellKnownTagsTest.groovy create mode 100644 internal-api/src/test/java/datadog/trace/api/WellKnownTagsTest.java diff --git a/internal-api/src/test/groovy/datadog/trace/api/WellKnownTagsTest.groovy b/internal-api/src/test/groovy/datadog/trace/api/WellKnownTagsTest.groovy deleted file mode 100644 index 6474142bced..00000000000 --- a/internal-api/src/test/groovy/datadog/trace/api/WellKnownTagsTest.groovy +++ /dev/null @@ -1,19 +0,0 @@ -package datadog.trace.api - -import datadog.trace.test.util.DDSpecification - -class WellKnownTagsTest extends DDSpecification { - - def "well known tags doesn't modify its inputs"() { - given: - WellKnownTags wellKnownTags = - new WellKnownTags("runtimeid", "hostname", "env", "service", "version","language") - expect: - wellKnownTags.getRuntimeId() as String == "runtimeid" - wellKnownTags.getHostname() as String == "hostname" - wellKnownTags.getEnv() as String == "env" - wellKnownTags.getService() as String == "service" - wellKnownTags.getVersion() as String == "version" - wellKnownTags.getLanguage() as String == "language" - } -} diff --git a/internal-api/src/test/java/datadog/trace/api/WellKnownTagsTest.java b/internal-api/src/test/java/datadog/trace/api/WellKnownTagsTest.java new file mode 100644 index 00000000000..f164ab7006d --- /dev/null +++ b/internal-api/src/test/java/datadog/trace/api/WellKnownTagsTest.java @@ -0,0 +1,32 @@ +package datadog.trace.api; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; + +class WellKnownTagsTest { + + @Test + void wellKnownTagsDoesNotModifyInputs() { + WellKnownTags wellKnownTags = + new WellKnownTags("runtimeid", "hostname", "env", "service", "version", "language"); + + assertEquals("runtimeid", wellKnownTags.getRuntimeId().toString()); + assertEquals("hostname", wellKnownTags.getHostname().toString()); + assertEquals("env", wellKnownTags.getEnv().toString()); + assertEquals("service", wellKnownTags.getService().toString()); + assertEquals("version", wellKnownTags.getVersion().toString()); + assertEquals("language", wellKnownTags.getLanguage().toString()); + } + + @Test + void toStringIncludesAllFields() { + WellKnownTags wellKnownTags = + new WellKnownTags("runtimeid", "hostname", "env", "service", "version", "language"); + + assertEquals( + "WellKnownTags{runtimeId=runtimeid, hostname=hostname, env=env," + + " service=service, version=version, language=language}", + wellKnownTags.toString()); + } +} From 8d8ce8d8b634a3b9b6210bd80b9925a879412040 Mon Sep 17 00:00:00 2001 From: Stuart McCulloch Date: Mon, 29 Jun 2026 23:48:46 +0100 Subject: [PATCH 080/139] Extend W3CTraceParentTest coverage and migrate it to Java (#11791) Extend W3CTraceParentTest coverage and migrate it to Java Co-authored-by: devflow.devflow-routing-intake --- .../api/propagation/W3CTraceParentTest.groovy | 32 ------- .../api/propagation/W3CTraceParentTest.java | 91 +++++++++++++++++++ 2 files changed, 91 insertions(+), 32 deletions(-) delete mode 100644 internal-api/src/test/groovy/datadog/trace/api/propagation/W3CTraceParentTest.groovy create mode 100644 internal-api/src/test/java/datadog/trace/api/propagation/W3CTraceParentTest.java diff --git a/internal-api/src/test/groovy/datadog/trace/api/propagation/W3CTraceParentTest.groovy b/internal-api/src/test/groovy/datadog/trace/api/propagation/W3CTraceParentTest.groovy deleted file mode 100644 index 739354dc27f..00000000000 --- a/internal-api/src/test/groovy/datadog/trace/api/propagation/W3CTraceParentTest.groovy +++ /dev/null @@ -1,32 +0,0 @@ -package datadog.trace.api.propagation - -import datadog.trace.api.DDTraceId -import datadog.trace.test.util.DDSpecification - -class W3CTraceParentTest extends DDSpecification { - - def "build produces correct format with isSampled=#isSampled"() { - when: - def result = W3CTraceParent.from(traceId, spanId, isSampled) - - then: - result == expected - - where: - traceId | spanId | isSampled | expected - DDTraceId.from(1) | 2 | true | "00-00000000000000000000000000000001-0000000000000002-01" - DDTraceId.from(1) | 2 | false | "00-00000000000000000000000000000001-0000000000000002-00" - DDTraceId.from(1) | 2 | true | "00-00000000000000000000000000000001-0000000000000002-01" - DDTraceId.fromHex("0af7651916cd43dd8448eb211c80319c") | 0x00f067aa0ba902b7L | true | "00-0af7651916cd43dd8448eb211c80319c-00f067aa0ba902b7-01" - DDTraceId.from(Long.MAX_VALUE) | Long.MAX_VALUE | true | "00-00000000000000007fffffffffffffff-7fffffffffffffff-01" - } - - def "build matches W3C traceparent format"() { - when: - def result = W3CTraceParent.from(DDTraceId.from(123456789L), 987654321L, true) - - then: - // W3C format: version-traceId(32 hex)-spanId(16 hex)-flags(2 hex) - result ==~ /00-[0-9a-f]{32}-[0-9a-f]{16}-(00|01)/ - } -} diff --git a/internal-api/src/test/java/datadog/trace/api/propagation/W3CTraceParentTest.java b/internal-api/src/test/java/datadog/trace/api/propagation/W3CTraceParentTest.java new file mode 100644 index 00000000000..6a600cc9244 --- /dev/null +++ b/internal-api/src/test/java/datadog/trace/api/propagation/W3CTraceParentTest.java @@ -0,0 +1,91 @@ +package datadog.trace.api.propagation; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.params.provider.Arguments.arguments; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import datadog.trace.api.DDTraceId; +import datadog.trace.bootstrap.instrumentation.api.AgentSpan; +import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext; +import java.util.stream.Stream; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + +public class W3CTraceParentTest { + + @ParameterizedTest(name = "{0}") + @MethodSource("buildProducesCorrectFormatArguments") + void buildProducesCorrectFormat( + String scenario, DDTraceId traceId, long spanId, boolean isSampled, String expected) { + assertEquals(expected, W3CTraceParent.from(traceId, spanId, isSampled)); + } + + static Stream buildProducesCorrectFormatArguments() { + return Stream.of( + arguments( + "sampled", + DDTraceId.from(1), + 2L, + true, + "00-00000000000000000000000000000001-0000000000000002-01"), + arguments( + "not sampled", + DDTraceId.from(1), + 2L, + false, + "00-00000000000000000000000000000001-0000000000000002-00"), + arguments( + "W3C example", + DDTraceId.fromHex("0af7651916cd43dd8448eb211c80319c"), + 0x00f067aa0ba902b7L, + true, + "00-0af7651916cd43dd8448eb211c80319c-00f067aa0ba902b7-01"), + arguments( + "Long.MAX_VALUE ids", + DDTraceId.from(Long.MAX_VALUE), + Long.MAX_VALUE, + true, + "00-00000000000000007fffffffffffffff-7fffffffffffffff-01")); + } + + @Test + void buildMatchesW3CTraceparentFormat() { + // W3C format: version-traceId(32 hex)-spanId(16 hex)-flags(2 hex) + String result = W3CTraceParent.from(DDTraceId.from(123456789L), 987654321L, true); + assertTrue(result.matches("00-[0-9a-f]{32}-[0-9a-f]{16}-(00|01)")); + } + + @Test + void buildFromSpanSampled() { + AgentSpan span = mock(AgentSpan.class); + AgentSpanContext context = mock(AgentSpanContext.class); + DDTraceId traceId = DDTraceId.fromHex("0af7651916cd43dd8448eb211c80319c"); + long spanId = 0x00f067aa0ba902b7L; + + when(span.getTraceId()).thenReturn(traceId); + when(span.getSpanId()).thenReturn(spanId); + when(span.spanContext()).thenReturn(context); + when(context.getSamplingPriority()).thenReturn(1); + + assertEquals( + "00-0af7651916cd43dd8448eb211c80319c-00f067aa0ba902b7-01", W3CTraceParent.from(span)); + } + + @Test + void buildFromSpanNotSampled() { + AgentSpan span = mock(AgentSpan.class); + AgentSpanContext context = mock(AgentSpanContext.class); + + when(span.getTraceId()).thenReturn(DDTraceId.from(1)); + when(span.getSpanId()).thenReturn(2L); + when(span.spanContext()).thenReturn(context); + when(context.getSamplingPriority()).thenReturn(0); + + assertEquals( + "00-00000000000000000000000000000001-0000000000000002-00", W3CTraceParent.from(span)); + } +} From 750f363785b6756be2c4ae33ac4f6d8f555ec4a0 Mon Sep 17 00:00:00 2001 From: Stuart McCulloch Date: Tue, 30 Jun 2026 01:48:20 +0100 Subject: [PATCH 081/139] Add LLMObsContextTest (#11792) Add LLMObsContextTest Co-authored-by: devflow.devflow-routing-intake --- .../trace/api/llmobs/LLMObsContextTest.java | 102 ++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 internal-api/src/test/java/datadog/trace/api/llmobs/LLMObsContextTest.java diff --git a/internal-api/src/test/java/datadog/trace/api/llmobs/LLMObsContextTest.java b/internal-api/src/test/java/datadog/trace/api/llmobs/LLMObsContextTest.java new file mode 100644 index 00000000000..8ca9c5e035e --- /dev/null +++ b/internal-api/src/test/java/datadog/trace/api/llmobs/LLMObsContextTest.java @@ -0,0 +1,102 @@ +package datadog.trace.api.llmobs; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.mockito.Mockito.mock; + +import datadog.context.ContextScope; +import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext; +import org.junit.jupiter.api.Test; + +class LLMObsContextTest { + @Test + void rootSpanIdIsUndefined() { + assertEquals("undefined", LLMObsContext.ROOT_SPAN_ID); + } + + @Test + void currentReturnsNullWhenNoContextAttached() { + assertNull(LLMObsContext.current()); + } + + @Test + void currentSessionIdReturnsNullWhenNoContextAttached() { + assertNull(LLMObsContext.currentSessionId()); + } + + @Test + void attachStoresSpanContext() { + AgentSpanContext ctx = mock(AgentSpanContext.class); + try (ContextScope scope = LLMObsContext.attach(ctx)) { + assertEquals(ctx, LLMObsContext.current()); + } + assertNull(LLMObsContext.current()); + } + + @Test + void attachWithoutSessionIdLeavesSessionIdNull() { + AgentSpanContext ctx = mock(AgentSpanContext.class); + try (ContextScope scope = LLMObsContext.attach(ctx)) { + assertNull(LLMObsContext.currentSessionId()); + } + } + + @Test + void attachWithSessionIdStoresBothContextAndSessionId() { + AgentSpanContext ctx = mock(AgentSpanContext.class); + try (ContextScope scope = LLMObsContext.attach(ctx, "session-123")) { + assertEquals(ctx, LLMObsContext.current()); + assertEquals("session-123", LLMObsContext.currentSessionId()); + } + assertNull(LLMObsContext.current()); + assertNull(LLMObsContext.currentSessionId()); + } + + @Test + void attachWithNullSessionIdIgnoresSessionId() { + AgentSpanContext ctx = mock(AgentSpanContext.class); + try (ContextScope scope = LLMObsContext.attach(ctx, null)) { + assertEquals(ctx, LLMObsContext.current()); + assertNull(LLMObsContext.currentSessionId()); + } + } + + @Test + void attachWithEmptySessionIdIgnoresSessionId() { + AgentSpanContext ctx = mock(AgentSpanContext.class); + try (ContextScope scope = LLMObsContext.attach(ctx, "")) { + assertEquals(ctx, LLMObsContext.current()); + assertNull(LLMObsContext.currentSessionId()); + } + } + + @Test + void nestedScopesRestoreParentContextOnClose() { + AgentSpanContext outer = mock(AgentSpanContext.class); + AgentSpanContext inner = mock(AgentSpanContext.class); + try (ContextScope outerScope = LLMObsContext.attach(outer, "outer-session")) { + assertEquals(outer, LLMObsContext.current()); + assertEquals("outer-session", LLMObsContext.currentSessionId()); + try (ContextScope innerScope = LLMObsContext.attach(inner, "inner-session")) { + assertEquals(inner, LLMObsContext.current()); + assertEquals("inner-session", LLMObsContext.currentSessionId()); + } + assertEquals(outer, LLMObsContext.current()); + assertEquals("outer-session", LLMObsContext.currentSessionId()); + } + assertNull(LLMObsContext.current()); + assertNull(LLMObsContext.currentSessionId()); + } + + @Test + void childScopeInheritsParentSessionId() { + AgentSpanContext parent = mock(AgentSpanContext.class); + AgentSpanContext child = mock(AgentSpanContext.class); + try (ContextScope parentScope = LLMObsContext.attach(parent, "inherited-session")) { + try (ContextScope childScope = LLMObsContext.attach(child)) { + assertEquals(child, LLMObsContext.current()); + assertEquals("inherited-session", LLMObsContext.currentSessionId()); + } + } + } +} From bc90096c02f7527682250f3fa4084060283a6e28 Mon Sep 17 00:00:00 2001 From: Andrea Marziali Date: Tue, 30 Jun 2026 09:03:41 +0200 Subject: [PATCH 082/139] Add coverage and exclusions for dsm classes (#11775) --- dd-trace-core/build.gradle | 6 ++ .../DataStreamsTransactionExtractorsTest.java | 64 +++++++++++++++++++ internal-api/build.gradle.kts | 2 + 3 files changed, 72 insertions(+) diff --git a/dd-trace-core/build.gradle b/dd-trace-core/build.gradle index 0da1ae17470..4343576e181 100644 --- a/dd-trace-core/build.gradle +++ b/dd-trace-core/build.gradle @@ -51,6 +51,12 @@ excludedClassesCoverage += [ 'datadog.trace.core.TracingConfigPoller.Updater', // covered with dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/CheckpointerTest.groovy 'datadog.trace.core.datastreams.DefaultDataStreamsMonitoring', + // no-op + 'datadog.trace.core.datastreams.DisabledDataStreamsMonitoring', + // pojo + 'datadog.trace.core.datastreams.DataStreamsTransactionExtractors.DataStreamsTransactionExtractorImpl', + // it's a private inner class. Tested indirectly via deserialize in DataStreamsTransactionExtractorsTest + 'datadog.trace.core.datastreams.DataStreamsTransactionExtractors.JsonDataStreamsTransactionExtractor', // TODO CorePropagation will be removed during context refactoring 'datadog.trace.core.propagation.CorePropagation', // TODO DSM propagator will be tested once fully migrated diff --git a/dd-trace-core/src/test/java/datadog/trace/core/datastreams/DataStreamsTransactionExtractorsTest.java b/dd-trace-core/src/test/java/datadog/trace/core/datastreams/DataStreamsTransactionExtractorsTest.java index 7565f19afee..51205505225 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/datastreams/DataStreamsTransactionExtractorsTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/datastreams/DataStreamsTransactionExtractorsTest.java @@ -2,7 +2,11 @@ import static datadog.trace.api.datastreams.DataStreamsTransactionExtractor.Type.HTTP_IN_HEADERS; import static datadog.trace.api.datastreams.DataStreamsTransactionExtractor.Type.HTTP_OUT_HEADERS; +import static datadog.trace.api.datastreams.DataStreamsTransactionExtractor.Type.KAFKA_CONSUME_HEADERS; +import static datadog.trace.api.datastreams.DataStreamsTransactionExtractor.Type.KAFKA_PRODUCE_HEADERS; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; import datadog.trace.api.datastreams.DataStreamsTransactionExtractor; import datadog.trace.core.DDCoreJavaSpecification; @@ -28,4 +32,64 @@ void deserializeFromJson() { assertEquals(HTTP_IN_HEADERS, extractors.get(1).getType()); assertEquals("transaction_id", extractors.get(1).getValue()); } + + @Test + void deserializeKafkaTypes() { + DataStreamsTransactionExtractors list = + DataStreamsTransactionExtractors.deserialize( + "[" + + "{\"name\": \"consume\", \"type\": \"KAFKA_CONSUME_HEADERS\", \"value\": \"txn\"}," + + "{\"name\": \"produce\", \"type\": \"KAFKA_PRODUCE_HEADERS\", \"value\": \"txn\"}" + + "]"); + List extractors = list.getExtractors(); + + assertEquals(2, extractors.size()); + assertEquals(KAFKA_CONSUME_HEADERS, extractors.get(0).getType()); + assertEquals(KAFKA_PRODUCE_HEADERS, extractors.get(1).getType()); + } + + @Test + void deserializeUnknownTypeReturnsEmpty() { + DataStreamsTransactionExtractors list = + DataStreamsTransactionExtractors.deserialize( + "[{\"name\": \"ext\", \"type\": \"NOT_A_REAL_TYPE\", \"value\": \"v\"}]"); + + assertSame(DataStreamsTransactionExtractors.EMPTY, list); + assertTrue(list.getExtractors().isEmpty()); + } + + @Test + void deserializeEmptyArrayReturnsEmptyList() { + DataStreamsTransactionExtractors list = DataStreamsTransactionExtractors.deserialize("[]"); + + assertTrue(list.getExtractors().isEmpty()); + } + + @Test + void deserializeInvalidJsonReturnsEmpty() { + DataStreamsTransactionExtractors list = + DataStreamsTransactionExtractors.deserialize("not valid json"); + + assertSame(DataStreamsTransactionExtractors.EMPTY, list); + assertTrue(list.getExtractors().isEmpty()); + } + + @Test + void deserializeNullJsonReturnsEmpty() { + DataStreamsTransactionExtractors list = DataStreamsTransactionExtractors.deserialize("null"); + + assertTrue(list.getExtractors().isEmpty()); + } + + @Test + void implToStringContainsFields() { + DataStreamsTransactionExtractors list = + DataStreamsTransactionExtractors.deserialize( + "[{\"name\": \"myext\", \"type\": \"HTTP_OUT_HEADERS\", \"value\": \"myval\"}]"); + String str = list.getExtractors().get(0).toString(); + + assertTrue(str.contains("myext")); + assertTrue(str.contains("HTTP_OUT_HEADERS")); + assertTrue(str.contains("myval")); + } } diff --git a/internal-api/build.gradle.kts b/internal-api/build.gradle.kts index 6bce24ae27c..5eb3891a126 100644 --- a/internal-api/build.gradle.kts +++ b/internal-api/build.gradle.kts @@ -66,7 +66,9 @@ extra["excludedClassesCoverage"] = listOf( "datadog.trace.api.profiling.RecordingType", // Data Streams Monitoring "datadog.trace.api.datastreams.Backlog", + "datadog.trace.api.datastreams.DataStreamsTransactionExtractor.Type", // enum "datadog.trace.api.datastreams.InboxItem", + "datadog.trace.api.datastreams.KafkaConfigReport", // pojo "datadog.trace.api.datastreams.NoopDataStreamsMonitoring", "datadog.trace.api.datastreams.NoopPathwayContext", "datadog.trace.api.datastreams.SchemaRegistryUsage", From 1648e0d7f63d1d7abbed94496c004349a0eaca4b Mon Sep 17 00:00:00 2001 From: Sameeran Kunche Date: Tue, 30 Jun 2026 02:40:28 -0700 Subject: [PATCH 083/139] Use agent OTel metrics for OpenFeature evaluations (#11745) Use agent OTel metrics for OpenFeature evaluations Co-authored-by: devflow.devflow-routing-intake --- .../feature-flagging-api/README.md | 38 +++++--- .../feature-flagging-api/build.gradle.kts | 6 -- .../feature-flagging-api/gradle.lockfile | 21 +---- .../api/openfeature/FlagEvalMetrics.java | 92 ++----------------- .../trace/api/openfeature/Provider.java | 5 +- .../api/openfeature/FlagEvalMetricsTest.java | 40 +------- 6 files changed, 36 insertions(+), 166 deletions(-) diff --git a/products/feature-flagging/feature-flagging-api/README.md b/products/feature-flagging/feature-flagging-api/README.md index 5d1beece1ca..47733020559 100644 --- a/products/feature-flagging/feature-flagging-api/README.md +++ b/products/feature-flagging/feature-flagging-api/README.md @@ -18,22 +18,27 @@ The OpenFeature SDK (`dev.openfeature:sdk`) is included as a transitive dependen ### Evaluation metrics (optional) -To enable evaluation metrics (`feature_flag.evaluations` counter), add the OpenTelemetry SDK dependencies: +To enable evaluation metrics (`feature_flag.evaluations` counter), enable the Datadog Java agent's +OpenTelemetry metrics pipeline: + +```shell +DD_METRICS_OTEL_ENABLED=true +``` + +The provider records metrics through the OpenTelemetry Metrics API. Add `opentelemetry-api` if your +application does not already use the OpenTelemetry API for custom metrics: ```xml io.opentelemetry - opentelemetry-sdk-metrics - 1.47.0 - - - io.opentelemetry - opentelemetry-exporter-otlp + opentelemetry-api 1.47.0 ``` -Any OpenTelemetry API 1.x version is compatible. If these dependencies are absent, the provider operates normally without metrics. +The OpenTelemetry SDK and OTLP exporter are not required on the application classpath. The Datadog +Java agent collects the API metric and exports it through the same OTLP pipeline as other custom OTel +metrics. ## Usage @@ -52,15 +57,20 @@ boolean enabled = client.getBooleanValue("my-feature", false, ## Evaluation metrics -When the OTel SDK dependencies are on the classpath, the provider records a `feature_flag.evaluations` counter via OTLP HTTP/protobuf. Metrics are exported every 10 seconds to the Datadog Agent's OTLP receiver. +When `DD_METRICS_OTEL_ENABLED=true` and the OpenTelemetry API is on the classpath, the provider +records a `feature_flag.evaluations` counter. The Datadog Java agent exports it to the Datadog +Agent's OTLP receiver using the configured OpenTelemetry metrics export interval. ### Configuration -| Environment variable | Description | Default | -|---|---|---| -| `OTEL_EXPORTER_OTLP_METRICS_ENDPOINT` | Signal-specific OTLP endpoint (used as-is) | — | -| `OTEL_EXPORTER_OTLP_ENDPOINT` | Generic OTLP endpoint (`/v1/metrics` appended) | — | -| (none set) | Default endpoint | `http://localhost:4318/v1/metrics` | +Configure the OTLP endpoint and protocol using the standard Datadog Java agent OpenTelemetry metrics +settings. For example, to export metrics over OTLP/gRPC: + +```shell +DD_METRICS_OTEL_ENABLED=true +OTEL_EXPORTER_OTLP_ENDPOINT=http://:4317 +OTEL_EXPORTER_OTLP_PROTOCOL=grpc +``` ### Metric attributes diff --git a/products/feature-flagging/feature-flagging-api/build.gradle.kts b/products/feature-flagging/feature-flagging-api/build.gradle.kts index 1c368d51b51..def6a16da8c 100644 --- a/products/feature-flagging/feature-flagging-api/build.gradle.kts +++ b/products/feature-flagging/feature-flagging-api/build.gradle.kts @@ -44,19 +44,13 @@ dependencies { api("dev.openfeature:sdk:1.20.1") compileOnly(project(":products:feature-flagging:feature-flagging-bootstrap")) - compileOnly(project(":utils:config-utils")) compileOnly("io.opentelemetry:opentelemetry-api:1.47.0") - compileOnly("io.opentelemetry:opentelemetry-sdk-metrics:1.47.0") - compileOnly("io.opentelemetry:opentelemetry-exporter-otlp:1.47.0") testImplementation(project(":products:feature-flagging:feature-flagging-bootstrap")) testImplementation("io.opentelemetry:opentelemetry-api:1.47.0") - testImplementation("io.opentelemetry:opentelemetry-sdk-metrics:1.47.0") - testImplementation("io.opentelemetry:opentelemetry-exporter-otlp:1.47.0") testImplementation(libs.bundles.junit5) testImplementation(libs.bundles.mockito) testImplementation(libs.moshi) - testImplementation("io.opentelemetry:opentelemetry-sdk-testing:1.47.0") testImplementation("org.awaitility:awaitility:4.3.0") } diff --git a/products/feature-flagging/feature-flagging-api/gradle.lockfile b/products/feature-flagging/feature-flagging-api/gradle.lockfile index f3661e92730..31b9288e03a 100644 --- a/products/feature-flagging/feature-flagging-api/gradle.lockfile +++ b/products/feature-flagging/feature-flagging-api/gradle.lockfile @@ -12,10 +12,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClass com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath -com.squareup.okhttp3:okhttp:4.12.0=testRuntimeClasspath -com.squareup.okio:okio-jvm:3.6.0=testRuntimeClasspath -com.squareup.okio:okio:1.17.5=testCompileClasspath -com.squareup.okio:okio:3.6.0=testRuntimeClasspath +com.squareup.okio:okio:1.17.5=testCompileClasspath,testRuntimeClasspath com.thoughtworks.qdox:qdox:1.12.1=codenarc commons-io:commons-io:2.20.0=spotbugs de.thetaphi:forbiddenapis:3.10=compileClasspath @@ -23,17 +20,6 @@ dev.openfeature:sdk:1.20.1=compileClasspath,runtimeClasspath,testCompileClasspat io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath io.opentelemetry:opentelemetry-api:1.47.0=compileClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-context:1.47.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.opentelemetry:opentelemetry-exporter-common:1.47.0=testRuntimeClasspath -io.opentelemetry:opentelemetry-exporter-otlp-common:1.47.0=testRuntimeClasspath -io.opentelemetry:opentelemetry-exporter-otlp:1.47.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.opentelemetry:opentelemetry-exporter-sender-okhttp:1.47.0=testRuntimeClasspath -io.opentelemetry:opentelemetry-sdk-common:1.47.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.47.0=testRuntimeClasspath -io.opentelemetry:opentelemetry-sdk-logs:1.47.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.opentelemetry:opentelemetry-sdk-metrics:1.47.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.opentelemetry:opentelemetry-sdk-testing:1.47.0=testCompileClasspath,testRuntimeClasspath -io.opentelemetry:opentelemetry-sdk-trace:1.47.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.opentelemetry:opentelemetry-sdk:1.47.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.0=spotbugs net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath @@ -64,11 +50,6 @@ org.jacoco:org.jacoco.agent:0.8.14=jacocoAgent,jacocoAnt org.jacoco:org.jacoco.ant:0.8.14=jacocoAnt org.jacoco:org.jacoco.core:0.8.14=jacocoAnt org.jacoco:org.jacoco.report:0.8.14=jacocoAnt -org.jetbrains.kotlin:kotlin-stdlib-common:1.9.10=testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10=testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10=testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib:1.9.10=testRuntimeClasspath -org.jetbrains:annotations:13.0=testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath diff --git a/products/feature-flagging/feature-flagging-api/src/main/java/datadog/trace/api/openfeature/FlagEvalMetrics.java b/products/feature-flagging/feature-flagging-api/src/main/java/datadog/trace/api/openfeature/FlagEvalMetrics.java index bcb5898f988..eba3b7ba4b5 100644 --- a/products/feature-flagging/feature-flagging-api/src/main/java/datadog/trace/api/openfeature/FlagEvalMetrics.java +++ b/products/feature-flagging/feature-flagging-api/src/main/java/datadog/trace/api/openfeature/FlagEvalMetrics.java @@ -1,19 +1,13 @@ package datadog.trace.api.openfeature; -import datadog.trace.config.inversion.ConfigHelper; import dev.openfeature.sdk.ErrorCode; +import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.api.metrics.LongCounter; import io.opentelemetry.api.metrics.Meter; -import io.opentelemetry.exporter.otlp.http.metrics.OtlpHttpMetricExporter; -import io.opentelemetry.sdk.metrics.SdkMeterProvider; -import io.opentelemetry.sdk.metrics.export.AggregationTemporalitySelector; -import io.opentelemetry.sdk.metrics.export.PeriodicMetricReader; -import io.opentelemetry.sdk.resources.Resource; import java.io.Closeable; -import java.time.Duration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -25,17 +19,6 @@ class FlagEvalMetrics implements Closeable { private static final String METRIC_NAME = "feature_flag.evaluations"; private static final String METRIC_UNIT = "{evaluation}"; private static final String METRIC_DESC = "Number of feature flag evaluations"; - private static final Duration EXPORT_INTERVAL = Duration.ofSeconds(10); - - private static final String DEFAULT_ENDPOINT = "http://localhost:4318/v1/metrics"; - // Signal-specific env var (used as-is, must include /v1/metrics path) - private static final String ENDPOINT_ENV = "OTEL_EXPORTER_OTLP_METRICS_ENDPOINT"; - // Generic env var fallback (base URL, /v1/metrics is appended) - private static final String ENDPOINT_GENERIC_ENV = "OTEL_EXPORTER_OTLP_ENDPOINT"; - // OTel standard env vars for service name - private static final String SERVICE_NAME_ENV = "OTEL_SERVICE_NAME"; - private static final AttributeKey SERVICE_NAME_KEY = - AttributeKey.stringKey("service.name"); private static final AttributeKey ATTR_FLAG_KEY = AttributeKey.stringKey("feature_flag.key"); @@ -48,40 +31,10 @@ class FlagEvalMetrics implements Closeable { AttributeKey.stringKey("feature_flag.result.allocation_key"); private volatile LongCounter counter; - // Typed as Closeable to avoid loading SdkMeterProvider at class-load time - // when the OTel SDK is absent from the classpath - private volatile Closeable meterProvider; FlagEvalMetrics() { try { - String endpoint = ConfigHelper.env(ENDPOINT_ENV); - if (endpoint == null || endpoint.isEmpty()) { - String base = ConfigHelper.env(ENDPOINT_GENERIC_ENV); - if (base != null && !base.isEmpty()) { - endpoint = base.endsWith("/") ? base + "v1/metrics" : base + "/v1/metrics"; - } else { - endpoint = DEFAULT_ENDPOINT; - } - } - - OtlpHttpMetricExporter exporter = - OtlpHttpMetricExporter.builder() - .setEndpoint(endpoint) - .setAggregationTemporalitySelector(AggregationTemporalitySelector.deltaPreferred()) - .build(); - - PeriodicMetricReader reader = - PeriodicMetricReader.builder(exporter).setInterval(EXPORT_INTERVAL).build(); - - // Build resource with service name from OTEL_SERVICE_NAME env var - // Resource.getDefault() only provides unknown_service:java, so we read env vars manually - Resource resource = buildResource(); - - SdkMeterProvider sdkMeterProvider = - SdkMeterProvider.builder().setResource(resource).registerMetricReader(reader).build(); - meterProvider = sdkMeterProvider; - - Meter meter = sdkMeterProvider.meterBuilder(METER_NAME).build(); + Meter meter = GlobalOpenTelemetry.get().getMeterProvider().meterBuilder(METER_NAME).build(); counter = meter .counterBuilder(METRIC_NAME) @@ -89,34 +42,23 @@ class FlagEvalMetrics implements Closeable { .setDescription(METRIC_DESC) .build(); - log.debug("Flag evaluation metrics initialized, exporting to {}", endpoint); + log.debug("Flag evaluation metrics initialized"); } catch (NoClassDefFoundError e) { log.error( - "OpenTelemetry SDK is not on the classpath — evaluation metrics disabled. Add" - + " opentelemetry-sdk-metrics and opentelemetry-exporter-otlp to your dependencies to" - + " enable flag evaluation metrics.", + "OpenTelemetry API is not on the classpath — evaluation metrics disabled. Add" + + " opentelemetry-api to your dependencies and enable DD_METRICS_OTEL_ENABLED to" + + " export flag evaluation metrics through the Datadog Java agent.", e); counter = null; - meterProvider = null; } catch (Exception e) { log.error("Failed to initialize flag evaluation metrics", e); counter = null; - meterProvider = null; } } /** Package-private constructor for testing with a mock counter. */ FlagEvalMetrics(LongCounter counter) { this.counter = counter; - this.meterProvider = null; - } - - /** Package-private constructor for integration testing with an injected SdkMeterProvider. */ - FlagEvalMetrics(SdkMeterProvider sdkMeterProvider) { - meterProvider = sdkMeterProvider; - Meter meter = sdkMeterProvider.meterBuilder(METER_NAME).build(); - counter = - meter.counterBuilder(METRIC_NAME).setUnit(METRIC_UNIT).setDescription(METRIC_DESC).build(); } void record( @@ -153,27 +95,5 @@ public void close() { void shutdown() { counter = null; - Closeable mp = meterProvider; - if (mp != null) { - meterProvider = null; - try { - mp.close(); - } catch (Exception e) { - // Ignore shutdown errors - } - } - } - - /** - * Builds a Resource with the service name from OTEL_SERVICE_NAME environment variable. Falls back - * to Resource.getDefault() if OTEL_SERVICE_NAME is not set. - */ - private static Resource buildResource() { - String serviceName = ConfigHelper.env(SERVICE_NAME_ENV); - if (serviceName != null && !serviceName.isEmpty()) { - return Resource.getDefault() - .merge(Resource.builder().put(SERVICE_NAME_KEY, serviceName).build()); - } - return Resource.getDefault(); } } diff --git a/products/feature-flagging/feature-flagging-api/src/main/java/datadog/trace/api/openfeature/Provider.java b/products/feature-flagging/feature-flagging-api/src/main/java/datadog/trace/api/openfeature/Provider.java index c492ef49c69..c5e8898fa4a 100644 --- a/products/feature-flagging/feature-flagging-api/src/main/java/datadog/trace/api/openfeature/Provider.java +++ b/products/feature-flagging/feature-flagging-api/src/main/java/datadog/trace/api/openfeature/Provider.java @@ -53,9 +53,8 @@ public Provider(final Options options) { metrics = new FlagEvalMetrics(); hook = new FlagEvalHook(metrics); } catch (LinkageError | Exception e) { - // FlagEvalMetrics logs the detailed error when it can load but OTel SDK init fails. - // This outer catch fires when the class itself can't load (OTel API absent entirely). - log.warn("Evaluation metrics unavailable — OTel classes not on classpath", e); + // This outer catch fires when the metrics helper itself can't load (OTel API absent). + log.warn("Evaluation metrics unavailable — OTel API classes not on classpath", e); } this.flagEvalMetrics = metrics; this.flagEvalHook = hook; diff --git a/products/feature-flagging/feature-flagging-api/src/test/java/datadog/trace/api/openfeature/FlagEvalMetricsTest.java b/products/feature-flagging/feature-flagging-api/src/test/java/datadog/trace/api/openfeature/FlagEvalMetricsTest.java index 9d870b0c03c..214fadc7274 100644 --- a/products/feature-flagging/feature-flagging-api/src/test/java/datadog/trace/api/openfeature/FlagEvalMetricsTest.java +++ b/products/feature-flagging/feature-flagging-api/src/test/java/datadog/trace/api/openfeature/FlagEvalMetricsTest.java @@ -1,6 +1,5 @@ package datadog.trace.api.openfeature; -import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -9,13 +8,6 @@ import dev.openfeature.sdk.ErrorCode; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.metrics.LongCounter; -import io.opentelemetry.sdk.metrics.SdkMeterProvider; -import io.opentelemetry.sdk.metrics.data.AggregationTemporality; -import io.opentelemetry.sdk.metrics.data.LongPointData; -import io.opentelemetry.sdk.metrics.data.MetricData; -import io.opentelemetry.sdk.metrics.export.AggregationTemporalitySelector; -import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader; -import java.util.Collection; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; @@ -146,35 +138,9 @@ void shutdownClearsCounter() { } @Test - void multipleRecordCallsAccumulateWithDeltaTemporality() { - // Use delta temporality to match the deltaPreferred() selector configured on the production - // OTLP exporter in FlagEvalMetrics. Delta temporality exports only increments since last - // collection, which is what OTLP receivers expect. - InMemoryMetricReader reader = - InMemoryMetricReader.builder() - .setAggregationTemporalitySelector(AggregationTemporalitySelector.deltaPreferred()) - .build(); - SdkMeterProvider provider = SdkMeterProvider.builder().registerMetricReader(reader).build(); - - try (FlagEvalMetrics metrics = new FlagEvalMetrics(provider)) { - for (int i = 0; i < 5; i++) { - metrics.record("count-flag", "on", "STATIC", null, "default-alloc"); - } - - Collection data = reader.collectAllMetrics(); - MetricData metric = - data.stream() - .filter(m -> m.getName().equals("feature_flag.evaluations")) - .findFirst() - .orElseThrow(() -> new AssertionError("feature_flag.evaluations metric not found")); - - assertEquals( - AggregationTemporality.DELTA, - metric.getLongSumData().getAggregationTemporality(), - "Exported metric must use DELTA temporality"); - - LongPointData point = metric.getLongSumData().getPoints().iterator().next(); - assertEquals(5L, point.getValue(), "5 record() calls must produce a delta sum of 5"); + void defaultConstructorUsesOpenTelemetryApiOnly() { + try (FlagEvalMetrics metrics = new FlagEvalMetrics()) { + metrics.record("count-flag", "on", "STATIC", null, "default-alloc"); } } From d9b0bfe566eb8ffb243d79472fbac489663f7cd1 Mon Sep 17 00:00:00 2001 From: Clara Poncet Date: Tue, 30 Jun 2026 11:54:48 +0200 Subject: [PATCH 084/139] Add TemporaryRequestContext unit tests (#11798) Add TemporaryRequestContext unit tests to LambdaAppSecHandlerTest Co-Authored-By: Claude Sonnet 4.6 Apply spotless formatting Co-authored-by: devflow.devflow-routing-intake --- .../trace/lambda/LambdaAppSecHandlerTest.java | 81 +++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/dd-trace-core/src/test/java/datadog/trace/lambda/LambdaAppSecHandlerTest.java b/dd-trace-core/src/test/java/datadog/trace/lambda/LambdaAppSecHandlerTest.java index eed9ac52e9b..a87e8237855 100644 --- a/dd-trace-core/src/test/java/datadog/trace/lambda/LambdaAppSecHandlerTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/lambda/LambdaAppSecHandlerTest.java @@ -15,15 +15,18 @@ import datadog.trace.api.Config; import datadog.trace.api.function.TriConsumer; import datadog.trace.api.function.TriFunction; +import datadog.trace.api.gateway.BlockResponseFunction; import datadog.trace.api.gateway.CallbackProvider; import datadog.trace.api.gateway.Flow; import datadog.trace.api.gateway.IGSpanInfo; import datadog.trace.api.gateway.RequestContext; import datadog.trace.api.gateway.RequestContextSlot; +import datadog.trace.api.internal.TraceSegment; import datadog.trace.bootstrap.ActiveSubsystems; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; +import datadog.trace.bootstrap.instrumentation.api.ClientIpAddressData; import datadog.trace.bootstrap.instrumentation.api.TagContext; import datadog.trace.bootstrap.instrumentation.api.URIDataAdapter; import datadog.trace.core.DDCoreJavaSpecification; @@ -1199,6 +1202,84 @@ void processRequestStartHandlesExceptionDuringStreamReading() throws IOException assertNull(result); // Should return null on IO error } + // ============================================================================ + // TemporaryRequestContext Tests + // ============================================================================ + + @Test + void temporaryRequestContextProvidesAppSecDataViaGetData() { + Object mockAppSecContext = new Object(); + RequestContext ctx = captureTemporaryRequestContext(mockAppSecContext); + + assertNotNull(ctx); + assertEquals(mockAppSecContext, ctx.getData(RequestContextSlot.APPSEC)); + assertNull(ctx.getData(RequestContextSlot.CI_VISIBILITY)); + } + + @Test + void temporaryRequestContextNoOpMethodsReturnExpectedDefaults() throws Exception { + RequestContext ctx = captureTemporaryRequestContext(new Object()); + + assertNotNull(ctx); + assertEquals(TraceSegment.NoOp.INSTANCE, ctx.getTraceSegment()); + assertNull(ctx.getBlockResponseFunction()); + assertNull(ctx.getOrCreateMetaStructTop("key", k -> new Object())); + assertNull(ctx.getClientIpAddressData()); + // verify no-op methods don't throw + ctx.setBlockResponseFunction(mock(BlockResponseFunction.class)); + ctx.setClientIpAddressData(mock(ClientIpAddressData.class)); + ctx.close(); + } + + private RequestContext captureTemporaryRequestContext(Object appSecContext) { + String eventJson = + "{\n" + + " \"path\": \"/test\",\n" + + " \"requestContext\": {\n" + + " \"httpMethod\": \"GET\"\n" + + " }\n" + + "}"; + ByteArrayInputStream event = createInputStream(eventJson); + + RequestContext[] captured = {null}; + + Supplier> requestStartedCallback = mock(Supplier.class); + when(requestStartedCallback.get()).thenReturn(new Flow.ResultFlow<>(appSecContext)); + + TriFunction> methodUriCallback = + mock(TriFunction.class); + doAnswer( + inv -> { + captured[0] = inv.getArgument(0); + return new Flow.ResultFlow<>(null); + }) + .when(methodUriCallback) + .apply(any(), any(), any()); + + Function> headerDoneCallback = mock(Function.class); + when(headerDoneCallback.apply(any())).thenReturn(new Flow.ResultFlow<>(null)); + + CallbackProvider mockCallbackProvider = mock(CallbackProvider.class); + when(mockCallbackProvider.getCallback(EVENTS.requestStarted())) + .thenReturn(requestStartedCallback); + when(mockCallbackProvider.getCallback(EVENTS.requestMethodUriRaw())) + .thenReturn(methodUriCallback); + when(mockCallbackProvider.getCallback(EVENTS.requestHeader())).thenReturn(null); + when(mockCallbackProvider.getCallback(EVENTS.requestClientSocketAddress())).thenReturn(null); + when(mockCallbackProvider.getCallback(EVENTS.requestHeaderDone())) + .thenReturn(headerDoneCallback); + when(mockCallbackProvider.getCallback(EVENTS.requestPathParams())).thenReturn(null); + when(mockCallbackProvider.getCallback(EVENTS.requestBodyProcessed())).thenReturn(null); + + AgentTracer.TracerAPI mockTracer = mock(AgentTracer.TracerAPI.class); + when(mockTracer.getCallbackProvider(RequestContextSlot.APPSEC)) + .thenReturn(mockCallbackProvider); + AgentTracer.forceRegister(mockTracer); + + LambdaAppSecHandler.processRequestStart(event); + return captured[0]; + } + // ============================================================================ // Helper classes and methods // ============================================================================ From 29d82ddd0b998d62f79289c662fad121f67bf04c Mon Sep 17 00:00:00 2001 From: Douglas Q Hawkins Date: Tue, 30 Jun 2026 05:55:07 -0400 Subject: [PATCH 085/139] Exclude OptimizedTagMap.EmptyHolder from coverage checks (#11795) Add direct coverage tests for Hashtable.D2.Entry Tests matches() with both true and false branches, and hash() for consistency and key-sensitivity, since existing D2 operation tests don't guarantee the false branch fires (different key pairs hash to different buckets, so matches() is never called with a mismatch). Co-Authored-By: Claude Sonnet 4.6 Exclude OptimizedTagMap.EmptyHolder from coverage checks EmptyHolder is a lazy-holder idiom class used to avoid class-init ordering issues between TagMap and OptimizedTagMap. It has no methods of its own and is exercised indirectly via TagMap.EMPTY, but JaCoCo tracks it as a separate class with its own coverage thresholds. Co-Authored-By: Claude Sonnet 4.6 Co-authored-by: devflow.devflow-routing-intake --- internal-api/build.gradle.kts | 2 ++ .../datadog/trace/util/HashtableD2Test.java | 33 +++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/internal-api/build.gradle.kts b/internal-api/build.gradle.kts index 5eb3891a126..5b255b4bab7 100644 --- a/internal-api/build.gradle.kts +++ b/internal-api/build.gradle.kts @@ -55,6 +55,8 @@ extra["excludedClassesCoverage"] = listOf( "datadog.trace.api.EndpointCheckpointerHolder", "datadog.trace.api.iast.IastAdvice.Kind", "datadog.trace.api.UserEventTrackingMode", + // Lazy holder idiom; exercised indirectly via TagMap.EMPTY + "datadog.trace.api.OptimizedTagMap.EmptyHolder", // These are almost fully abstract classes so nothing to test "datadog.trace.api.profiling.RecordingData", "datadog.trace.api.appsec.AppSecEventTracker", diff --git a/internal-api/src/test/java/datadog/trace/util/HashtableD2Test.java b/internal-api/src/test/java/datadog/trace/util/HashtableD2Test.java index 8605af1b33f..50da832395b 100644 --- a/internal-api/src/test/java/datadog/trace/util/HashtableD2Test.java +++ b/internal-api/src/test/java/datadog/trace/util/HashtableD2Test.java @@ -1,6 +1,7 @@ package datadog.trace.util; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertSame; @@ -118,6 +119,38 @@ void getOrCreateOnHitSkipsCreator() { assertEquals(0, createCount[0]); } + @Test + void entryMatchesTrueWhenBothKeysEqual() { + PairEntry entry = new PairEntry("a", 1, 100); + assertTrue(entry.matches("a", 1)); + } + + @Test + void entryMatchesFalseWhenKey1Differs() { + PairEntry entry = new PairEntry("a", 1, 100); + assertFalse(entry.matches("b", 1)); + } + + @Test + void entryMatchesFalseWhenKey2Differs() { + PairEntry entry = new PairEntry("a", 1, 100); + assertFalse(entry.matches("a", 2)); + } + + @Test + void entryHashIsConsistentForSameKeys() { + long h1 = Hashtable.D2.Entry.hash("x", 42); + long h2 = Hashtable.D2.Entry.hash("x", 42); + assertEquals(h1, h2); + } + + @Test + void entryHashDiffersForDifferentKeys() { + long h1 = Hashtable.D2.Entry.hash("x", 1); + long h2 = Hashtable.D2.Entry.hash("x", 2); + assertFalse(h1 == h2); + } + @Test void removeReturnsNullForMissingKey() { Hashtable.D2 table = new Hashtable.D2<>(8); From e280daf42bb79dc40b87b161c7a0880d44d05597 Mon Sep 17 00:00:00 2001 From: Douglas Q Hawkins Date: Tue, 30 Jun 2026 06:14:51 -0400 Subject: [PATCH 086/139] Add direct coverage tests for Hashtable.D2.Entry (#11794) Add direct coverage tests for Hashtable.D2.Entry Tests matches() with both true and false branches, and hash() for consistency and key-sensitivity, since existing D2 operation tests don't guarantee the false branch fires (different key pairs hash to different buckets, so matches() is never called with a mismatch). Co-Authored-By: Claude Sonnet 4.6 Co-authored-by: devflow.devflow-routing-intake From 76b02af557f4a22fcc05889d1e3ce17ac788ed57 Mon Sep 17 00:00:00 2001 From: "Santiago M. Mola" Date: Tue, 30 Jun 2026 12:16:03 +0200 Subject: [PATCH 087/139] Add test coverage exclusion for ClientIpAddressData (#11799) Add test coverage exclusion for ClientIpAddressData Co-authored-by: santiago.mola --- internal-api/build.gradle.kts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/internal-api/build.gradle.kts b/internal-api/build.gradle.kts index 5b255b4bab7..6e99abe89d2 100644 --- a/internal-api/build.gradle.kts +++ b/internal-api/build.gradle.kts @@ -243,6 +243,8 @@ extra["excludedClassesCoverage"] = listOf( "datadog.trace.util.TempLocationManager.*", // constants only "datadog.trace.bootstrap.instrumentation.api.ServiceNameSources", + // POJO, covered by test suites in other gradle submodules (e.g. AIGuardInternalTests, HttpServerDecoratorTest) + "datadog.trace.bootstrap.instrumentation.api.ClientIpAddressData", ) extra["excludedClassesBranchCoverage"] = listOf( From 1abde6b56ffafc8f5da6ac23889edc67bf904ce0 Mon Sep 17 00:00:00 2001 From: Bruce Bujon Date: Tue, 30 Jun 2026 12:55:43 +0200 Subject: [PATCH 088/139] feat(dd-trace-api): Add 128 bit TID parsing tests (#11802) --- .../java/datadog/trace/api/DDTraceIdTest.java | 37 ++++++++++++++++--- 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/dd-trace-api/src/test/java/datadog/trace/api/DDTraceIdTest.java b/dd-trace-api/src/test/java/datadog/trace/api/DDTraceIdTest.java index 3820b17c256..98225bb9698 100644 --- a/dd-trace-api/src/test/java/datadog/trace/api/DDTraceIdTest.java +++ b/dd-trace-api/src/test/java/datadog/trace/api/DDTraceIdTest.java @@ -140,6 +140,33 @@ void convert128BitIdsFromToHexadecimalStringRepresentation( assertEquals(Long.toUnsignedString(lowOrderBits), parsedId.toString()); } + @TableTest({ + "scenario | hexId | start | length | lowerCaseOnly | expectedHexId ", + "default bounds | 0123456789abcdeffedcba9876543210 | 0 | 32 | true | 0123456789abcdeffedcba9876543210", + "starting bounds | 0123456789abcdeffedcba9876543210 | 0 | 16 | true | 00000000000000000123456789abcdef", + "ending bounds | 0123456789abcdeffedcba9876543210 | 16 | 16 | true | 0000000000000000fedcba9876543210", + "middle bounds | 0123456789abcdeffedcba9876543210 | 8 | 4 | true | 000000000000000000000000000089ab", + "with padding | ---0123456789abcdeffedcba9876543210--- | 3 | 32 | true | 0123456789abcdeffedcba9876543210", + "upper case | 0123456789ABCDEFFEDCBA9876543210 | 0 | 32 | false | 0123456789abcdeffedcba9876543210", + "mixed case | 0123456789ABCDEFfedcba9876543210 | 0 | 32 | false | 0123456789abcdeffedcba9876543210", + "negative position | 0123456789abcdeffedcba9876543210 | -1 | 32 | false | ", + "negative length | 0123456789abcdeffedcba9876543210 | 0 | -1 | false | ", + "invalid length | 0123456789abcdeffedcba9876543210 | 0 | 33 | false | ", + "invalid ending bound | 0123456789abcdeffedcba9876543210 | 1 | 32 | false | ", + "invalid case | 0123456789ABCDEFFEDCBA9876543210 | 0 | 32 | true | " + }) + void converting128BitIdsFromHexadecimalStringRepresentation( + String hexId, int start, int length, boolean lowerCaseOnly, String expectedHexId) { + if (expectedHexId == null) { + assertThrows( + NumberFormatException.class, + () -> DD128bTraceId.fromHex(hexId, start, length, lowerCaseOnly)); + return; + } + DD128bTraceId parsedId = DD128bTraceId.fromHex(hexId, start, length, lowerCaseOnly); + assertEquals(expectedHexId, parsedId.toHexString()); + } + @ParameterizedTest( name = "fail parsing illegal 128-bit id hexadecimal String representation [{index}]") @NullSource @@ -185,14 +212,12 @@ private static String leftPadWithZeros(String value, int size) { if (value.length() >= size) { return value; } - return repeat("0", size - value.length()) + value; - } - - private static String repeat(String value, int count) { - StringBuilder builder = new StringBuilder(value.length() * count); + StringBuilder builder = new StringBuilder(size); + int count = size - value.length(); for (int index = 0; index < count; index++) { - builder.append(value); + builder.append('0'); } + builder.append(value); return builder.toString(); } } From 8df9f0541a1973131697e424acabb1050c71aa08 Mon Sep 17 00:00:00 2001 From: Brice Dutheil Date: Tue, 30 Jun 2026 13:08:23 +0200 Subject: [PATCH 089/139] Increase SCA vulnerability test coverage (#11785) test(appsec): Increase SCA vulnerability test coverage fix(test): PR comments test: address sca review test: clean up sca review follow-up Co-authored-by: devflow.devflow-routing-intake --- dd-java-agent/appsec/build.gradle | 2 + .../appsec/sca/ScaBytecodeTestUtils.java | 42 ++++++ .../appsec/sca/ScaCveDatabaseTest.java | 25 ++++ .../sca/ScaReachabilityMethodLevelTest.java | 75 +++++++--- .../ScaReachabilitySystemCallsiteTest.java | 14 ++ .../appsec/sca/ScaReachabilitySystemTest.java | 53 +++++++ .../ScaReachabilityTransformerJava9Test.java | 130 ++++++++++++++++-- .../sca/ScaRealLibraryBytecodeTest.java | 24 +--- 8 files changed, 307 insertions(+), 58 deletions(-) create mode 100644 dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaBytecodeTestUtils.java create mode 100644 dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaReachabilitySystemTest.java diff --git a/dd-java-agent/appsec/build.gradle b/dd-java-agent/appsec/build.gradle index 10ea2882dc9..461adcb0ec3 100644 --- a/dd-java-agent/appsec/build.gradle +++ b/dd-java-agent/appsec/build.gradle @@ -89,7 +89,9 @@ ext { 'com.datadog.appsec.config.AppSecFeatures.AutoUserInstrum', 'com.datadog.appsec.AppSecModule.AppSecModuleActivationException', 'com.datadog.appsec.event.ReplaceableEventProducerService', + 'com.datadog.appsec.event.data.IntrospectionExcludedTypesTrie', 'com.datadog.appsec.api.security.ApiSecuritySampler.NoOp', + 'com.datadog.appsec.sca.ScaStackExclusionTrie', ] excludedClassesBranchCoverage = [ 'com.datadog.appsec.gateway.GatewayBridge', diff --git a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaBytecodeTestUtils.java b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaBytecodeTestUtils.java new file mode 100644 index 00000000000..3b2e4a02d04 --- /dev/null +++ b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaBytecodeTestUtils.java @@ -0,0 +1,42 @@ +package com.datadog.appsec.sca; + +import static org.junit.jupiter.api.Assertions.assertNotNull; + +import java.io.ByteArrayOutputStream; +import java.io.InputStream; +import net.bytebuddy.jar.asm.ClassReader; +import net.bytebuddy.jar.asm.ClassWriter; + +final class ScaBytecodeTestUtils { + + private ScaBytecodeTestUtils() {} + + static byte[] bytecodeOf(Class clazz) throws Exception { + String path = clazz.getName().replace('.', '/') + ".class"; + try (InputStream is = clazz.getClassLoader().getResourceAsStream(path)) { + assertNotNull(is, "Cannot load bytecode for " + clazz.getName()); + ByteArrayOutputStream buf = new ByteArrayOutputStream(); + byte[] chunk = new byte[4096]; + int n; + while ((n = is.read(chunk)) != -1) { + buf.write(chunk, 0, n); + } + return buf.toByteArray(); + } + } + + static Class loadModified(byte[] bytecode) { + return new ClassLoader(ScaBytecodeTestUtils.class.getClassLoader()) { + Class define() { + return defineClass(null, bytecode, 0, bytecode.length); + } + }.define(); + } + + static byte[] bytecodeWithoutDebugInfo(Class clazz) throws Exception { + ClassReader cr = new ClassReader(bytecodeOf(clazz)); + ClassWriter cw = new ClassWriter(0); + cr.accept(cw, ClassReader.SKIP_DEBUG); + return cw.toByteArray(); + } +} diff --git a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaCveDatabaseTest.java b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaCveDatabaseTest.java index 0c02a3941e5..5fe9efdbcad 100644 --- a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaCveDatabaseTest.java +++ b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaCveDatabaseTest.java @@ -1,9 +1,11 @@ package com.datadog.appsec.sca; +import static java.util.Collections.singletonList; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.StringReader; @@ -125,6 +127,29 @@ void multipleEntriesForSameClass() throws Exception { assertEquals(2, entries.size()); } + @Test + void scaEntryMatchesVersions() { + List expectedRanges = singletonList("< 2.0.0"); + List symbols = singletonList(new ScaSymbol("com/example/Foo", "op")); + ScaEntry entry = new ScaEntry("GHSA-entry", "com.example:lib", expectedRanges, symbols); + + assertEquals(expectedRanges, entry.versionRanges()); + assertTrue(entry.isVersionVulnerable("1.9.9")); + assertFalse(entry.isVersionVulnerable("2.0.0")); + } + + @Test + void scaEntryExposesImmutableLists() { + List ranges = singletonList("< 2.0.0"); + List symbols = singletonList(new ScaSymbol("com/example/Foo", "op")); + ScaEntry entry = new ScaEntry("GHSA-entry", "com.example:lib", ranges, symbols); + + assertThrows(UnsupportedOperationException.class, () -> entry.versionRanges().add("< 3.0.0")); + assertThrows( + UnsupportedOperationException.class, + () -> entry.symbols().add(new ScaSymbol("com/example/Bar", "op"))); + } + @Test void entryWithMultipleSymbolsInSameClassIndexedOnce() throws Exception { // An entry with two symbols for the same class (e.g. Yaml.load + Yaml.loadAll) must appear diff --git a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaReachabilityMethodLevelTest.java b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaReachabilityMethodLevelTest.java index 7ee88fa8ffa..5083745e48f 100644 --- a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaReachabilityMethodLevelTest.java +++ b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaReachabilityMethodLevelTest.java @@ -1,5 +1,8 @@ package com.datadog.appsec.sca; +import static com.datadog.appsec.sca.ScaBytecodeTestUtils.bytecodeOf; +import static com.datadog.appsec.sca.ScaBytecodeTestUtils.bytecodeWithoutDebugInfo; +import static com.datadog.appsec.sca.ScaBytecodeTestUtils.loadModified; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -10,8 +13,6 @@ import datadog.trace.api.telemetry.ScaReachabilityDependencyRegistry.DependencySnapshot; import datadog.trace.api.telemetry.ScaReachabilityHit; import datadog.trace.bootstrap.appsec.sca.ScaReachabilityCallback; -import java.io.ByteArrayOutputStream; -import java.io.InputStream; import java.io.StringReader; import java.lang.reflect.Method; import java.util.ArrayList; @@ -43,6 +44,24 @@ public String safeMethod() { } } + /** Fixture compiled normally, then stripped of line numbers before callback injection. */ + public static class ClassToBeStrippedOfLineNumber { + // Intentionally non-final so javac emits a field read instead of inlining a constant. + private static int runtimeFieldValue = 7; + + public static int readField() { + return runtimeFieldValue; + } + + public static Object returnArgument(Object value) { + return value; + } + + public static String callToString(Object value) { + return value.toString(); + } + } + private ScaCveDatabase db; private ScaReachabilityTransformer transformer; @@ -171,6 +190,38 @@ void inject_injectsMultipleMethodsIndependently() throws Exception { assertTrue(hits.stream().anyMatch(h -> h.symbolName().equals("safeMethod"))); } + @Test + void inject_withoutLineNumbersInjectsBeforeFirstInstruction() throws Exception { + byte[] original = bytecodeWithoutDebugInfo(ClassToBeStrippedOfLineNumber.class); + String className = ClassToBeStrippedOfLineNumber.class.getName(); + Map> callbacks = new HashMap<>(); + callbacks.put( + "readField", + Collections.singletonList( + spec("GHSA-field", "com.example:lib", "1.0.0", className, "readField"))); + callbacks.put( + "returnArgument", + Collections.singletonList( + spec("GHSA-var", "com.example:lib", "1.0.0", className, "returnArgument"))); + callbacks.put( + "callToString", + Collections.singletonList( + spec("GHSA-method", "com.example:lib", "1.0.0", className, "callToString"))); + + Class cls = loadModified(ScaMethodCallbackInjector.inject(original, callbacks)); + + assertEquals(7, cls.getMethod("readField").invoke(null)); + assertEquals("value", cls.getMethod("returnArgument", Object.class).invoke(null, "value")); + assertEquals("value", cls.getMethod("callToString", Object.class).invoke(null, "value")); + + List hits = drainHits(); + assertEquals(3, hits.size()); + assertTrue(hits.stream().allMatch(hit -> hit.line() == 1)); + assertTrue(hits.stream().anyMatch(hit -> hit.symbolName().equals("readField"))); + assertTrue(hits.stream().anyMatch(hit -> hit.symbolName().equals("returnArgument"))); + assertTrue(hits.stream().anyMatch(hit -> hit.symbolName().equals("callToString"))); + } + @Test void inject_sameMethodNameInDifferentClassesProduceIndependentHits() throws Exception { // Regression test for dedup key bug: if two classes in the same artifact share a method @@ -325,24 +376,4 @@ private static ScaMethodCallbackInjector.MethodCallbackSpec spec( return new ScaMethodCallbackInjector.MethodCallbackSpec( vulnId, artifact, version, dotClass, method); } - - private static byte[] bytecodeOf(Class clazz) throws Exception { - String path = clazz.getName().replace('.', '/') + ".class"; - try (InputStream is = clazz.getClassLoader().getResourceAsStream(path)) { - assertNotNull(is, "Cannot load bytecode for " + clazz.getName()); - ByteArrayOutputStream buf = new ByteArrayOutputStream(); - byte[] chunk = new byte[4096]; - int n; - while ((n = is.read(chunk)) != -1) buf.write(chunk, 0, n); - return buf.toByteArray(); - } - } - - private static Class loadModified(byte[] bytecode) { - return new ClassLoader(ScaReachabilityMethodLevelTest.class.getClassLoader()) { - Class define() { - return defineClass(null, bytecode, 0, bytecode.length); - } - }.define(); - } } diff --git a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaReachabilitySystemCallsiteTest.java b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaReachabilitySystemCallsiteTest.java index 3dc3d2e6d80..38dbb4130f5 100644 --- a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaReachabilitySystemCallsiteTest.java +++ b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaReachabilitySystemCallsiteTest.java @@ -33,6 +33,20 @@ void findCallsite_returnsDirectCallerWhenNoIntermediateLibrary() { assertEquals("yamlHitDirect", result.getMethodName()); } + @Test + void findCallsite_skipsRepeatedVulnerableFrames() { + StackTraceElement[] stack = { + frame(VULNERABLE_CLASS, "load"), + frame(VULNERABLE_CLASS, "loadAll"), + frame("sca.test.TestController", "yamlHitRecursive"), + }; + + StackTraceElement result = ScaReachabilitySystem.findCallsite(VULNERABLE_CLASS, stack); + + assertEquals("sca.test.TestController", result.getClassName()); + assertEquals("yamlHitRecursive", result.getMethodName()); + } + @Test void findCallsite_skipsIntermediateLibraryFrameAndReturnsClientCode() { // com.google.* is excluded by the SCA trie (value >= 1) diff --git a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaReachabilitySystemTest.java b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaReachabilitySystemTest.java new file mode 100644 index 00000000000..82c7f62a9ca --- /dev/null +++ b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaReachabilitySystemTest.java @@ -0,0 +1,53 @@ +package com.datadog.appsec.sca; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import datadog.trace.api.telemetry.ScaReachabilityDependencyRegistry; +import datadog.trace.api.telemetry.ScaReachabilityHit; +import datadog.trace.bootstrap.appsec.sca.ScaReachabilityCallback; +import java.lang.instrument.Instrumentation; +import java.util.List; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; + +class ScaReachabilitySystemTest { + + @AfterEach + void tearDown() { + ScaReachabilityDependencyRegistry.INSTANCE.resetForTesting(); + ScaReachabilityCallback.register(null); + } + + @Test + void startRegistersTransformerCallbackAndPeriodicWork() { + Instrumentation instrumentation = mock(Instrumentation.class); + when(instrumentation.getAllLoadedClasses()).thenReturn(new Class[0]); + + ScaReachabilitySystem.start(instrumentation); + + verify(instrumentation).addTransformer(any(ScaReachabilityTransformer.class), eq(true)); + assertNotNull(ScaReachabilityDependencyRegistry.INSTANCE.getPeriodicWorkCallback()); + + ScaReachabilityCallback.onMethodHit( + "GHSA-start", "com.example:lib", "1.0.0", "missing.Vulnerable", "danger", 42); + + List snapshots = + ScaReachabilityDependencyRegistry.INSTANCE.drainPendingDependencies(); + assertEquals(1, snapshots.size()); + assertEquals("com.example:lib", snapshots.get(0).artifact); + assertEquals("1.0.0", snapshots.get(0).version); + assertEquals(1, snapshots.get(0).cves.size()); + ScaReachabilityHit hit = snapshots.get(0).cves.get(0).hit; + assertNotNull(hit); + assertEquals("GHSA-start", hit.vulnId()); + assertEquals("missing.Vulnerable", hit.className()); + assertEquals("danger", hit.symbolName()); + assertEquals(42, hit.line()); + } +} diff --git a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaReachabilityTransformerJava9Test.java b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaReachabilityTransformerJava9Test.java index 57da31fc9ab..48bfa48b1a9 100644 --- a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaReachabilityTransformerJava9Test.java +++ b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaReachabilityTransformerJava9Test.java @@ -1,19 +1,26 @@ package com.datadog.appsec.sca; +import static com.datadog.appsec.sca.ScaBytecodeTestUtils.bytecodeOf; +import static java.util.Collections.emptyList; +import static java.util.Collections.singletonList; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import datadog.telemetry.dependency.Dependency; +import datadog.trace.api.telemetry.ScaReachabilityDependencyRegistry; import java.io.StringReader; import java.lang.instrument.Instrumentation; import java.net.URLClassLoader; import java.util.Arrays; -import java.util.Collections; +import java.util.List; +import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledForJreRange; import org.junit.jupiter.api.condition.JRE; @@ -52,6 +59,11 @@ class ScaReachabilityTransformerJava9Test { + "\"symbols\":[{\"class\":\"com/fasterxml/jackson/databind/ObjectMapper\",\"method\":\"readValue\"}]" + "}]}"; + @AfterEach + void resetRegistry() { + ScaReachabilityDependencyRegistry.INSTANCE.resetForTesting(); + } + @Test @EnabledForJreRange(min = JRE.JAVA_9) void systemClassLoaderIsNotUrlClassLoaderOnJava9Plus() { @@ -103,8 +115,7 @@ void matchVersion_exactMatchReturnsVersion() { Dependency dep = new Dependency("com.github.junrar:junrar", "7.5.5", "junrar-7.5.5.jar", null); assertEquals( "7.5.5", - ScaReachabilityTransformer.matchVersion( - "com.github.junrar:junrar", Collections.singletonList(dep))); + ScaReachabilityTransformer.matchVersion("com.github.junrar:junrar", singletonList(dep))); } @Test @@ -114,8 +125,7 @@ void matchVersion_artifactIdOnlyFallbackForNoPomJar() { Dependency dep = new Dependency("junrar", "7.5.5", "junrar-7.5.5.jar", null); assertEquals( "7.5.5", - ScaReachabilityTransformer.matchVersion( - "com.github.junrar:junrar", Collections.singletonList(dep)), + ScaReachabilityTransformer.matchVersion("com.github.junrar:junrar", singletonList(dep)), "artifact-ID fallback must match 'junrar' against 'com.github.junrar:junrar'"); } @@ -125,16 +135,13 @@ void matchVersion_artifactIdFallbackDoesNotMatchWhenGroupIdPresent() { // "org.other:junrar" should NOT match "com.github.junrar:junrar". Dependency dep = new Dependency("org.other:junrar", "1.0.0", "junrar-1.0.0.jar", null); assertNull( - ScaReachabilityTransformer.matchVersion( - "com.github.junrar:junrar", Collections.singletonList(dep)), + ScaReachabilityTransformer.matchVersion("com.github.junrar:junrar", singletonList(dep)), "artifact-ID fallback must not fire when dep.name already has a group ID"); } @Test void matchVersion_emptyListReturnsNull() { - assertNull( - ScaReachabilityTransformer.matchVersion( - "com.github.junrar:junrar", Collections.emptyList())); + assertNull(ScaReachabilityTransformer.matchVersion("com.github.junrar:junrar", emptyList())); } @Test @@ -229,13 +236,108 @@ void performPendingRetransforms_prewarms_classpathArtifactCache_for_aggregator_a + "if empty, findArtifactVersionInClasspath() would run under JVM retransform locks"); } + @Test + void transform_retransform_injectsCallbacksWhenVersionResolvedFromCache() throws Exception { + String internalName = + ScaReachabilityMethodLevelTest.TargetClass.class.getName().replace('.', '/'); + String json = + "{\"version\":1,\"entries\":[{" + + "\"vuln_id\":\"GHSA-transform\"," + + "\"artifact\":\"com.example:lib\"," + + "\"version_ranges\":[\"< 999.0.0\"]," + + "\"symbols\":[{\"class\":\"" + + internalName + + "\",\"method\":\"vulnerableMethod\"}]" + + "}]}"; + ScaCveDatabase db = ScaCveDatabase.parse(new StringReader(json)); + ScaReachabilityTransformer transformer = new ScaReachabilityTransformer(db, null); + transformer.jarCache.put( + ScaReachabilityMethodLevelTest.TargetClass.class + .getProtectionDomain() + .getCodeSource() + .getLocation() + .toURI(), + singletonList(new Dependency("com.example:lib", "1.2.3", "test.jar", null))); + + byte[] transformed = + transformer.transform( + null, + internalName, + ScaReachabilityMethodLevelTest.TargetClass.class, + ScaReachabilityMethodLevelTest.TargetClass.class.getProtectionDomain(), + bytecodeOf(ScaReachabilityMethodLevelTest.TargetClass.class)); + + assertNotNull(transformed); + assertTrue(transformer.pendingRetransformNames.isEmpty()); + List snapshots = + ScaReachabilityDependencyRegistry.INSTANCE.drainPendingDependencies(); + assertEquals(1, snapshots.size()); + assertEquals("com.example:lib", snapshots.get(0).artifact); + assertEquals("1.2.3", snapshots.get(0).version); + assertEquals("GHSA-transform", snapshots.get(0).cves.get(0).vulnId); + assertNull(snapshots.get(0).cves.get(0).hit); + } + + @Test + void checkAlreadyLoadedClassesSchedulesOnlyMatchingNonBootstrapClasses() throws Exception { + String internalName = + ScaReachabilityMethodLevelTest.TargetClass.class.getName().replace('.', '/'); + String json = + "{\"version\":1,\"entries\":[" + + "{\"vuln_id\":\"GHSA-target\",\"artifact\":\"com.example:lib\"," + + "\"version_ranges\":[\"< 999.0.0\"]," + + "\"symbols\":[{\"class\":\"" + + internalName + + "\",\"method\":\"vulnerableMethod\"}]}," + + "{\"vuln_id\":\"GHSA-jdk\",\"artifact\":\"com.example:jdk\"," + + "\"version_ranges\":[\"< 999.0.0\"]," + + "\"symbols\":[{\"class\":\"java/lang/String\",\"method\":\"substring\"}]}" + + "]}"; + + Instrumentation mockInstr = mock(Instrumentation.class); + when(mockInstr.getAllLoadedClasses()) + .thenReturn( + new Class[] { + null, String[].class, String.class, ScaReachabilityMethodLevelTest.TargetClass.class, + }); + ScaReachabilityTransformer transformer = + new ScaReachabilityTransformer(ScaCveDatabase.parse(new StringReader(json)), mockInstr); + + transformer.checkAlreadyLoadedClasses(); + + assertEquals(1, transformer.pendingRetransform.size()); + assertSame( + ScaReachabilityMethodLevelTest.TargetClass.class, transformer.pendingRetransform.peek()); + } + + @Test + void performPendingRetransforms_noopsWithoutInstrumentation() throws Exception { + ScaReachabilityTransformer transformer = + new ScaReachabilityTransformer( + ScaCveDatabase.parse(new StringReader("{\"version\":1,\"entries\":[]}")), null); + transformer.pendingRetransform.add(ScaReachabilityMethodLevelTest.TargetClass.class); + + transformer.performPendingRetransforms(); + + assertSame( + ScaReachabilityMethodLevelTest.TargetClass.class, transformer.pendingRetransform.peek()); + } + + @Test + void resolveArtifactDep_returnsCachedClasspathArtifact() throws Exception { + ScaReachabilityTransformer transformer = + new ScaReachabilityTransformer(ScaCveDatabase.parse(new StringReader(JACKSON_JSON)), null); + Dependency cached = new Dependency("com.example:lib", "1.0.0", "lib.jar", null); + transformer.classpathArtifactCache.put("com.example:lib", cached); + + assertSame(cached, transformer.resolveArtifactDep("com.example:lib", emptyList())); + } + @Test void matchVersion_nullDepNameDoesNotThrow() { // guessFallbackNoPom can produce Dependency(name=null, ...) for JARs with unrecognizable names. Dependency nullName = new Dependency(null, "1.0", "foo.jar", null); - assertNull( - ScaReachabilityTransformer.matchVersion( - "com.example:foo", Collections.singletonList(nullName))); + assertNull(ScaReachabilityTransformer.matchVersion("com.example:foo", singletonList(nullName))); } /** @@ -261,7 +363,7 @@ void resolveArtifactDep_noPomJar_returnsArtifactIdOnlyName() throws Exception { Dependency resolved = transformer.resolveArtifactDep( - "com.fasterxml.jackson.core:jackson-databind", Collections.singletonList(noPomDep)); + "com.fasterxml.jackson.core:jackson-databind", singletonList(noPomDep)); assertNotNull(resolved, "should resolve via artifactId-only fallback"); assertEquals( diff --git a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaRealLibraryBytecodeTest.java b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaRealLibraryBytecodeTest.java index 3e568a3c370..40303c46bf2 100644 --- a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaRealLibraryBytecodeTest.java +++ b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/sca/ScaRealLibraryBytecodeTest.java @@ -1,5 +1,7 @@ package com.datadog.appsec.sca; +import static com.datadog.appsec.sca.ScaBytecodeTestUtils.bytecodeOf; +import static com.datadog.appsec.sca.ScaBytecodeTestUtils.loadModified; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -9,9 +11,7 @@ import datadog.trace.api.telemetry.ScaReachabilityDependencyRegistry.DependencySnapshot; import datadog.trace.api.telemetry.ScaReachabilityHit; import datadog.trace.bootstrap.appsec.sca.ScaReachabilityCallback; -import java.io.ByteArrayOutputStream; import java.io.File; -import java.io.InputStream; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -198,24 +198,4 @@ private static ScaMethodCallbackInjector.MethodCallbackSpec spec( return new ScaMethodCallbackInjector.MethodCallbackSpec( vulnId, artifact, version, dotClass, method); } - - private static byte[] bytecodeOf(Class clazz) throws Exception { - String path = clazz.getName().replace('.', '/') + ".class"; - try (InputStream is = clazz.getClassLoader().getResourceAsStream(path)) { - assertNotNull(is, "Cannot load bytecode for " + clazz.getName()); - ByteArrayOutputStream buf = new ByteArrayOutputStream(); - byte[] chunk = new byte[4096]; - int n; - while ((n = is.read(chunk)) != -1) buf.write(chunk, 0, n); - return buf.toByteArray(); - } - } - - private static Class loadModified(byte[] bytecode) { - return new ClassLoader(ScaRealLibraryBytecodeTest.class.getClassLoader()) { - Class define() { - return defineClass(null, bytecode, 0, bytecode.length); - } - }.define(); - } } From e4274f311a17c6a1d567c799901692954cd03e97 Mon Sep 17 00:00:00 2001 From: Brice Dutheil Date: Tue, 30 Jun 2026 13:09:58 +0200 Subject: [PATCH 090/139] Enable and fix test coverage for SCA types in internal API (#11774) test: Coverage tests for proxy span metadata, ARN computation, SCV dep handling test: address sca review Co-authored-by: devflow.devflow-routing-intake --- .../trace/api/gateway/InferredProxySpan.java | 6 +- .../api/gateway/InferredProxySpanTests.java | 88 ++++++++++++++++++ .../gateway/InstrumentationGatewayTest.java | 44 +++++++++ ...ScaReachabilityDependencyRegistryTest.java | 92 +++++++++++++++++++ 4 files changed, 228 insertions(+), 2 deletions(-) diff --git a/internal-api/src/main/java/datadog/trace/api/gateway/InferredProxySpan.java b/internal-api/src/main/java/datadog/trace/api/gateway/InferredProxySpan.java index aef0fb81a70..5a893e7d760 100644 --- a/internal-api/src/main/java/datadog/trace/api/gateway/InferredProxySpan.java +++ b/internal-api/src/main/java/datadog/trace/api/gateway/InferredProxySpan.java @@ -18,6 +18,7 @@ import datadog.context.ContextKey; import datadog.context.ImplicitContextKeyed; import datadog.trace.api.Config; +import datadog.trace.api.internal.VisibleForTesting; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; @@ -49,7 +50,7 @@ public class InferredProxySpan implements ImplicitContextKeyed { } private final Map headers; - private AgentSpan span; + @VisibleForTesting AgentSpan span; // Service-entry span registered at startSpan() time; used to guard against premature finishing // by child spans (e.g., Spring MVC handler spans) before the response status is known. private AgentSpan registeredServiceEntrySpan; @@ -178,7 +179,8 @@ private String header(String name) { * arn:aws:apigateway:{region}::/restapis/{api-id} Format for v2 HTTP: * arn:aws:apigateway:{region}::/apis/{api-id} */ - private String computeArn(String proxySystem, String region, String apiId) { + @VisibleForTesting + String computeArn(String proxySystem, String region, String apiId) { if (proxySystem == null || region == null || apiId == null) { return null; } diff --git a/internal-api/src/test/java/datadog/trace/api/gateway/InferredProxySpanTests.java b/internal-api/src/test/java/datadog/trace/api/gateway/InferredProxySpanTests.java index c9adcb83551..8463136c63b 100644 --- a/internal-api/src/test/java/datadog/trace/api/gateway/InferredProxySpanTests.java +++ b/internal-api/src/test/java/datadog/trace/api/gateway/InferredProxySpanTests.java @@ -5,15 +5,20 @@ import static datadog.trace.api.gateway.InferredProxySpan.PROXY_SYSTEM; import static datadog.trace.api.gateway.InferredProxySpan.fromContext; import static datadog.trace.api.gateway.InferredProxySpan.fromHeaders; +import static datadog.trace.bootstrap.instrumentation.api.ErrorPriorities.HTTP_SERVER_DECORATOR; import static datadog.trace.bootstrap.instrumentation.api.Tags.HTTP_REQUEST_HEADERS_X_DATADOG_ENDPOINT_SCAN; import static datadog.trace.bootstrap.instrumentation.api.Tags.HTTP_REQUEST_HEADERS_X_DATADOG_SECURITY_TEST; +import static datadog.trace.bootstrap.instrumentation.api.Tags.HTTP_USER_AGENT; import static java.util.Collections.emptyMap; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.params.provider.Arguments.of; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -576,6 +581,40 @@ void testFinishWithAllHeaders() { inferredProxySpan.finish(); } + @Test + @DisplayName("optional API Gateway metadata should exercise ARN tag computation") + void testStartWithOptionalApiGatewayMetadata() { + Map headers = new HashMap<>(); + headers.put(PROXY_START_TIME_MS, "12345"); + headers.put(PROXY_SYSTEM, "aws-apigateway"); + headers.put(InferredProxySpan.PROXY_HTTP_METHOD, "GET"); + headers.put(InferredProxySpan.PROXY_PATH, "/api/users/123"); + headers.put(InferredProxySpan.PROXY_API_ID, "api-id"); + headers.put(InferredProxySpan.PROXY_REGION, "us-east-1"); + headers.put(InferredProxySpan.PROXY_ACCOUNT_ID, "123456789012"); + + InferredProxySpan inferredProxySpan = fromHeaders(headers); + assertNotNull(inferredProxySpan.start(null)); + + inferredProxySpan.finish(); + } + + @Test + @DisplayName("computeArn should support known proxy systems and reject unknown input") + void testComputeArn() { + InferredProxySpan inferredProxySpan = fromHeaders(null); + + assertEquals( + "arn:aws:apigateway:us-east-1::/restapis/api-id", + inferredProxySpan.computeArn("aws-apigateway", "us-east-1", "api-id")); + assertEquals( + "arn:aws:apigateway:us-east-1::/apis/api-id", + inferredProxySpan.computeArn("aws-httpapi", "us-east-1", "api-id")); + assertNull(inferredProxySpan.computeArn("unknown", "us-east-1", "api-id")); + assertNull(inferredProxySpan.computeArn("aws-apigateway", null, "api-id")); + assertNull(inferredProxySpan.computeArn("aws-apigateway", "us-east-1", null)); + } + @Test @DisplayName("Multiple InferredProxySpan instances should finish independently") void testMultipleProxySpansFinishIndependently() { @@ -616,6 +655,7 @@ void testFinishForwardsSecurityTestingHeaders() throws Exception { // Replace the real (noop) inferred span with a mock we can verify against. Drive through // the public finish() API so the test stays valid if the internal copy-helper is renamed. AgentSpan mockInferredSpan = mock(AgentSpan.class); + // Keep this reflected field name in sync with InferredProxySpan.span. Field spanField = InferredProxySpan.class.getDeclaredField("span"); spanField.setAccessible(true); spanField.set(inferredProxySpan, mockInferredSpan); @@ -632,4 +672,52 @@ void testFinishForwardsSecurityTestingHeaders() throws Exception { verify(mockInferredSpan).setTag(HTTP_REQUEST_HEADERS_X_DATADOG_ENDPOINT_SCAN, "scan-uuid"); verify(mockInferredSpan).setTag(HTTP_REQUEST_HEADERS_X_DATADOG_SECURITY_TEST, "test-uuid"); } + + @Test + @DisplayName("finish should phase child calls and publish after service-entry completion") + void testFinishPhasesChildCallAndPublishesOnServiceEntry() throws Exception { + InferredProxySpan inferredProxySpan = fromHeaders(validHeaders()); + + AgentSpan inferredSpan = mock(AgentSpan.class); + inferredProxySpan.span = inferredSpan; + + AgentSpan childSpan = mock(AgentSpan.class); + when(childSpan.getTag("_dd.appsec.enabled")).thenReturn(Boolean.TRUE); + when(childSpan.getTag("_dd.appsec.json")).thenReturn("{\"triggers\":[]}"); + + AgentSpan serviceEntrySpan = mock(AgentSpan.class); + when(serviceEntrySpan.getHttpStatusCode()).thenReturn((short) 503); + when(serviceEntrySpan.getTag(HTTP_USER_AGENT)).thenReturn("curl/8.0"); + when(serviceEntrySpan.getTag(HTTP_REQUEST_HEADERS_X_DATADOG_ENDPOINT_SCAN)) + .thenReturn("scan-uuid"); + when(serviceEntrySpan.getTag(HTTP_REQUEST_HEADERS_X_DATADOG_SECURITY_TEST)) + .thenReturn("test-uuid"); + + inferredProxySpan.registerServiceEntrySpan(serviceEntrySpan); + + inferredProxySpan.finish(childSpan); + inferredProxySpan.finish(childSpan); + verify(inferredSpan).setMetric("_dd.appsec.enabled", 1); + verify(inferredSpan).setTag("_dd.appsec.json", "{\"triggers\":[]}"); + verify(inferredSpan, times(1)).phasedFinish(); + verify(inferredSpan, never()).finish(); + verify(inferredSpan, never()).publish(); + + inferredProxySpan.finish(serviceEntrySpan); + + verify(inferredSpan).setHttpStatusCode(503); + verify(inferredSpan).setError(true, HTTP_SERVER_DECORATOR); + verify(inferredSpan).setTag(HTTP_USER_AGENT, "curl/8.0"); + verify(inferredSpan).setTag(HTTP_REQUEST_HEADERS_X_DATADOG_ENDPOINT_SCAN, "scan-uuid"); + verify(inferredSpan).setTag(HTTP_REQUEST_HEADERS_X_DATADOG_SECURITY_TEST, "test-uuid"); + verify(inferredSpan).publish(); + verify(inferredSpan, never()).finish(); + } + + private static Map validHeaders() { + Map headers = new HashMap<>(); + headers.put(PROXY_START_TIME_MS, "12345"); + headers.put(PROXY_SYSTEM, "aws-apigateway"); + return headers; + } } diff --git a/internal-api/src/test/java/datadog/trace/api/gateway/InstrumentationGatewayTest.java b/internal-api/src/test/java/datadog/trace/api/gateway/InstrumentationGatewayTest.java index 4767a0051b9..145b3b117f6 100644 --- a/internal-api/src/test/java/datadog/trace/api/gateway/InstrumentationGatewayTest.java +++ b/internal-api/src/test/java/datadog/trace/api/gateway/InstrumentationGatewayTest.java @@ -17,6 +17,7 @@ import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import datadog.trace.bootstrap.instrumentation.api.ClientIpAddressData; import java.util.Collections; +import java.util.Map; import java.util.function.BiConsumer; import java.util.function.BiFunction; import java.util.function.Function; @@ -169,6 +170,26 @@ public void testRequestBlockingAction() { assertEquals("https://www.google.com/", rba.getExtraHeaders().get("Location")); } + @Test + public void blockResponseFunctionDefaultMethodDelegatesRequestBlockingAction() { + TraceSegment segment = TraceSegment.NoOp.INSTANCE; + Flow.Action.RequestBlockingAction action = + new Flow.Action.RequestBlockingAction( + 451, + BlockingContentType.JSON, + Collections.singletonMap("x-blocked", "true"), + "security-response-id"); + + CapturingBlockResponseFunction blockResponseFunction = new CapturingBlockResponseFunction(); + + assertTrue(blockResponseFunction.tryCommitBlockingResponse(segment, action)); + assertSame(segment, blockResponseFunction.segment); + assertEquals(451, blockResponseFunction.statusCode); + assertEquals(BlockingContentType.JSON, blockResponseFunction.templateType); + assertEquals("true", blockResponseFunction.extraHeaders.get("x-blocked")); + assertEquals("security-response-id", blockResponseFunction.securityResponseId); + } + @Test public void testNormalCalls() { // check that we pass through normal calls @@ -564,6 +585,29 @@ public Flow apply(RequestContext requestContext, T t, T t2) { } } + private static final class CapturingBlockResponseFunction implements BlockResponseFunction { + private TraceSegment segment; + private int statusCode; + private BlockingContentType templateType; + private Map extraHeaders; + private String securityResponseId; + + @Override + public boolean tryCommitBlockingResponse( + TraceSegment segment, + int statusCode, + BlockingContentType templateType, + Map extraHeaders, + String securityResponseId) { + this.segment = segment; + this.statusCode = statusCode; + this.templateType = templateType; + this.extraHeaders = extraHeaders; + this.securityResponseId = securityResponseId; + return true; + } + } + private static class Throwback implements Supplier>, BiConsumer, diff --git a/internal-api/src/test/java/datadog/trace/api/telemetry/ScaReachabilityDependencyRegistryTest.java b/internal-api/src/test/java/datadog/trace/api/telemetry/ScaReachabilityDependencyRegistryTest.java index ddf61e0ad38..3d022cc9144 100644 --- a/internal-api/src/test/java/datadog/trace/api/telemetry/ScaReachabilityDependencyRegistryTest.java +++ b/internal-api/src/test/java/datadog/trace/api/telemetry/ScaReachabilityDependencyRegistryTest.java @@ -115,6 +115,54 @@ void registerCve_addsEntryAndMarksPending() { assertNull(dep.cves.get(0).hit, "class-load registration has no callsite yet"); } + @Test + void recordHit_snapshotContainsFullHitMetadata() { + ScaReachabilityDependencyRegistry.INSTANCE.recordHit( + "com.example:lib", "2.0.0", "GHSA-0001", "com.myapp.Ctrl", "handle", 42); + + List snapshots = + ScaReachabilityDependencyRegistry.INSTANCE.drainPendingDependencies(); + + assertEquals(1, snapshots.size()); + ScaReachabilityDependencyRegistry.DependencySnapshot dep = snapshots.get(0); + assertEquals("com.example:lib", dep.artifact); + assertEquals("2.0.0", dep.version); + assertEquals(1, dep.cves.size()); + + ScaReachabilityDependencyRegistry.CveSnapshot cve = dep.cves.get(0); + assertEquals("GHSA-0001", cve.vulnId); + assertNotNull(cve.hit); + assertEquals("GHSA-0001", cve.hit.vulnId()); + assertEquals("com.example:lib", cve.hit.artifact()); + assertEquals("2.0.0", cve.hit.version()); + assertEquals("com.myapp.Ctrl", cve.hit.className()); + assertEquals("handle", cve.hit.symbolName()); + assertEquals(42, cve.hit.line()); + } + + @Test + void peekSnapshot_returnsCurrentStateWithoutClearingPendingFlag() { + assertNull(ScaReachabilityDependencyRegistry.INSTANCE.peekSnapshot("missing", "1.0.0")); + + ScaReachabilityDependencyRegistry.INSTANCE.registerCve("com.example:lib", "2.0.0", "GHSA-0001"); + ScaReachabilityDependencyRegistry.INSTANCE.recordHit( + "com.example:lib", "2.0.0", "GHSA-0001", "com.myapp.Ctrl", "handle", 42); + + ScaReachabilityDependencyRegistry.DependencySnapshot peeked = + ScaReachabilityDependencyRegistry.INSTANCE.peekSnapshot("com.example:lib", "2.0.0"); + + assertNotNull(peeked); + assertEquals("com.example:lib", peeked.artifact); + assertEquals("2.0.0", peeked.version); + assertEquals(1, peeked.cves.size()); + assertEquals("GHSA-0001", peeked.cves.get(0).vulnId); + assertNotNull(peeked.cves.get(0).hit); + + List snapshots = + ScaReachabilityDependencyRegistry.INSTANCE.drainPendingDependencies(); + assertEquals(1, snapshots.size(), "peek must not clear pending state"); + } + @Test void drainPendingDependencies_secondDrainEmpty_untilNewHit() { ScaReachabilityDependencyRegistry.INSTANCE.registerCve("com.example:lib", "2.0.0", "GHSA-0001"); @@ -138,6 +186,26 @@ void drainPendingDependencies_secondDrainEmpty_untilNewHit() { assertNotNull(third.get(0).cves.get(0).hit, "hit callsite must be recorded"); } + @Test + void recordHit_firstHitWinsAndDuplicateDoesNotMarkPendingAgain() { + ScaReachabilityDependencyRegistry.INSTANCE.recordHit( + "com.example:lib", "2.0.0", "GHSA-0001", "com.myapp.First", "first", 1); + ScaReachabilityDependencyRegistry.INSTANCE.drainPendingDependencies(); + + ScaReachabilityDependencyRegistry.INSTANCE.recordHit( + "com.example:lib", "2.0.0", "GHSA-0001", "com.myapp.Second", "second", 2); + + assertTrue( + ScaReachabilityDependencyRegistry.INSTANCE.drainPendingDependencies().isEmpty(), + "duplicate hit for the same CVE must not mark the dependency pending"); + + ScaReachabilityDependencyRegistry.DependencySnapshot snapshot = + ScaReachabilityDependencyRegistry.INSTANCE.peekSnapshot("com.example:lib", "2.0.0"); + assertNotNull(snapshot); + assertEquals("com.myapp.First", snapshot.cves.get(0).hit.className()); + assertEquals("first", snapshot.cves.get(0).hit.symbolName()); + } + @Test void registerCve_atCap_newKeysRejected() { int cap = Config.get().getAppSecScaMaxTrackedDependencies(); @@ -177,6 +245,30 @@ void registerCve_atCap_existingKeyStillUpdated() { assertEquals(2, snapshots.get(0).cves.size(), "both CVEs must be present"); } + @Test + void recordHit_atCap_newKeysRejectedButExistingKeyStillUpdated() { + int cap = Config.get().getAppSecScaMaxTrackedDependencies(); + + for (int i = 0; i < cap; i++) { + ScaReachabilityDependencyRegistry.INSTANCE.registerCve("art" + i, "1.0", "GHSA-" + i); + } + ScaReachabilityDependencyRegistry.INSTANCE.drainPendingDependencies(); + + ScaReachabilityDependencyRegistry.INSTANCE.recordHit( + "art-over-cap", "1.0", "GHSA-over", "com.myapp.Ctrl", "handle", 42); + assertTrue( + ScaReachabilityDependencyRegistry.INSTANCE.drainPendingDependencies().isEmpty(), + "over-cap hit for a new dependency must be rejected"); + + ScaReachabilityDependencyRegistry.INSTANCE.recordHit( + "art0", "1.0", "GHSA-0", "com.myapp.Ctrl", "handle", 42); + List snapshots = + ScaReachabilityDependencyRegistry.INSTANCE.drainPendingDependencies(); + assertEquals(1, snapshots.size(), "existing dependency can still be updated at cap"); + assertEquals("art0", snapshots.get(0).artifact); + assertNotNull(snapshots.get(0).cves.get(0).hit); + } + @Test void resetForTesting_clearsPeriodicWorkCallback() { ScaReachabilityDependencyRegistry.INSTANCE.setPeriodicWorkCallback(() -> {}); From ba6d7c62a0b08aefc0818dd33ab29915521aafab Mon Sep 17 00:00:00 2001 From: Brice Dutheil Date: Tue, 30 Jun 2026 14:09:04 +0200 Subject: [PATCH 091/139] Add `ProtocolVersion` tests and exclude specific classes from coverage (#11801) chore(api): Exclude AIGuard and LLMObs class from coverage test(api): Add tests for 128-bit trace IDs and protocol versions test(api): Remove 128-bit trace IDs test, better equivalent in #11802 Co-authored-by: devflow.devflow-routing-intake --- dd-trace-api/build.gradle.kts | 7 ++++ .../trace/api/ProtocolVersionTest.java | 34 +++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/dd-trace-api/build.gradle.kts b/dd-trace-api/build.gradle.kts index 4063701bf5a..9716588d34e 100644 --- a/dd-trace-api/build.gradle.kts +++ b/dd-trace-api/build.gradle.kts @@ -26,6 +26,10 @@ extra["excludedClassesCoverage"] = listOf( "datadog.trace.api.aiguard.AIGuard", "datadog.trace.api.aiguard.AIGuard.AIGuardAbortError", "datadog.trace.api.aiguard.AIGuard.AIGuardClientError", + "datadog.trace.api.aiguard.AIGuard.ContentPart", + "datadog.trace.api.aiguard.AIGuard.ContentPart.Type", + "datadog.trace.api.aiguard.AIGuard.Evaluation", + "datadog.trace.api.aiguard.AIGuard.Message", "datadog.trace.api.aiguard.AIGuard.Options", "datadog.trace.api.civisibility.CIVisibility", "datadog.trace.api.civisibility.DDTestModule", @@ -43,8 +47,10 @@ extra["excludedClassesCoverage"] = listOf( "datadog.trace.api.profiling.ProfilingContext", "datadog.trace.api.profiling.ProfilingContextAttribute.NoOp", "datadog.trace.api.llmobs.LLMObs", + "datadog.trace.api.llmobs.LLMObs.Document", "datadog.trace.api.llmobs.LLMObs.LLMMessage", "datadog.trace.api.llmobs.LLMObs.ToolCall", + "datadog.trace.api.llmobs.LLMObs.ToolResult", "datadog.trace.api.llmobs.LLMObsSpan", "datadog.trace.api.llmobs.noop.NoOpLLMObsSpan", "datadog.trace.api.llmobs.noop.NoOpLLMObsSpanFactory", @@ -63,6 +69,7 @@ extra["excludedClassesCoverage"] = listOf( "datadog.trace.payloadtags.PayloadTagsData", "datadog.trace.payloadtags.PayloadTagsData.PathAndValue", "datadog.trace.api.llmobs.LLMObsTags", + "datadog.trace.api.config.OtlpConfig.Compression", "datadog.trace.api.config.OtlpConfig.Protocol", "datadog.trace.api.config.OtlpConfig.Temporality", ) diff --git a/dd-trace-api/src/test/java/datadog/trace/api/ProtocolVersionTest.java b/dd-trace-api/src/test/java/datadog/trace/api/ProtocolVersionTest.java index 92d42691f37..18d14322388 100644 --- a/dd-trace-api/src/test/java/datadog/trace/api/ProtocolVersionTest.java +++ b/dd-trace-api/src/test/java/datadog/trace/api/ProtocolVersionTest.java @@ -3,15 +3,28 @@ import static datadog.trace.api.ProtocolVersion.V0_4; import static datadog.trace.api.ProtocolVersion.V0_5; import static datadog.trace.api.ProtocolVersion.V1_0; +import static datadog.trace.api.ProtocolVersion.fromConfigValue; +import static datadog.trace.api.ProtocolVersion.fromTraceEndpoint; import static java.util.Arrays.asList; import static java.util.Collections.singletonList; import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +@DisplayName("trace agent protocol versions") class ProtocolVersionTest { @Test + @DisplayName("expose configuration values") + void exposesConfigValues() { + assertEquals("0.4", V0_4.asConfigValue()); + assertEquals("0.5", V0_5.asConfigValue()); + assertEquals("1.0", V1_0.asConfigValue()); + } + + @Test + @DisplayName("expose primary endpoints and fallbacks") void exposesPrimaryEndpointAndFallbacks() { assertEquals("v0.4/traces", V0_4.endpoint()); assertEquals(singletonList("v0.3/traces"), V0_4.fallback()); @@ -24,9 +37,30 @@ void exposesPrimaryEndpointAndFallbacks() { } @Test + @DisplayName("preserve endpoint probe ordering") void preservesProbeOrdering() { assertEquals(asList("v0.4/traces", "v0.3/traces"), V0_4.endpointsToProbe()); assertEquals(asList("v0.5/traces", "v0.4/traces", "v0.3/traces"), V0_5.endpointsToProbe()); assertEquals(asList("v1.0/traces", "v0.4/traces", "v0.3/traces"), V1_0.endpointsToProbe()); } + + @Test + @DisplayName("map configuration values to protocol versions") + void mapsConfigValueToVersion() { + assertEquals(V0_4, fromConfigValue(null)); + assertEquals(V0_4, fromConfigValue("0.4")); + assertEquals(V0_5, fromConfigValue("0.5")); + assertEquals(V1_0, fromConfigValue("1.0")); + assertEquals(V0_4, fromConfigValue("unsupported")); + } + + @Test + @DisplayName("map trace endpoints to protocol versions") + void mapsTraceEndpointToVersion() { + assertEquals(V0_4, fromTraceEndpoint(null)); + assertEquals(V1_0, fromTraceEndpoint("http://localhost:8126/v1.0/traces")); + assertEquals(V0_5, fromTraceEndpoint("HTTP://LOCALHOST:8126/V0.5/TRACES")); + assertEquals(V0_4, fromTraceEndpoint("v0.4/traces")); + assertEquals(V0_4, fromTraceEndpoint("http://localhost:8126/unsupported")); + } } From eaad3c1a70a9520fa4d170c1b56375b4c022ba84 Mon Sep 17 00:00:00 2001 From: "Santiago M. Mola" Date: Tue, 30 Jun 2026 14:20:49 +0200 Subject: [PATCH 092/139] Add MessageAdapter content parts serialization test coverage (#11800) Add MessageAdapter content parts serialization test coverage Co-authored-by: santiago.mola --- .../aiguard/AIGuardInternalTests.groovy | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dd-java-agent/agent-aiguard/src/test/groovy/com/datadog/aiguard/AIGuardInternalTests.groovy b/dd-java-agent/agent-aiguard/src/test/groovy/com/datadog/aiguard/AIGuardInternalTests.groovy index 406b16c7025..e355b2eec3c 100644 --- a/dd-java-agent/agent-aiguard/src/test/groovy/com/datadog/aiguard/AIGuardInternalTests.groovy +++ b/dd-java-agent/agent-aiguard/src/test/groovy/com/datadog/aiguard/AIGuardInternalTests.groovy @@ -861,6 +861,28 @@ class AIGuardInternalTests extends DDSpecification { } } + void 'test adapter serializes content parts'() { + given: + final adapter = new Moshi.Builder().add(new AIGuardInternal.AIGuardFactory()).build() + .adapter(AIGuard.Message) + + expect: + // STRICT enforces array element ordering (object key order is always ignored), so a regression + // that serialized the content parts out of sequence would be caught here + JSONAssert.assertEquals(expected, adapter.toJson(message), JSONCompareMode.STRICT) + + where: + message | expected + AIGuard.Message.message('user', [] as List) | '{"role": "user", "content": []}' + AIGuard.Message.message('user', [AIGuard.ContentPart.text('Hello world')]) | '{"role": "user", "content": [{"type": "text", "text": "Hello world"}]}' + AIGuard.Message.message('user', [AIGuard.ContentPart.imageUrl('https://example.com/image.jpg')]) | '{"role": "user", "content": [{"type": "image_url", "image_url": {"url": "https://example.com/image.jpg"}}]}' + AIGuard.Message.message('user', [ + AIGuard.ContentPart.text('Describe this image:'), + AIGuard.ContentPart.imageUrl('https://example.com/image.jpg'), + AIGuard.ContentPart.text('What do you see?') + ]) | '{"role": "user", "content": [{"type": "text", "text": "Describe this image:"}, {"type": "image_url", "image_url": {"url": "https://example.com/image.jpg"}}, {"type": "text", "text": "What do you see?"}]}' + } + void 'test backward compatibility with string content'() { given: final aiguard = mockClient(200, [data: [attributes: [action: 'ALLOW', reason: 'Good']]]) From b0cb50ff6ecc4582afd99e32c053617b3291cd02 Mon Sep 17 00:00:00 2001 From: Douglas Q Hawkins Date: Tue, 30 Jun 2026 08:50:49 -0400 Subject: [PATCH 093/139] Remove default methods from CoreSpan; implement them in test doubles (#11782) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Exclude CoreSpan from coverage — all default methods are overridden by DDSpan The four defaults (getServiceNameSource, isKind, unsafeGetTag x2) are unreachable in practice; DDSpan overrides each with a different implementation. Co-Authored-By: Claude Sonnet 4.6 Remove default methods from CoreSpan; implement them in test doubles The four defaults (getServiceNameSource, isKind, unsafeGetTag x2) were unreachable in practice because DDSpan overrides each one. Making them abstract forces test implementations to be explicit, and coverage is satisfied by the concrete implementations rather than unreachable defaults. Co-Authored-By: Claude Sonnet 4.6 fix: implement CoreSpan methods in traceAgentTest Co-authored-by: bric3 Co-authored-by: brice.dutheil --- .../java/datadog/trace/core/CoreSpan.java | 18 ++++----------- .../trace/common/metrics/SimpleSpan.groovy | 10 ++++++++ .../trace/common/writer/TraceGenerator.java | 23 +++++++++++++++++++ .../groovy/TraceGenerator.groovy | 23 +++++++++++++++++++ 4 files changed, 60 insertions(+), 14 deletions(-) diff --git a/dd-trace-core/src/main/java/datadog/trace/core/CoreSpan.java b/dd-trace-core/src/main/java/datadog/trace/core/CoreSpan.java index a6ced35967c..4d0d8c87f99 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/CoreSpan.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/CoreSpan.java @@ -1,7 +1,6 @@ package datadog.trace.core; import datadog.trace.api.DDTraceId; -import datadog.trace.bootstrap.instrumentation.api.Tags; import java.util.Map; public interface CoreSpan> { @@ -10,9 +9,7 @@ public interface CoreSpan> { String getServiceName(); - default CharSequence getServiceNameSource() { - return null; - } + CharSequence getServiceNameSource(); CharSequence getOperationName(); @@ -62,13 +59,9 @@ default CharSequence getServiceNameSource() { U getTag(CharSequence name); - default U unsafeGetTag(CharSequence name, U defaultValue) { - return getTag(name, defaultValue); - } + U unsafeGetTag(CharSequence name, U defaultValue); - default U unsafeGetTag(CharSequence name) { - return getTag(name); - } + U unsafeGetTag(CharSequence name); boolean hasSamplingPriority(); @@ -81,10 +74,7 @@ default U unsafeGetTag(CharSequence name) { boolean isForceKeep(); - default boolean isKind(SpanKindFilter filter) { - Object kind = unsafeGetTag(Tags.SPAN_KIND); - return filter.matches(kind == null ? null : kind.toString()); - } + boolean isKind(SpanKindFilter filter); CharSequence getType(); diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/metrics/SimpleSpan.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/metrics/SimpleSpan.groovy index 2fd8554d499..f23045856ef 100644 --- a/dd-trace-core/src/test/groovy/datadog/trace/common/metrics/SimpleSpan.groovy +++ b/dd-trace-core/src/test/groovy/datadog/trace/common/metrics/SimpleSpan.groovy @@ -199,6 +199,16 @@ class SimpleSpan implements CoreSpan { return getTag(name, null) } + @Override + U unsafeGetTag(CharSequence name, U defaultValue) { + return getTag(name, defaultValue) + } + + @Override + U unsafeGetTag(CharSequence name) { + return getTag(name) + } + @Override boolean hasSamplingPriority() { return false diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/TraceGenerator.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/TraceGenerator.java index 618b2ef77ae..00610ddbb61 100644 --- a/dd-trace-core/src/test/java/datadog/trace/common/writer/TraceGenerator.java +++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/TraceGenerator.java @@ -11,10 +11,12 @@ import datadog.trace.api.TagMap; import datadog.trace.api.sampling.PrioritySampling; import datadog.trace.bootstrap.instrumentation.api.AgentSpanLink; +import datadog.trace.bootstrap.instrumentation.api.Tags; import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString; import datadog.trace.core.CoreSpan; import datadog.trace.core.Metadata; import datadog.trace.core.MetadataConsumer; +import datadog.trace.core.SpanKindFilter; import java.math.BigDecimal; import java.math.BigInteger; import java.util.ArrayList; @@ -502,5 +504,26 @@ public PojoSpan setMetaStruct(String field, Object value) { public int getLongRunningVersion() { return 0; } + + @Override + public CharSequence getServiceNameSource() { + return null; + } + + @Override + public boolean isKind(SpanKindFilter filter) { + Object kind = unsafeGetTag(Tags.SPAN_KIND); + return filter.matches(kind == null ? null : kind.toString()); + } + + @Override + public U unsafeGetTag(CharSequence name, U defaultValue) { + return getTag(name, defaultValue); + } + + @Override + public U unsafeGetTag(CharSequence name) { + return getTag(name); + } } } diff --git a/dd-trace-core/src/traceAgentTest/groovy/TraceGenerator.groovy b/dd-trace-core/src/traceAgentTest/groovy/TraceGenerator.groovy index e668d0112a6..8477ad00df3 100644 --- a/dd-trace-core/src/traceAgentTest/groovy/TraceGenerator.groovy +++ b/dd-trace-core/src/traceAgentTest/groovy/TraceGenerator.groovy @@ -1,6 +1,7 @@ import static datadog.trace.api.ProcessTags.tagsForSerialization import static datadog.trace.api.TagMap.fromMap import static datadog.trace.api.sampling.PrioritySampling.UNSET +import static datadog.trace.bootstrap.instrumentation.api.Tags.SPAN_KIND import static java.lang.Thread.currentThread import static java.util.Collections.emptyList @@ -13,6 +14,7 @@ import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString import datadog.trace.core.CoreSpan import datadog.trace.core.Metadata import datadog.trace.core.MetadataConsumer +import datadog.trace.core.SpanKindFilter import java.util.concurrent.ThreadLocalRandom import java.util.concurrent.TimeUnit @@ -173,6 +175,11 @@ class TraceGenerator { return serviceName } + @Override + CharSequence getServiceNameSource() { + return null + } + @Override CharSequence getOperationName() { return operationName @@ -298,6 +305,12 @@ class TraceGenerator { return false } + @Override + boolean isKind(SpanKindFilter filter) { + Object kind = unsafeGetTag(SPAN_KIND) + return filter.matches(kind == null ? null : kind.toString()) + } + Map getBaggage() { return metadata.getBaggage() } @@ -394,6 +407,16 @@ class TraceGenerator { return value as U } + @Override + U unsafeGetTag(CharSequence name, U defaultValue) { + return getTag(name, defaultValue) + } + + @Override + U unsafeGetTag(CharSequence name) { + return getTag(name) + } + @Override boolean hasSamplingPriority() { return false From d7c22a52c248a5bc02b7647c8187407260537cf6 Mon Sep 17 00:00:00 2001 From: Brice Dutheil Date: Tue, 30 Jun 2026 15:46:48 +0200 Subject: [PATCH 094/139] chore(telemetry): Exclude `OtelSpiMetricPeriodicAction` from coverage (#11806) --- telemetry/build.gradle.kts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/telemetry/build.gradle.kts b/telemetry/build.gradle.kts index 9484dedc0a1..c6e72af33ed 100644 --- a/telemetry/build.gradle.kts +++ b/telemetry/build.gradle.kts @@ -17,7 +17,8 @@ extra["excludedClassesCoverage"] = listOf( "datadog.telemetry.RequestBuilderSupplier", "datadog.telemetry.TelemetrySystem", "datadog.telemetry.api.*", - "datadog.telemetry.metric.CiVisibilityMetricPeriodicAction" + "datadog.telemetry.metric.CiVisibilityMetricPeriodicAction", + "datadog.telemetry.metric.OtelSpiMetricPeriodicAction" ) extra["excludedClassesBranchCoverage"] = listOf( "datadog.telemetry.PolymorphicAdapterFactory.1", From 04ea23af81f738f81dc0f75ecbd99e83f9ab1d6a Mon Sep 17 00:00:00 2001 From: Brice Dutheil Date: Tue, 30 Jun 2026 18:42:24 +0200 Subject: [PATCH 095/139] Enable coverage when `testJvm` same as Gradle Daemon JDK or with `checkCoverage` property (#11764) fix(build): Enable coverge when asked for it fix(build): Also, enable coverage if testJvm is the same as daemon JDK Merge branch 'master' into bdu/enable-coverage-when-asked-for-it Merge branch 'master' into bdu/enable-coverage-when-asked-for-it Merge branch 'master' into bdu/enable-coverage-when-asked-for-it Merge branch 'master' into bdu/enable-coverage-when-asked-for-it Co-authored-by: amarziali Co-authored-by: brice.dutheil --- .../TestJvmConstraintsPlugin.kt | 22 ++++++--- .../TestJvmConstraintsPluginTest.kt | 49 +++++++++++++++++++ 2 files changed, 65 insertions(+), 6 deletions(-) diff --git a/buildSrc/src/main/kotlin/datadog/gradle/plugin/testJvmConstraints/TestJvmConstraintsPlugin.kt b/buildSrc/src/main/kotlin/datadog/gradle/plugin/testJvmConstraints/TestJvmConstraintsPlugin.kt index e6465064015..02d1c0d0a9a 100644 --- a/buildSrc/src/main/kotlin/datadog/gradle/plugin/testJvmConstraints/TestJvmConstraintsPlugin.kt +++ b/buildSrc/src/main/kotlin/datadog/gradle/plugin/testJvmConstraints/TestJvmConstraintsPlugin.kt @@ -45,12 +45,10 @@ class TestJvmConstraintsPlugin : Plugin { // Jacoco plugin is not applied on every project project.pluginManager.withPlugin("org.gradle.jacoco") { project.tasks.withType().configureEach { - // Disable jacoco for additional 'testJvm' tests to speed things up a bit - if (testJvmSpec.javaTestLauncher.isPresent) { - extensions.configure { - isEnabled = false - } - } + configureJacocoForAdditionalTestJvm( + testJvmSpec.javaTestLauncher.isPresent, + project.rootProject.providers.gradleProperty("checkCoverage").isPresent + ) } } } @@ -153,3 +151,15 @@ class TestJvmConstraintsPlugin : Plugin { taskExtension.nativeImageCapable.convention(projectExtension.nativeImageCapable) } } + +internal fun Test.configureJacocoForAdditionalTestJvm( + hasAdditionalTestJvmLauncher: Boolean, + checkCoverage: Boolean +) { + // Disable jacoco for additional 'testJvm' tests unless coverage was explicitly requested. + if (hasAdditionalTestJvmLauncher && !checkCoverage) { + extensions.configure { + isEnabled = false + } + } +} diff --git a/buildSrc/src/test/kotlin/datadog/gradle/plugin/testJvmConstraints/TestJvmConstraintsPluginTest.kt b/buildSrc/src/test/kotlin/datadog/gradle/plugin/testJvmConstraints/TestJvmConstraintsPluginTest.kt index aa05e0ef01d..438da18f92b 100644 --- a/buildSrc/src/test/kotlin/datadog/gradle/plugin/testJvmConstraints/TestJvmConstraintsPluginTest.kt +++ b/buildSrc/src/test/kotlin/datadog/gradle/plugin/testJvmConstraints/TestJvmConstraintsPluginTest.kt @@ -4,6 +4,7 @@ import datadog.gradle.plugin.testJvmConstraints.TestJvmConstraintsExtension.Comp import org.assertj.core.api.Assertions.assertThat import org.gradle.api.tasks.testing.Test as GradleTest import org.gradle.testfixtures.ProjectBuilder +import org.gradle.testing.jacoco.plugins.JacocoTaskExtension import org.junit.jupiter.api.Test class TestJvmConstraintsPluginTest { @@ -19,4 +20,52 @@ class TestJvmConstraintsPluginTest { assertThat(project.extensions.findByName(TEST_JVM_CONSTRAINTS)).isInstanceOf(TestJvmConstraintsExtension::class.java) assertThat(testTask.extensions.findByName(TEST_JVM_CONSTRAINTS)).isInstanceOf(TestJvmConstraintsExtension::class.java) } + + @Test + fun `jacoco is disabled for additional test jvm when coverage is not checked`() { + val testTask = testTaskWithJacoco() + + testTask.configureJacocoForAdditionalTestJvm( + hasAdditionalTestJvmLauncher = true, + checkCoverage = false + ) + + assertThat(jacocoExtension(testTask).isEnabled).isFalse() + } + + @Test + fun `jacoco remains enabled for additional test jvm when coverage is checked`() { + val testTask = testTaskWithJacoco() + + testTask.configureJacocoForAdditionalTestJvm( + hasAdditionalTestJvmLauncher = true, + checkCoverage = true + ) + + assertThat(jacocoExtension(testTask).isEnabled).isTrue() + } + + @Test + fun `jacoco remains enabled when using the daemon jvm`() { + val testTask = testTaskWithJacoco() + + testTask.configureJacocoForAdditionalTestJvm( + hasAdditionalTestJvmLauncher = false, + checkCoverage = false + ) + + assertThat(jacocoExtension(testTask).isEnabled).isTrue() + } + + private fun testTaskWithJacoco(): GradleTest { + val project = ProjectBuilder.builder().build() + + project.pluginManager.apply("java") + project.pluginManager.apply("jacoco") + + return project.tasks.named("test", GradleTest::class.java).get() + } + + private fun jacocoExtension(testTask: GradleTest): JacocoTaskExtension = + testTask.extensions.getByType(JacocoTaskExtension::class.java) } From dd95ecc5f440436eda34ff94169cec85900abadd Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Tue, 30 Jun 2026 13:42:10 -0400 Subject: [PATCH 096/139] Allow Maven deployment to fail (#11756) Allow Maven deployment to fail Co-authored-by: sarah.chen --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1937d97cc70..b2996373742 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1238,6 +1238,7 @@ deploy_to_maven_central: # Do not deploy release candidate versions - if: '$CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+$/' when: on_success + allow_failure: true - when: manual allow_failure: true script: From 54c670f51098030e22ce4f9e8242fce89259115a Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Tue, 30 Jun 2026 14:47:29 -0400 Subject: [PATCH 097/139] Run all system test VMs on master and merge queue (#11788) Run all system tests VMs on master and mq Test system-tests branch Merge branch 'master' into sarahchen6/run-all-system-tests-on-mq Revert back to main system-tests branch Co-authored-by: sarah.chen --- .gitlab-ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b2996373742..bcd398822a9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -81,11 +81,16 @@ workflow: - if: '$CI_COMMIT_BRANCH =~ /^gh-readonly-queue\//' when: never - if: '$CI_COMMIT_BRANCH == "master"' + variables: + SYSTEM_TESTS_RUN_ALL_VMS: "true" auto_cancel: on_new_commit: none - if: '$CI_COMMIT_BRANCH =~ /^v[0-9]+\.[0-9]+\.[0-9]+$/' auto_cancel: on_new_commit: none + - if: '$CI_COMMIT_BRANCH =~ /^mq-working-branch-/' + variables: + SYSTEM_TESTS_RUN_ALL_VMS: "true" - when: always .test_matrix: &test_matrix From 561c3b941bbfce9ec5c87fecd419182f2637bb9e Mon Sep 17 00:00:00 2001 From: Douglas Q Hawkins Date: Tue, 30 Jun 2026 15:11:29 -0400 Subject: [PATCH 098/139] Overhaul map JMH benchmarks: remove thread contention and split by use case (#11679) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add threading-correct TagMap access microbenchmark Throughput microbenchmark for TagMap insert/getObject/getEntry over a representative HTTP-server tag set. All mutable state (the read map) lives in @State(Scope.Thread) so @Threads(8) runs measure TagMap rather than cross-thread contention on a shared map/counter/flyweight — the flaw that made earlier TagMap benchmarks misleading. Run config is baked into annotations (the me.champeau.jmh plugin ignores -Pjmh.* flags). Co-Authored-By: Claude Opus 4.8 Fix data race in UnsynchronizedMapBenchmark scaffolding index sharedLookupIndex was a plain static int incremented by all 8 JMH threads without synchronization — a data race that turned the get benchmarks into a contention measurement rather than a map measurement. Move the index to @State(Scope.Thread) so each thread has its own cursor, matching the approach used in TagMapAccessBenchmark. Co-Authored-By: Claude Sonnet 4.6 Wire -Pjmh.includes and -PtestJvm into internal-api JMH config Without this, -Pjmh.includes is silently ignored by the me.champeau.jmh plugin, requiring a full fat-jar build to run a single benchmark. -PtestJvm was also ignored for JMH execution, defaulting to the Gradle daemon JVM regardless of the requested version. Co-Authored-By: Claude Sonnet 4.6 Update UnsynchronizedMapBenchmark results with Java 17 numbers Re-run after fixing the shared-index data race, on Java 17 with correct per-thread scaffolding state. Co-Authored-By: Claude Sonnet 4.6 Update UnsynchronizedMapBenchmark prose to match Java 17 results The '2x faster construction' claim was stale — Java 17 numbers show ~40%. Also clarifies that LinkedHashMap's cost is purely at construction; gets and iteration are equivalent to HashMap. Co-Authored-By: Claude Sonnet 4.6 Add builder-style insert benchmarks and update results in TagMapAccessBenchmark Co-Authored-By: Claude Sonnet 4.6 Merge branch 'master' into dougqh/tagmap-access-benchmark Use @Fork(2) in TagMapAccessBenchmark; drop JMH gradle wiring leak Align TagMapAccessBenchmark with UnsynchronizedMapBenchmark at @Fork(2) for steadier numbers (results to be refreshed on the next run). Also revert the internal-api/build.gradle.kts -Pjmh.includes / -PtestJvm wiring, which belongs in its dedicated PR (#11703), not here. Co-Authored-By: Claude Opus 4.8 (1M context) Split map benchmarks into ImmutableMapBenchmark and SingleThreadedMapBenchmark Replace UnsynchronizedMapBenchmark with two classes that each pick the correct threading model for their use case (the @State scope can't vary by @Param, so one class can't host both): - ImmutableMapBenchmark: precomputed/read-mostly maps shared across threads (@State(Scope.Benchmark)) -- sharing is correct since read-only. get/iterate across HashMap, LinkedHashMap, TreeMap, TagMap. - SingleThreadedMapBenchmark: per-thread mutable lifecycle (@State(Scope.Thread)). create/clone + reads. Adds a Collections.synchronizedMap case to measure the uncontended synchronization tax (per-thread => bias never revoked); the unsynchronized HashMap get/iterate are the in-harness baseline. The biased- locking effect shows when comparing across JVM versions at stock flags. Also fixes a latent bug in the old iterate_linkedHashMap, which iterated TREE_MAP. Stale result blocks dropped; numbers pending a fresh multi-JVM run. Co-Authored-By: Claude Opus 4.8 (1M context) Add Map.copyOf case to ImmutableMapBenchmark; fix dangling Javadoc link - Add a Map.copyOf case (via CollectionUtils.tryMakeImmutableMap -> JDK MapN) to ImmutableMapBenchmark: get / get_sameKey / iterate. MapN is the agent's actual fixed-config-map representation and the honest immutable-map baseline. - Fix TagMapAccessBenchmark's @link to the deleted UnsynchronizedMapBenchmark -> SingleThreadedMapBenchmark (which now holds the clone cases). - Note that interned (_sameKey) lookups are the common tracer case (keys are typically interned tag-name constants). Co-Authored-By: Claude Opus 4.8 (1M context) Merge remote-tracking branch 'origin/master' into dougqh/tagmap-access-benchmark Fix clone_synchronizedHashMap to clone the synchronized map (not the plain one) Per Codex review: clone_synchronizedHashMap copied `hashMap`, unlike the other clone_* methods which copy their own structure. Copy `synchronizedHashMap` so it faithfully measures cloning the synchronized variant. Co-Authored-By: Claude Opus 4.8 (1M context) Use @Fork(5) for ImmutableMapBenchmark (JIT-bimodal copyOf path) get_copyOf* reaches MapN via interface dispatch and is bimodal across forks: get_copyOf_sameKey measured 1034M ±928M (90%) at @Fork(2) vs 1346M ±24M (1.8%) at @Fork(5). 5 forks resolves the two-clocks artifact. Co-Authored-By: Claude Opus 4.8 (1M context) Merge branch 'master' into dougqh/tagmap-access-benchmark Merge branch 'master' into dougqh/tagmap-access-benchmark Merge branch 'master' into dougqh/tagmap-access-benchmark Merge branch 'master' into dougqh/tagmap-access-benchmark Address review (bric3): rename copyOf benchmark arm to tracerImmutableMap The arm/field named 'copyOf' read like the JDK Map.copyOf method; rename to tracerImmutableMap (field + get_/iterate_ arms), matching tracerImmutableSet in ImmutableSetBenchmark. The Map.copyOf / tryMakeImmutableMap construction is unchanged -- only the benchmark identifier. Co-Authored-By: Claude Opus 4.8 Merge branch 'master' into dougqh/tagmap-access-benchmark Co-authored-by: devflow.devflow-routing-intake --- .../trace/api/TagMapAccessBenchmark.java | 168 ++++++++++ .../trace/util/ImmutableMapBenchmark.java | 202 ++++++++++++ .../util/SingleThreadedMapBenchmark.java | 222 +++++++++++++ .../util/UnsynchronizedMapBenchmark.java | 308 ------------------ 4 files changed, 592 insertions(+), 308 deletions(-) create mode 100644 internal-api/src/jmh/java/datadog/trace/api/TagMapAccessBenchmark.java create mode 100644 internal-api/src/jmh/java/datadog/trace/util/ImmutableMapBenchmark.java create mode 100644 internal-api/src/jmh/java/datadog/trace/util/SingleThreadedMapBenchmark.java delete mode 100644 internal-api/src/jmh/java/datadog/trace/util/UnsynchronizedMapBenchmark.java diff --git a/internal-api/src/jmh/java/datadog/trace/api/TagMapAccessBenchmark.java b/internal-api/src/jmh/java/datadog/trace/api/TagMapAccessBenchmark.java new file mode 100644 index 00000000000..de33c957e9a --- /dev/null +++ b/internal-api/src/jmh/java/datadog/trace/api/TagMapAccessBenchmark.java @@ -0,0 +1,168 @@ +package datadog.trace.api; + +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.TimeUnit; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.BenchmarkMode; +import org.openjdk.jmh.annotations.Fork; +import org.openjdk.jmh.annotations.Level; +import org.openjdk.jmh.annotations.Measurement; +import org.openjdk.jmh.annotations.Mode; +import org.openjdk.jmh.annotations.OutputTimeUnit; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.Threads; +import org.openjdk.jmh.annotations.Warmup; +import org.openjdk.jmh.infra.Blackhole; + +/** + * Throughput microbenchmark for the core {@link TagMap} access paths — insert (direct, via Ledger, + * and HashMap variants), raw-value read, and Entry read — over a representative HTTP-server-ish tag + * set. + * + *

Threading correctness. Runs at {@code @Threads(8)}. All shared state is + * immutable ({@link #NAMES}/{@link #VALUES}); every bit of mutable state lives in a + * {@code @State(Scope.Thread)} holder so threads never contend on a shared map, index, or reader + * flyweight. Earlier TagMap benchmarks shared a cross-thread counter/index, which turned the result + * into a contention measurement rather than a TagMap measurement — this layout avoids that. Indices + * are plain per-invocation locals. + * + *

Run configuration is baked into annotations rather than relying on {@code -Pjmh.*} flags + * (which the {@code me.champeau.jmh} plugin ignores). + * + *

Key findings (MacBook M1, 8 threads, Java 17): + * + *

    + *
  • get: TagMap ({@code getObject}/{@code getEntry} ~96M ops/s) is essentially on par + * with HashMap — the slight difference is noise. + *
  • insert: Direct {@code HashMap} put (65M) is faster than {@code TagMap} (52M) for + * plain insertion. However, if a builder pattern is required, {@code TagMap.Ledger} (41M) + * handily beats {@code HashMap} builder style — staging map + defensive copy (28M) — because + * it avoids the second allocation and second fill pass. + *
  • clone: See {@link datadog.trace.util.SingleThreadedMapBenchmark} — TagMap clone is + * ~4.6x faster than HashMap clone (295M vs 64M ops/s), which dominates span lifecycle costs. + *
+ * + * + * MacBook M1 with 8 threads (Java 17) + * + * Benchmark Mode Cnt Score Error Units + * TagMapAccessBenchmark.getEntry thrpt 5 95559437.524 ± 1381678.908 ops/s + * TagMapAccessBenchmark.getObject thrpt 5 95980166.452 ± 2217719.560 ops/s + * TagMapAccessBenchmark.insert thrpt 5 52523529.023 ± 1816998.150 ops/s + * TagMapAccessBenchmark.insert_hashMap thrpt 5 65344306.574 ± 4013136.530 ops/s + * TagMapAccessBenchmark.insert_hashMap_builderStyle thrpt 5 28057827.189 ± 1359655.664 ops/s + * TagMapAccessBenchmark.insert_via_ledger thrpt 5 41169656.095 ± 773264.754 ops/s + * + */ +@BenchmarkMode(Mode.Throughput) +@OutputTimeUnit(TimeUnit.SECONDS) +@Fork(2) +@Warmup(iterations = 3) +@Measurement(iterations = 5) +@Threads(8) +@State(Scope.Benchmark) +public class TagMapAccessBenchmark { + // a representative HTTP-server-ish tag set (immutable -> safe to share across threads) + static final String[] NAMES = { + "http.request.method", + "http.response.status_code", + "http.route", + "url.path", + "url.scheme", + "server.address", + "server.port", + "client.address", + "network.protocol.version", + "user_agent.original", + "span.kind", + "component", + "language", + "error", + "resource.name", + "service.name", + "operation.name", + "env", + }; + + static final Object[] VALUES = new Object[NAMES.length]; + + static { + for (int i = 0; i < NAMES.length; ++i) { + VALUES[i] = "value-" + i; + } + } + + /** + * Pre-populated read map, PER-THREAD ({@code Scope.Thread}): each thread owns its own map so + * reads don't contend on shared mutable state under {@code @Threads(8)}. + */ + @State(Scope.Thread) + public static class ReadMap { + TagMap map; + + @Setup(Level.Trial) + public void build() { + this.map = TagMap.create(); + for (int i = 0; i < NAMES.length; ++i) { + this.map.set(NAMES[i], VALUES[i]); + } + } + } + + @Benchmark + public TagMap insert() { + TagMap map = TagMap.create(); + for (int i = 0; i < NAMES.length; ++i) { + map.set(NAMES[i], VALUES[i]); + } + return map; + } + + @Benchmark + public TagMap insert_via_ledger() { + TagMap.Ledger ledger = TagMap.ledger(); + for (int i = 0; i < NAMES.length; ++i) { + ledger.set(NAMES[i], VALUES[i]); + } + return ledger.build(); + } + + @Benchmark + public Map insert_hashMap() { + HashMap map = new HashMap<>(); + for (int i = 0; i < NAMES.length; ++i) { + map.put(NAMES[i], VALUES[i]); + } + return map; + } + + /** + * Models the builder idiom for HashMap: accumulate into a staging map, then defensively copy. Two + * allocations, two fill passes — the honest cost of a HashMap-based builder pattern. + */ + @Benchmark + public Map insert_hashMap_builderStyle() { + HashMap staging = new HashMap<>(); + for (int i = 0; i < NAMES.length; ++i) { + staging.put(NAMES[i], VALUES[i]); + } + return new HashMap<>(staging); + } + + @Benchmark + public void getObject(ReadMap rm, Blackhole bh) { + for (int i = 0; i < NAMES.length; ++i) { + bh.consume(rm.map.getObject(NAMES[i])); + } + } + + @Benchmark + public void getEntry(ReadMap rm, Blackhole bh) { + for (int i = 0; i < NAMES.length; ++i) { + bh.consume(rm.map.getEntry(NAMES[i]).objectValue()); + } + } +} diff --git a/internal-api/src/jmh/java/datadog/trace/util/ImmutableMapBenchmark.java b/internal-api/src/jmh/java/datadog/trace/util/ImmutableMapBenchmark.java new file mode 100644 index 00000000000..e42a67ec9ea --- /dev/null +++ b/internal-api/src/jmh/java/datadog/trace/util/ImmutableMapBenchmark.java @@ -0,0 +1,202 @@ +package datadog.trace.util; + +import datadog.trace.api.TagMap; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.TreeMap; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.Fork; +import org.openjdk.jmh.annotations.Level; +import org.openjdk.jmh.annotations.Measurement; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.Threads; +import org.openjdk.jmh.annotations.Warmup; +import org.openjdk.jmh.infra.Blackhole; + +/** + * Read-side benchmark for precomputed, immutable / read-mostly maps that are shared across + * threads. Models the use case where a map is built once and then only read — often published and + * read concurrently by many threads. + * + *

Because nothing mutates after construction, a single shared instance ({@link Scope#Benchmark}) + * read by all {@code @Threads} is realistic and contention-free. This is the read-mostly + * counterpart to the per-thread mutable {@link SingleThreadedMapBenchmark} and the contended {@code + * ConcurrentHashtable} / {@code ThreadSafeMap} suites. + * + *

Compares {@code get} + {@code iterate} across {@link HashMap}, {@link LinkedHashMap}, {@link + * TreeMap}, {@link TagMap}, and {@link java.util.Map#copyOf} (via {@link + * CollectionUtils#tryMakeImmutableMap} — the JDK's compact, array-backed {@code + * ImmutableCollections.MapN}, which is what the agent actually uses for fixed config maps; Java + * 10+, falls back to the input map pre-10). {@code Map.copyOf}/{@code MapN} is the honest + * immutable-map baseline, not {@code HashMap}. + * + *

Lookups use {@code EQUAL_KEYS} (distinct String instances) to exercise {@code equals()}; + * {@code *_sameKey} variants reuse the original interned key instances to show the identity fast + * path — which is the common tracer case, since map keys are typically interned tag-name constants. + * (Results pending a fresh multi-JVM run — {@code Map.copyOf} only materializes the compact form on + * Java 10+.) + */ +// @Fork(5): get_tracerImmutableMap* (MapN reached via interface dispatch) is JIT-bimodal at fewer +// forks — 5 +// forks resolves it (get_tracerImmutableMap_sameKey measured ±90% at @Fork(2) -> ±1.8% at +// @Fork(5)). +@Fork(5) +@Warmup(iterations = 2) +@Measurement(iterations = 3) +@Threads(8) +@State(Scope.Benchmark) +public class ImmutableMapBenchmark { + static final String[] INSERTION_KEYS = { + "foo", "bar", "baz", "quux", "foobar", "foobaz", "key0", "key1", "key2", "key3" + }; + + // Distinct String instances (not the literals used to build the maps) so lookups exercise + // equals(), not identity -- the realistic case for keys arriving from parsing/decoding. + static final String[] EQUAL_KEYS = newEqualKeys(); + + static String[] newEqualKeys() { + String[] keys = new String[INSERTION_KEYS.length]; + for (int i = 0; i < INSERTION_KEYS.length; ++i) { + keys[i] = new String(INSERTION_KEYS[i]); + } + return keys; + } + + static void fill(Map map) { + for (int i = 0; i < INSERTION_KEYS.length; ++i) { + map.put(INSERTION_KEYS[i], i); + } + } + + // Built once, never mutated -- safe to share across the reader threads. + HashMap hashMap; + LinkedHashMap linkedHashMap; + TreeMap treeMap; + TagMap tagMap; + Map tracerImmutableMap; + + @Setup(Level.Trial) + public void setUp() { + hashMap = new HashMap<>(); + fill(hashMap); + linkedHashMap = new LinkedHashMap<>(); + fill(linkedHashMap); + treeMap = new TreeMap<>(); + fill(treeMap); + tagMap = TagMap.create(); + for (int i = 0; i < INSERTION_KEYS.length; ++i) { + tagMap.set(INSERTION_KEYS[i], i); // primitive support + } + // JDK compact immutable map (MapN on Java 10+); the agent's actual fixed-map representation. + tracerImmutableMap = CollectionUtils.tryMakeImmutableMap(hashMap); + } + + /** Per-thread lookup cursor so each reader thread cycles keys independently. */ + @State(Scope.Thread) + public static class Cursor { + int index = 0; + + String nextKey() { + return nextKey(EQUAL_KEYS); + } + + String nextKey(String[] keys) { + if (++index >= keys.length) index = 0; + return keys[index]; + } + } + + @Benchmark + public Integer get_hashMap(Cursor cursor) { + return hashMap.get(cursor.nextKey()); + } + + @Benchmark + public Integer get_hashMap_sameKey(Cursor cursor) { + return hashMap.get(cursor.nextKey(INSERTION_KEYS)); + } + + @Benchmark + public void iterate_hashMap(Blackhole blackhole) { + for (Map.Entry entry : hashMap.entrySet()) { + blackhole.consume(entry.getKey()); + blackhole.consume(entry.getValue()); + } + } + + @Benchmark + public Integer get_linkedHashMap(Cursor cursor) { + return linkedHashMap.get(cursor.nextKey()); + } + + @Benchmark + public void iterate_linkedHashMap(Blackhole blackhole) { + for (Map.Entry entry : linkedHashMap.entrySet()) { + blackhole.consume(entry.getKey()); + blackhole.consume(entry.getValue()); + } + } + + @Benchmark + public Integer get_treeMap(Cursor cursor) { + return treeMap.get(cursor.nextKey()); + } + + @Benchmark + public void iterate_treeMap(Blackhole blackhole) { + for (Map.Entry entry : treeMap.entrySet()) { + blackhole.consume(entry.getKey()); + blackhole.consume(entry.getValue()); + } + } + + @Benchmark + public int get_tagMap(Cursor cursor) { + return tagMap.getInt(cursor.nextKey()); + } + + @Benchmark + public int get_tagMap_sameKey(Cursor cursor) { + return tagMap.getInt(cursor.nextKey(INSERTION_KEYS)); + } + + @Benchmark + public void iterate_tagMap(Blackhole blackhole) { + for (TagMap.EntryReader entry : tagMap) { + blackhole.consume(entry.tag()); + blackhole.consume(entry.intValue()); + } + } + + @Benchmark + public void iterate_tagMap_forEach(Blackhole blackhole) { + // Taking advantage of passthrough of contextObj to avoid capturing lambda + tagMap.forEach( + blackhole, + (bh, entry) -> { + bh.consume(entry.tag()); + bh.consume(entry.intValue()); + }); + } + + @Benchmark + public Integer get_tracerImmutableMap(Cursor cursor) { + return tracerImmutableMap.get(cursor.nextKey()); + } + + @Benchmark + public Integer get_tracerImmutableMap_sameKey(Cursor cursor) { + return tracerImmutableMap.get(cursor.nextKey(INSERTION_KEYS)); + } + + @Benchmark + public void iterate_tracerImmutableMap(Blackhole blackhole) { + for (Map.Entry entry : tracerImmutableMap.entrySet()) { + blackhole.consume(entry.getKey()); + blackhole.consume(entry.getValue()); + } + } +} diff --git a/internal-api/src/jmh/java/datadog/trace/util/SingleThreadedMapBenchmark.java b/internal-api/src/jmh/java/datadog/trace/util/SingleThreadedMapBenchmark.java new file mode 100644 index 00000000000..11572aa923d --- /dev/null +++ b/internal-api/src/jmh/java/datadog/trace/util/SingleThreadedMapBenchmark.java @@ -0,0 +1,222 @@ +package datadog.trace.util; + +import datadog.trace.api.TagMap; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.TreeMap; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.Fork; +import org.openjdk.jmh.annotations.Level; +import org.openjdk.jmh.annotations.Measurement; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.Threads; +import org.openjdk.jmh.annotations.Warmup; +import org.openjdk.jmh.infra.Blackhole; + +/** + * Benchmark for single-threaded (uncontended) map usage: each thread builds, mutates, reads, and + * discards its own maps. Models the common tracer pattern of assembling a short-lived map + * (e.g. span tags) on a single thread. + * + *

State is per-thread ({@link Scope#Thread}) so no map is ever shared — the read-mostly shared + * case lives in {@link ImmutableMapBenchmark}, and the contended case in the {@code + * ConcurrentHashtable} / {@code ThreadSafeMap} suites. Running at {@code @Threads(8)} keeps + * allocation / GC interactions visible without introducing lock contention. + * + *

Comparing different Map types: + * + *

    + *
  • (RECOMMENDED) HashMap — fastest general-purpose lookups + *
  • (RECOMMENDED) TagMap — preferred for storing tags; excels at primitives, copying, and + * builder idioms + *
  • TreeMap — when a custom Comparator is needed (see CaseInsensitiveMapBenchmark) + *
  • LinkedHashMap — only when insertion-order iteration is required; cost is paid at + * construction and in per-entry memory + *
+ * + *

Uncontended synchronization tax. A {@link Collections#synchronizedMap} case is included + * to measure what synchronization costs when there is no contention: because each thread + * owns its synchronized map, the monitor is only ever locked by one thread. On JVMs with biased + * locking (Java ≤ 11 by default) repeated same-thread locking should be nearly free; on Java 15+ + * (biased locking disabled by default, JEP 374) it pays the full uncontended CAS. The + * unsynchronized {@code hashMap} {@code get}/{@code iterate} methods are the in-harness baseline; + * the tax is the delta to the {@code synchronizedHashMap} equivalents. Comparing across JVM + * versions at stock flags shows the biased-locking effect. (Results pending a fresh multi-JVM run.) + */ +@Fork(2) +@Warmup(iterations = 2) +@Measurement(iterations = 3) +@Threads(8) +@State(Scope.Thread) +public class SingleThreadedMapBenchmark { + static final String[] INSERTION_KEYS = { + "foo", "bar", "baz", "quux", "foobar", "foobaz", "key0", "key1", "key2", "key3" + }; + + // Distinct String instances so lookups exercise equals(), not identity. + static final String[] EQUAL_KEYS = newEqualKeys(); + + static String[] newEqualKeys() { + String[] keys = new String[INSERTION_KEYS.length]; + for (int i = 0; i < INSERTION_KEYS.length; ++i) { + keys[i] = new String(INSERTION_KEYS[i]); + } + return keys; + } + + static void fill(Map map) { + for (int i = 0; i < INSERTION_KEYS.length; ++i) { + map.put(INSERTION_KEYS[i], i); + } + } + + static TagMap fillTagMap(TagMap map) { + for (int i = 0; i < INSERTION_KEYS.length; ++i) { + map.set(INSERTION_KEYS[i], i); // primitive support + } + return map; + } + + // Per-thread prebuilt maps for the read + clone benchmarks (built once per trial, per thread). + HashMap hashMap; + Map synchronizedHashMap; + TreeMap treeMap; + LinkedHashMap linkedHashMap; + TagMap tagMap; + int index = 0; + + @Setup(Level.Trial) + public void setUp() { + hashMap = new HashMap<>(); + fill(hashMap); + synchronizedHashMap = Collections.synchronizedMap(new HashMap<>(hashMap)); + treeMap = new TreeMap<>(); + fill(treeMap); + linkedHashMap = new LinkedHashMap<>(); + fill(linkedHashMap); + tagMap = fillTagMap(TagMap.create()); + } + + String nextLookupKey() { + if (++index >= EQUAL_KEYS.length) index = 0; + return EQUAL_KEYS[index]; + } + + // ---- construction: build cost + allocation ---- + + @Benchmark + public Map create_hashMap() { + HashMap map = new HashMap<>(); + fill(map); + return map; + } + + @Benchmark + public Map create_hashMap_sized() { + // Sizing is preferable for large maps, but in practice most of our maps fall within the + // default. + HashMap map = new HashMap<>(INSERTION_KEYS.length); + fill(map); + return map; + } + + @Benchmark + public Map create_synchronizedHashMap() { + Map map = Collections.synchronizedMap(new HashMap<>()); + fill(map); + return map; + } + + @Benchmark + public TreeMap create_treeMap() { + TreeMap map = new TreeMap<>(); + fill(map); + return map; + } + + @Benchmark + public LinkedHashMap create_linkedHashMap() { + LinkedHashMap map = new LinkedHashMap<>(); + fill(map); + return map; + } + + @Benchmark + public TagMap create_tagMap() { + return fillTagMap(TagMap.create()); + } + + @Benchmark + public TagMap create_tagMap_via_ledger() { + TagMap.Ledger ledger = TagMap.ledger(); + for (int i = 0; i < INSERTION_KEYS.length; ++i) { + ledger.set(INSERTION_KEYS[i], i); // primitive support + } + return ledger.build(); + } + + // ---- copy ---- + + @Benchmark + public Map clone_hashMap() { + return new HashMap<>(hashMap); + } + + @Benchmark + public Map clone_synchronizedHashMap() { + return Collections.synchronizedMap(new HashMap<>(synchronizedHashMap)); + } + + @Benchmark + public TreeMap clone_treeMap() { + TreeMap map = new TreeMap<>(); + map.putAll(treeMap); + return map; + } + + @Benchmark + public LinkedHashMap clone_linkedHashMap() { + return new LinkedHashMap<>(linkedHashMap); + } + + @Benchmark + public TagMap clone_tagMap() { + return tagMap.copy(); + } + + // ---- read: unsynchronized baseline vs uncontended synchronized (biased-locking story) ---- + + @Benchmark + public Integer get_hashMap() { + return hashMap.get(nextLookupKey()); + } + + @Benchmark + public Integer get_synchronizedHashMap() { + return synchronizedHashMap.get(nextLookupKey()); + } + + @Benchmark + public void iterate_hashMap(Blackhole blackhole) { + for (Map.Entry entry : hashMap.entrySet()) { + blackhole.consume(entry.getKey()); + blackhole.consume(entry.getValue()); + } + } + + @Benchmark + public void iterate_synchronizedHashMap(Blackhole blackhole) { + // Collections.synchronizedMap requires the caller to synchronize during iteration; this is the + // correct usage and measures one (uncontended) monitor acquire around the traversal. + synchronized (synchronizedHashMap) { + for (Map.Entry entry : synchronizedHashMap.entrySet()) { + blackhole.consume(entry.getKey()); + blackhole.consume(entry.getValue()); + } + } + } +} diff --git a/internal-api/src/jmh/java/datadog/trace/util/UnsynchronizedMapBenchmark.java b/internal-api/src/jmh/java/datadog/trace/util/UnsynchronizedMapBenchmark.java deleted file mode 100644 index 42fec2b98e0..00000000000 --- a/internal-api/src/jmh/java/datadog/trace/util/UnsynchronizedMapBenchmark.java +++ /dev/null @@ -1,308 +0,0 @@ -package datadog.trace.util; - -import datadog.trace.api.TagMap; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.TreeMap; -import java.util.function.Supplier; -import org.openjdk.jmh.annotations.Benchmark; -import org.openjdk.jmh.annotations.Fork; -import org.openjdk.jmh.annotations.Measurement; -import org.openjdk.jmh.annotations.Threads; -import org.openjdk.jmh.annotations.Warmup; -import org.openjdk.jmh.infra.Blackhole; - -/** - * - * - *

    - * Benchmark comparing different Map-s... - *
  • (RECOMMENDED) HashMap - for fastest lookups - (not typically needed for tags) - *
  • (RECOMMENDED) TagMap - for storing tags - especially if copying between maps or using - * builders - *
  • TreeMap - better for custom Comparators - case-insensitive Maps (see - * CaseInsensitiveMapBenchmark) - *
  • LinkedHashMap - only when insertion order is needed - *
- * - *

TagMap is the preferred way to store tags. - * - *

TagMap excels at storing primitives, copying between TagMap instances, and builder idioms. - * - *

Iterator traversal with TagMap is relatively slow, but TagMap#forEach is on par (and slightly) - * faster than traditional map entry iteration. - * - *

HashMap & LinkedHashMap perform equally well on get operations. - * - *

HashMap is 2x faster throughput-wise to create and has less memory overhead because there's no - * linked list to capture insertion order. - * - *

TreeMap is useful when a custom Comparator is needed -- see CaseInsensitiveMapBenchmark - * - *

HashMap & TagMap also perform exceedingly well in cases where the exact same object is used - * for put & get operations. e.g. when using String literals or Class literals as keys - * MacBook M1 1 thread (Java 21) - * - * Benchmark Mode Cnt Score Error Units - * UnsynchronizedMapBenchmark.clone_hashMap thrpt 6 12482267.775 ± 236852.198 ops/s - * UnsynchronizedMapBenchmark.clone_linkedHashMap thrpt 6 12414187.888 ± 224418.265 ops/s - * UnsynchronizedMapBenchmark.clone_tagMap thrpt 6 49638156.234 ± 2972608.986 ops/s - * UnsynchronizedMapBenchmark.clone_treeMap thrpt 6 16201216.086 ± 619985.352 ops/s - * - * UnsynchronizedMapBenchmark.create_hashMap thrpt 6 22534042.260 ± 819970.046 ops/s - * UnsynchronizedMapBenchmark.create_hashMap_sized thrpt 6 21871270.375 ± 893842.109 ops/s - * UnsynchronizedMapBenchmark.create_linkedHashMap thrpt 6 12905731.242 ± 8930007.156 ops/s - * UnsynchronizedMapBenchmark.create_tagMap thrpt 6 15794277.380 ± 6069426.265 ops/s - * UnsynchronizedMapBenchmark.create_treeMap thrpt 6 4711961.814 ± 48582.934 ops/s - * - * UnsynchronizedMapBenchmark.get_hashMap thrpt 6 212201631.841 ± 6223069.782 ops/s - * UnsynchronizedMapBenchmark.get_hashMap_sameKey thrpt 6 392053406.085 ± 3938305.125 ops/s - * UnsynchronizedMapBenchmark.get_linkedHashMap thrpt 6 210734968.352 ± 3627805.282 ops/s - * UnsynchronizedMapBenchmark.get_tagMap thrpt 6 201864656.534 ± 4596147.771 ops/s - * UnsynchronizedMapBenchmark.get_tagMap_sameKey thrpt 6 256311645.716 ± 13315886.308 ops/s - * UnsynchronizedMapBenchmark.get_treeMap thrpt 6 94606404.423 ± 806879.890 ops/s - * - * MacBook M1 with 8 threads (Java 21) - * - * Benchmark Mode Cnt Score Error Units - * UnsynchronizedMapBenchmark.clone_hashMap thrpt 6 89645484.526 ± 6546683.185 ops/s - * UnsynchronizedMapBenchmark.clone_linkedHashMap thrpt 6 78233577.417 ± 7204526.742 ops/s - * UnsynchronizedMapBenchmark.clone_tagMap thrpt 6 315228772.058 ± 20689692.104 ops/s - * UnsynchronizedMapBenchmark.clone_treeMap thrpt 6 102416350.341 ± 7258040.561 ops/s - * - * UnsynchronizedMapBenchmark.create_hashMap thrpt 6 150462966.692 ± 11243713.572 ops/s - * UnsynchronizedMapBenchmark.create_hashMap_sized thrpt 6 111213025.138 ± 4593366.916 ops/s - * UnsynchronizedMapBenchmark.create_linkedHashMap thrpt 6 80882399.133 ± 19567359.487 ops/s - * UnsynchronizedMapBenchmark.create_tagMap thrpt 6 93026443.634 ± 11831456.794 ops/s - * UnsynchronizedMapBenchmark.create_tagMap_via_ledger thrpt 6 70769351.353 ± 3821543.185 ops/s - * UnsynchronizedMapBenchmark.create_treeMap thrpt 6 32737595.187 ± 2638992.844 ops/s - * - * UnsynchronizedMapBenchmark.get_hashMap thrpt 6 1154522356.093 ± 116525174.735 ops/s - * UnsynchronizedMapBenchmark.get_hashMap_sameKey thrpt 6 1760800709.734 ± 33551896.166 ops/s - * UnsynchronizedMapBenchmark.get_linkedHashMap thrpt 6 1191208257.933 ± 49810465.132 ops/s - * UnsynchronizedMapBenchmark.get_tagMap thrpt 6 933455574.646 ± 154146815.295 ops/s - * UnsynchronizedMapBenchmark.get_tagMap_sameKey thrpt 6 1138764608.359 ± 88352911.617 ops/s - * UnsynchronizedMapBenchmark.get_treeMap thrpt 6 490872723.682 ± 87017311.892 ops/s - * - * UnsynchronizedMapBenchmark.iterate_hashMap thrpt 6 351222668.708 ± 35242914.752 ops/s - * UnsynchronizedMapBenchmark.iterate_linkedHashMap thrpt 6 406635839.285 ± 55990655.235 ops/s - * UnsynchronizedMapBenchmark.iterate_tagMap thrpt 6 185264584.604 ± 15137886.028 ops/s - * UnsynchronizedMapBenchmark.iterate_tagMap_forEach thrpt 6 422407681.630 ± 19493455.109 ops/s - * UnsynchronizedMapBenchmark.iterate_treeMap thrpt 6 392884747.896 ± 80190674.417 ops/s - * - */ -@Fork(2) -@Warmup(iterations = 2) -@Measurement(iterations = 3) -@Threads(8) -public class UnsynchronizedMapBenchmark { - static final String[] INSERTION_KEYS = { - "foo", "bar", "baz", "quux", "foobar", "foobaz", "key0", "key1", "key2", "key3" - }; - - static final String[] EQUAL_KEYS = - init( - () -> { - String[] keys = new String[INSERTION_KEYS.length]; - for (int i = 0; i < INSERTION_KEYS.length; ++i) { - keys[i] = new String(INSERTION_KEYS[i]); - } - return keys; - }); - - static int sharedLookupIndex = 0; - - static String nextLookupKey() { - return nextLookupKey(EQUAL_KEYS); - } - - static String nextLookupKey(String[] keys) { - int localIndex = ++sharedLookupIndex; - if (localIndex >= keys.length) { - sharedLookupIndex = localIndex = 0; - } - return keys[localIndex]; - } - - static T init(Supplier supplier) { - return supplier.get(); - } - - static void fill(Map map) { - for (int i = 0; i < INSERTION_KEYS.length; ++i) { - map.put(INSERTION_KEYS[i], i); - } - } - - static HashMap _create_hashMap() { - HashMap map = new HashMap<>(); - fill(map); - return map; - } - - @Benchmark - public Map create_hashMap() { - return _create_hashMap(); - } - - @Benchmark - public Map create_hashMap_sized() { - return _create_hashMap_sized(); - } - - static final HashMap HASH_MAP = _create_hashMap(); - - @Benchmark - public Integer get_hashMap() { - return HASH_MAP.get(nextLookupKey()); - } - - @Benchmark - public void iterate_hashMap(Blackhole blackhole) { - for (Map.Entry entry : HASH_MAP.entrySet()) { - blackhole.consume(entry.getKey()); - blackhole.consume(entry.getValue()); - } - } - - @Benchmark - public Integer get_hashMap_sameKey() { - return HASH_MAP.get(nextLookupKey(INSERTION_KEYS)); - } - - @Benchmark - public Map clone_hashMap() { - return new HashMap<>(HASH_MAP); - } - - static Map _create_hashMap_sized() { - // Sizing is preferable for large maps, but in practice, most of our maps typically fall within - // the default - HashMap map = new HashMap<>(INSERTION_KEYS.length); - fill(map); - return map; - } - - static TreeMap _create_treeMap() { - TreeMap map = new TreeMap<>(); - fill(map); - return map; - } - - @Benchmark - public TreeMap create_treeMap() { - return _create_treeMap(); - } - - static final TreeMap TREE_MAP = _create_treeMap(); - - @Benchmark - public Integer get_treeMap() { - return TREE_MAP.get(nextLookupKey()); - } - - @Benchmark - public void iterate_treeMap(Blackhole blackhole) { - for (Map.Entry entry : TREE_MAP.entrySet()) { - blackhole.consume(entry.getKey()); - blackhole.consume(entry.getValue()); - } - } - - @Benchmark - public TreeMap clone_treeMap() { - TreeMap map = new TreeMap<>(); - map.putAll(TREE_MAP); - return map; - } - - static LinkedHashMap _create_linkedHashMap() { - LinkedHashMap map = new LinkedHashMap<>(); - fill(map); - return map; - } - - @Benchmark - public LinkedHashMap create_linkedHashMap() { - return _create_linkedHashMap(); - } - - static final LinkedHashMap LINKED_HASH_MAP = _create_linkedHashMap(); - - @Benchmark - public Integer get_linkedHashMap() { - return LINKED_HASH_MAP.get(nextLookupKey()); - } - - @Benchmark - public void iterate_linkedHashMap(Blackhole blackhole) { - for (Map.Entry entry : TREE_MAP.entrySet()) { - blackhole.consume(entry.getKey()); - blackhole.consume(entry.getValue()); - } - } - - @Benchmark - public LinkedHashMap clone_linkedHashMap() { - return new LinkedHashMap<>(LINKED_HASH_MAP); - } - - static TagMap _create_tagMap() { - TagMap map = TagMap.create(); - for (int i = 0; i < INSERTION_KEYS.length; ++i) { - map.set(INSERTION_KEYS[i], i); // taking advantage of primitive support - } - return map; - } - - @Benchmark - public TagMap create_tagMap() { - return _create_tagMap(); - } - - @Benchmark - public TagMap create_tagMap_via_ledger() { - TagMap.Ledger ledger = TagMap.ledger(); - for (int i = 0; i < INSERTION_KEYS.length; ++i) { - ledger.set(INSERTION_KEYS[i], i); // taking advantage of primitive support - } - return ledger.build(); - } - - static final TagMap TAG_MAP = _create_tagMap(); - - @Benchmark - public int get_tagMap() { - return TAG_MAP.getInt(nextLookupKey()); - } - - @Benchmark - public int get_tagMap_sameKey() { - return TAG_MAP.getInt(nextLookupKey(INSERTION_KEYS)); - } - - @Benchmark - public void iterate_tagMap(Blackhole blackhole) { - for (TagMap.EntryReader entry : TAG_MAP) { - blackhole.consume(entry.tag()); - blackhole.consume(entry.intValue()); - } - } - - @Benchmark - public void iterate_tagMap_forEach(Blackhole blackhole) { - // Taking advantage of passthrough of contextObj to avoid capturing lambda - TAG_MAP.forEach( - blackhole, - (bh, entry) -> { - bh.consume(entry.tag()); - bh.consume(entry.intValue()); - }); - } - - @Benchmark - public TagMap clone_tagMap() { - return TAG_MAP.copy(); - } -} From 015a24fa8a0d526b1a71a5418564b47df1f98ece Mon Sep 17 00:00:00 2001 From: Douglas Q Hawkins Date: Tue, 30 Jun 2026 15:24:07 -0400 Subject: [PATCH 099/139] Return SubSequence from SQLCommenter.getFirstWord to avoid per-inject substring (#11736) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add SubSequence.startsWith / equalsIgnoreCase (CharSequence-friendly comparisons) These are the ops a real classification parse needs but CharSequence lacks — surfaced by porting SQLCommenter.getFirstWord (firstWord.startsWith("{"), firstWord.equalsIgnoreCase("call")). Lets transient parse views be compared without materializing a String. + JUnit 5 tests. Co-Authored-By: Claude Opus 4.8 (1M context) Return SubSequence from SQLCommenter.getFirstWord to avoid per-inject substring getFirstWord's result is only consumed by startsWith("{") and equalsIgnoreCase("call"), so materializing a substring on every inject() was pure waste. Return a zero-copy SubSequence view instead and use its startsWith/equalsIgnoreCase. Behavior is unchanged (91 SQLCommenterTest cases pass); the test compares getFirstWord(sql).toString(). This is the motivating consumer for SubSequence.startsWith/equalsIgnoreCase (retracted from #10640 and carried here so they land with their use case). Co-Authored-By: Claude Opus 4.8 Add SQLCommenterGetFirstWordBenchmark (getFirstWord alloc: 48 -> 0 B/op) Benchmarks the getFirstWord first-word scan, consuming the result via the real transient pattern (startsWith, returning the boolean) so EA isn't faked away. @Threads(8), @Fork(2), -prof gc: the old substring allocated 48 B/op per call; the SubSequence view is fully EA-elided (~0 B/op), ~1.6x throughput. Numbers in the class Javadoc. Co-Authored-By: Claude Opus 4.8 Refresh SQLCommenterGetFirstWordBenchmark results to JDK 17 @Fork(5) zulu-17 @Fork(5), -prof gc: 258.1M -> 508.0M ops/s (~2x), 48 -> ~0 B/op. @Fork(5) tightens the earlier bimodal @Fork(2) spread. Co-Authored-By: Claude Opus 4.8 Merge branch 'master' into dougqh/sqlcommenter-getfirstword-subseq Co-authored-by: devflow.devflow-routing-intake --- .../SQLCommenterGetFirstWordBenchmark.java | 82 +++++++++++++++++++ .../instrumentation/jdbc/SQLCommenter.java | 17 +++- .../jdbc/SQLCommenterTest.java | 2 +- .../java/datadog/trace/util/SubSequence.java | 31 +++++++ .../datadog/trace/util/SubSequenceTest.java | 26 ++++++ 5 files changed, 154 insertions(+), 4 deletions(-) create mode 100644 dd-java-agent/instrumentation/jdbc/src/jmh/java/datadog/trace/instrumentation/jdbc/SQLCommenterGetFirstWordBenchmark.java diff --git a/dd-java-agent/instrumentation/jdbc/src/jmh/java/datadog/trace/instrumentation/jdbc/SQLCommenterGetFirstWordBenchmark.java b/dd-java-agent/instrumentation/jdbc/src/jmh/java/datadog/trace/instrumentation/jdbc/SQLCommenterGetFirstWordBenchmark.java new file mode 100644 index 00000000000..1c556646167 --- /dev/null +++ b/dd-java-agent/instrumentation/jdbc/src/jmh/java/datadog/trace/instrumentation/jdbc/SQLCommenterGetFirstWordBenchmark.java @@ -0,0 +1,82 @@ +package datadog.trace.instrumentation.jdbc; + +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.Fork; +import org.openjdk.jmh.annotations.Measurement; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.Threads; +import org.openjdk.jmh.annotations.Warmup; + +/** + * Benchmark for {@link SQLCommenter#getFirstWord(String)} -- the per-{@code inject} first-word + * scan. + * + *

What we're measuring. {@code getFirstWord} used to return {@code sql.substring(b, e)} -- + * a fresh {@code String} (with its own backing array) allocated on every {@code inject} call, just + * to {@code startsWith}/{@code equalsIgnoreCase} it. It now returns a zero-copy {@code SubSequence} + * view. The question is empirical: does escape analysis elide the view in the transient consumption + * (→ 0 B/op), while the old {@code substring} always allocated? + * + *

Honest EA measurement. The view is consumed exactly as {@code inject} consumes it -- a + * boolean decision ({@code startsWith("{")}) -- and the benchmark returns that boolean. It does NOT + * return/Blackhole the view itself, which would force it to escape and fake away the very EA win + * under test. The chained {@code getFirstWord(sql).startsWith("{")} (no typed local) also lets one + * source compile both before (String.startsWith) and after (SubSequence.startsWith), so before/after + * is a clean toggle of the production method. + * + *

Run at {@code @Threads(8)} so the allocation delta surfaces as throughput; {@code -prof gc} + * (gc.alloc.rate.norm) is the headline mechanism and is fork-stable. + * + * 

+ *   ./gradlew :dd-java-agent:instrumentation:jdbc:jmh   # add -prof gc
+ *
+ * + *

Results (JDK 17, MacBook M-series, {@code @Threads(8)}, {@code @Fork(5)}, {@code -prof + * gc}): + * + * 

+ *                        throughput            gc.alloc.rate.norm
+ *   before (substring)   258.1M ± 21.0M ops/s   48 B/op
+ *   after  (SubSequence) 508.0M ± 21.6M ops/s   ~0 B/op  (10^-4)
+ *
+ * + * Escape analysis fully elides the view in the transient consumption (it never escapes the + * decision), so the per-call 48 B/op of the old {@code substring} (a String + its backing array) + * drops to ~0 and throughput rises ~2x at {@code @Threads(8)} — the allocation win surfacing as + * throughput. At {@code @Fork(5)} the error tightens (the earlier {@code @Fork(2)} spread was + * bimodal JIT, not signal); the allocation delta is exact and the throughput gap clears it. + */ +@Fork(5) +@Warmup(iterations = 2) +@Measurement(iterations = 5) +@Threads(8) +public class SQLCommenterGetFirstWordBenchmark { + + // Representative first-word shapes: plain keywords, a stored-proc brace, a CALL, leading space. + static final String[] SQL = { + "SELECT * FROM foo WHERE id = 42", + "{call dogshelterProc(?, ?)}", + "CALL dogshelterProc(?, ?)", + "UPDATE accounts SET balance = balance - 100 WHERE id = 42", + " INSERT INTO logs VALUES (?)", + }; + + /** Per-thread cursor so threads don't contend on a shared index under {@code @Threads(8)}. */ + @State(Scope.Thread) + public static class Cursor { + int index = 0; + + String next() { + int i = index; + index = (i + 1) % SQL.length; + return SQL[i]; + } + } + + @Benchmark + public boolean firstWordCheck(Cursor cursor) { + // Mirrors inject(): take the first word, make a boolean decision, discard it. + return SQLCommenter.getFirstWord(cursor.next()).startsWith("{"); + } +} diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/SQLCommenter.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/SQLCommenter.java index 3171550aba3..87261cdcd63 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/SQLCommenter.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/SQLCommenter.java @@ -1,6 +1,7 @@ package datadog.trace.instrumentation.jdbc; import datadog.trace.bootstrap.instrumentation.dbm.SharedDBCommenter; +import datadog.trace.util.SubSequence; public class SQLCommenter { // SQL-specific constants, rest defined in SharedDBCommenter @@ -15,7 +16,17 @@ public class SQLCommenter { private static final int BUFFER_EXTRA = 4; private static final int SQL_COMMENT_OVERHEAD = SPACE_CHARS + COMMENT_DELIMITERS + BUFFER_EXTRA; - protected static String getFirstWord(String sql) { + /** + * Returns the first whitespace-delimited word of {@code sql} as a zero-copy {@link SubSequence} + * -- avoiding a substring allocation on every {@link #inject} call, since the callers only need + * to {@code startsWith}/{@code equalsIgnoreCase} it. + * + *

Transient view -- do not retain. The returned {@code SubSequence} references the + * entire {@code sql} string, so holding onto it keeps the whole query reachable (a memory hazard + * for large SQL). Consume it in place and discard; if the value must be retained, call {@link + * SubSequence#toString()} to detach a standalone copy. + */ + protected static SubSequence getFirstWord(String sql) { int beginIndex = 0; while (beginIndex < sql.length() && Character.isWhitespace(sql.charAt(beginIndex))) { beginIndex++; @@ -24,7 +35,7 @@ protected static String getFirstWord(String sql) { while (endIndex < sql.length() && !Character.isWhitespace(sql.charAt(endIndex))) { endIndex++; } - return sql.substring(beginIndex, endIndex); + return SubSequence.of(sql, beginIndex, endIndex); } public static String inject( @@ -40,7 +51,7 @@ public static String inject( } boolean appendComment = preferAppend; if (dbType != null) { - final String firstWord = getFirstWord(sql); + final SubSequence firstWord = getFirstWord(sql); // The Postgres JDBC parser doesn't allow SQL comments anywhere in a JDBC // callable statements diff --git a/dd-java-agent/instrumentation/jdbc/src/test/java/datadog/trace/instrumentation/jdbc/SQLCommenterTest.java b/dd-java-agent/instrumentation/jdbc/src/test/java/datadog/trace/instrumentation/jdbc/SQLCommenterTest.java index 5383bf03921..c006fef5b89 100644 --- a/dd-java-agent/instrumentation/jdbc/src/test/java/datadog/trace/instrumentation/jdbc/SQLCommenterTest.java +++ b/dd-java-agent/instrumentation/jdbc/src/test/java/datadog/trace/instrumentation/jdbc/SQLCommenterTest.java @@ -29,7 +29,7 @@ class SQLCommenterTest extends AbstractInstrumentationTest { @MethodSource("testFindFirstWordArguments") void testFindFirstWord(String scenario, String sql, String firstWord) { // when - String word = SQLCommenter.getFirstWord(sql); + String word = SQLCommenter.getFirstWord(sql).toString(); // then assertEquals(firstWord, word); diff --git a/internal-api/src/main/java/datadog/trace/util/SubSequence.java b/internal-api/src/main/java/datadog/trace/util/SubSequence.java index 3cda505d1db..37e18327d8e 100644 --- a/internal-api/src/main/java/datadog/trace/util/SubSequence.java +++ b/internal-api/src/main/java/datadog/trace/util/SubSequence.java @@ -109,6 +109,37 @@ public final boolean equals(CharSequence that) { return true; } + /** Case-insensitive content comparison; mirrors {@link String#equalsIgnoreCase(String)}. */ + public final boolean equalsIgnoreCase(CharSequence that) { + int len = this.length(); + if (that == null || len != that.length()) return false; + + for (int i = 0; i < len; ++i) { + char a = this.charAt(i); + char b = that.charAt(i); + if (a != b) { + // Same two-way fold String.regionMatches(ignoreCase) uses (handles locale edge cases). + char au = Character.toUpperCase(a); + char bu = Character.toUpperCase(b); + if (au != bu && Character.toLowerCase(au) != Character.toLowerCase(bu)) { + return false; + } + } + } + return true; + } + + /** True if this sub-sequence begins with {@code prefix} (content comparison, no allocation). */ + public final boolean startsWith(CharSequence prefix) { + int prefixLen = prefix.length(); + if (prefixLen > this.length()) return false; + + for (int i = 0; i < prefixLen; ++i) { + if (this.charAt(i) != prefix.charAt(i)) return false; + } + return true; + } + @Override public String toString() { String cached = this.cachedSubstr; diff --git a/internal-api/src/test/java/datadog/trace/util/SubSequenceTest.java b/internal-api/src/test/java/datadog/trace/util/SubSequenceTest.java index 78d52fa6931..86e27039de6 100644 --- a/internal-api/src/test/java/datadog/trace/util/SubSequenceTest.java +++ b/internal-api/src/test/java/datadog/trace/util/SubSequenceTest.java @@ -1,6 +1,7 @@ package datadog.trace.util; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -108,4 +109,29 @@ public void appendToBuilder() { subSeq.appendTo(builder1); assertEquals(expectedStr, builder1.toString()); } + + @Test + public void equalsIgnoreCase() { + SubSequence call = SubSequence.of("xx CALL yy", 3, 7); // "CALL" + assertTrue(call.equalsIgnoreCase("call")); + assertTrue(call.equalsIgnoreCase("CALL")); + assertTrue(call.equalsIgnoreCase("CaLl")); + assertFalse(call.equalsIgnoreCase("calls")); // length differs + assertFalse(call.equalsIgnoreCase("cant")); // same length, content differs + + // case-sensitive equals stays case-sensitive + assertFalse(call.equals("call")); + assertTrue(call.equals("CALL")); + } + + @Test + public void startsWith() { + SubSequence braceCall = SubSequence.of("xx{call} yy", 2, 7); // "{call" + assertTrue(braceCall.startsWith("")); + assertTrue(braceCall.startsWith("{")); + assertTrue(braceCall.startsWith("{ca")); + assertTrue(braceCall.startsWith("{call")); + assertFalse(braceCall.startsWith("call")); // not the prefix + assertFalse(braceCall.startsWith("{calls and more")); // prefix longer than sequence + } } From dcbee66b7c402d2a95f50bbd8638ed4c22182bc7 Mon Sep 17 00:00:00 2001 From: TophrC-dd <130502205+TophrC-dd@users.noreply.github.com> Date: Tue, 30 Jun 2026 15:54:59 -0400 Subject: [PATCH 100/139] Introduces the api-management inferred proxy spans to Azure (#11804) adding implementation for azure apim Fixing formatting Co-authored-by: devflow.devflow-routing-intake --- .../java/datadog/trace/api/gateway/InferredProxySpan.java | 1 + .../datadog/trace/api/gateway/InferredProxySpanTests.java | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/internal-api/src/main/java/datadog/trace/api/gateway/InferredProxySpan.java b/internal-api/src/main/java/datadog/trace/api/gateway/InferredProxySpan.java index 5a893e7d760..3aa95465e68 100644 --- a/internal-api/src/main/java/datadog/trace/api/gateway/InferredProxySpan.java +++ b/internal-api/src/main/java/datadog/trace/api/gateway/InferredProxySpan.java @@ -47,6 +47,7 @@ public class InferredProxySpan implements ImplicitContextKeyed { SUPPORTED_PROXIES = new HashMap<>(); SUPPORTED_PROXIES.put("aws-apigateway", "aws.apigateway"); SUPPORTED_PROXIES.put("aws-httpapi", "aws.httpapi"); + SUPPORTED_PROXIES.put("azure-apim", "azure.apim"); } private final Map headers; diff --git a/internal-api/src/test/java/datadog/trace/api/gateway/InferredProxySpanTests.java b/internal-api/src/test/java/datadog/trace/api/gateway/InferredProxySpanTests.java index 8463136c63b..309e8616080 100644 --- a/internal-api/src/test/java/datadog/trace/api/gateway/InferredProxySpanTests.java +++ b/internal-api/src/test/java/datadog/trace/api/gateway/InferredProxySpanTests.java @@ -241,7 +241,10 @@ void testSupportedProxySystems(String proxySystem, String expectedSpanName) { } static Stream supportedProxySystems() { - return Stream.of(of("aws-apigateway", "aws.apigateway"), of("aws-httpapi", "aws.httpapi")); + return Stream.of( + of("aws-apigateway", "aws.apigateway"), + of("aws-httpapi", "aws.httpapi"), + of("azure-apim", "azure.apim")); } @Test From 2c3db2130802ee4ec90e9eacbdb4cb7e90b021c6 Mon Sep 17 00:00:00 2001 From: Andrea Marziali Date: Tue, 30 Jun 2026 22:02:29 +0200 Subject: [PATCH 101/139] Quickwin: remove unneded strictTraceWrites overrides (#11765) Quickwin: remove unneded strictTraceWrites overrides Co-authored-by: andrea.marziali --- .../mule-4.5/src/test/groovy/mule4/MuleForkedTest.groovy | 6 ------ .../src/test/groovy/mule4/MuleHttpServerForkedTest.groovy | 6 ------ .../src/test/groovy/OpensearchRestClientTest.groovy | 6 ------ .../src/test/groovy/OpensearchNodeClientTest.groovy | 6 ------ 4 files changed, 24 deletions(-) diff --git a/dd-java-agent/instrumentation/mule-4.5/src/test/groovy/mule4/MuleForkedTest.groovy b/dd-java-agent/instrumentation/mule-4.5/src/test/groovy/mule4/MuleForkedTest.groovy index 81c9b9c2a9f..0fc8809a8b6 100644 --- a/dd-java-agent/instrumentation/mule-4.5/src/test/groovy/mule4/MuleForkedTest.groovy +++ b/dd-java-agent/instrumentation/mule-4.5/src/test/groovy/mule4/MuleForkedTest.groovy @@ -22,12 +22,6 @@ import spock.lang.Shared class MuleForkedTest extends WithHttpServer { - // TODO since mule uses reactor core, things sometime propagate to places where they're not closed - @Override - boolean useStrictTraceWrites() { - return false - } - @Override protected void configurePreAgent() { super.configurePreAgent() diff --git a/dd-java-agent/instrumentation/mule-4.5/src/test/groovy/mule4/MuleHttpServerForkedTest.groovy b/dd-java-agent/instrumentation/mule-4.5/src/test/groovy/mule4/MuleHttpServerForkedTest.groovy index c5b060a2f2b..a9cc6ba8e9b 100644 --- a/dd-java-agent/instrumentation/mule-4.5/src/test/groovy/mule4/MuleHttpServerForkedTest.groovy +++ b/dd-java-agent/instrumentation/mule-4.5/src/test/groovy/mule4/MuleHttpServerForkedTest.groovy @@ -9,12 +9,6 @@ import spock.lang.Shared class MuleHttpServerForkedTest extends HttpServerTest { - // TODO since mule uses reactor core, things sometime propagate to places where they're not closed - @Override - boolean useStrictTraceWrites() { - return false - } - @Override boolean testRedirect() { // Dynamic adding of headers to and HttpResponse from inside a mule application seems diff --git a/dd-java-agent/instrumentation/opensearch/opensearch-rest-1.0/src/test/groovy/OpensearchRestClientTest.groovy b/dd-java-agent/instrumentation/opensearch/opensearch-rest-1.0/src/test/groovy/OpensearchRestClientTest.groovy index fe8a6e8d4e3..b6722fbc7e3 100644 --- a/dd-java-agent/instrumentation/opensearch/opensearch-rest-1.0/src/test/groovy/OpensearchRestClientTest.groovy +++ b/dd-java-agent/instrumentation/opensearch/opensearch-rest-1.0/src/test/groovy/OpensearchRestClientTest.groovy @@ -31,12 +31,6 @@ class OpensearchRestClientTest extends InstrumentationSpecification { @Shared RestClient client - @Override - boolean useStrictTraceWrites() { - //FIXME IDM - false - } - def setupSpec() { aosWorkingDir = File.createTempDir("test-aos-working-dir-", "") diff --git a/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/src/test/groovy/OpensearchNodeClientTest.groovy b/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/src/test/groovy/OpensearchNodeClientTest.groovy index 153a764ac71..97a8f801ea0 100644 --- a/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/src/test/groovy/OpensearchNodeClientTest.groovy +++ b/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/src/test/groovy/OpensearchNodeClientTest.groovy @@ -28,12 +28,6 @@ class OpensearchNodeClientTest extends InstrumentationSpecification { def client = testNode.client() - @Override - boolean useStrictTraceWrites() { - //FIXME IDM - false - } - @Override protected void configurePreAgent() { super.configurePreAgent() From 2489b791a8de0bea79770e782c0ff3c2c71bd53f Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Tue, 30 Jun 2026 18:57:32 -0400 Subject: [PATCH 102/139] Refactored confusing mention of `JDK 7`. (#11818) Refactored confusing mention of `JDK 7`. Added `oracle8` and moved to correct place. Co-authored-by: alexey.kuznetsov --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bcd398822a9..a56fe676388 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -744,7 +744,6 @@ muzzle-dep-report: needs: [] variables: <<: *tier_m_variables - # arm64 does not include JDK 7 or ibm8 (upstream images not published for arm64). DEFAULT_TEST_JVMS: /^(8|11|17|21|25|tip)$/ GRADLE_PARAMS: "-PskipFlakyTests" TESTCONTAINERS_CHECKS_DISABLE: "true" @@ -757,6 +756,7 @@ muzzle-dep-report: - if: $testJvm =~ $DEFAULT_TEST_JVMS when: manual allow_failure: true + # Note: `ibm8` and `oracle8` omitted — no arm64 images published upstream. - if: '$NON_DEFAULT_JVMS == "true" && $testJvm != "ibm8" && $testJvm != "oracle8"' when: manual allow_failure: true From 019fecb34411a6e6ed953aca5de7e31a93a331f1 Mon Sep 17 00:00:00 2001 From: Douglas Q Hawkins Date: Tue, 30 Jun 2026 21:21:07 -0400 Subject: [PATCH 103/139] Fix AppSec/IAST context dropped when trace.propagation.behavior.extract=ignore/restart (#11666) Fix AppSec/IAST context dropped when trace.propagation.behavior.extract=ignore/restart With IGNORE or RESTART, CoreSpanBuilder nulls the remote TagContext parent before buildSpanContext reaches the instanceof TagContext branch that copies requestContextDataAppSec/requestContextDataIast. The AppSec context is lost and GatewayBridge callbacks no-op, silently bypassing WAF/RASP for all inbound requests in AppSec-enabled services configured to ignore distributed tracing extraction. Fix: promote the AppSec/IAST data from the TagContext into the builder fields before nulling the parent. The builder-field path in buildSpanContext applies these after the parent is gone, preserving the request context while still correctly dropping trace identifiers and sampling priority. Fixes: APMSP-3198 Co-Authored-By: Claude Sonnet 4.6 Apply spotless formatting Co-Authored-By: Claude Sonnet 4.6 Merge branch 'master' into dougqh/fix-appsec-context-extract-ignore Co-authored-by: devflow.devflow-routing-intake --- .../java/datadog/trace/core/CoreTracer.java | 12 +++++++ .../trace/core/CoreSpanBuilderTest.java | 34 +++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java b/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java index 28f9e39c710..75513b1b01e 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java @@ -1790,6 +1790,18 @@ protected static final AgentSpan startSpan( // Handle remote terminated span context as span links if (parentSpanContext != null && parentSpanContext.isRemote()) { + // Preserve AppSec/IAST request context before dropping the remote parent: when + // extract=IGNORE or RESTART the TagContext parent is nulled before buildSpanContext + // can copy requestContextDataAppSec/Iast into DDSpanContext. + if (parentSpanContext instanceof TagContext) { + TagContext tc = (TagContext) parentSpanContext; + if (builderRequestContextDataAppSec == null) { + builderRequestContextDataAppSec = tc.getRequestContextDataAppSec(); + } + if (builderRequestContextDataIast == null) { + builderRequestContextDataIast = tc.getRequestContextDataIast(); + } + } switch (Config.get().getTracePropagationBehaviorExtract()) { case RESTART: links = addParentSpanLink(links, parentSpanContext); diff --git a/dd-trace-core/src/test/java/datadog/trace/core/CoreSpanBuilderTest.java b/dd-trace-core/src/test/java/datadog/trace/core/CoreSpanBuilderTest.java index 000598ca7c9..45b559707bf 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/CoreSpanBuilderTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/CoreSpanBuilderTest.java @@ -422,6 +422,40 @@ void buildContextFromExtractedContextWithIgnoreBehavior() { assertTrue(span.getLinks().isEmpty()); } + @Test + @WithConfig(key = "trace.propagation.behavior.extract", value = "ignore") + void appSecContextPreservedFromTagContextWithIgnoreBehavior() { + Object appSecData = new Object(); + Object iastData = new Object(); + TagContext tagContext = + new TagContext() + .withRequestContextDataAppSec(appSecData) + .withRequestContextDataIast(iastData); + + DDSpan span = (DDSpan) tracer.buildSpan("test", "op name").asChildOf(tagContext).start(); + + assertEquals(appSecData, span.getRequestContext().getData(RequestContextSlot.APPSEC)); + assertEquals(iastData, span.getRequestContext().getData(RequestContextSlot.IAST)); + span.finish(); + } + + @Test + @WithConfig(key = "trace.propagation.behavior.extract", value = "restart") + void appSecContextPreservedFromTagContextWithRestartBehavior() { + Object appSecData = new Object(); + Object iastData = new Object(); + TagContext tagContext = + new TagContext() + .withRequestContextDataAppSec(appSecData) + .withRequestContextDataIast(iastData); + + DDSpan span = (DDSpan) tracer.buildSpan("test", "op name").asChildOf(tagContext).start(); + + assertEquals(appSecData, span.getRequestContext().getData(RequestContextSlot.APPSEC)); + assertEquals(iastData, span.getRequestContext().getData(RequestContextSlot.IAST)); + span.finish(); + } + @TableTest({ "scenario | origin | tagMap ", "empty tag map | | [:] ", From b1b69101fbacf095a9e7f81fab674ce09d192f6d Mon Sep 17 00:00:00 2001 From: Douglas Q Hawkins Date: Wed, 1 Jul 2026 01:12:25 -0400 Subject: [PATCH 104/139] Per-component / tag cardinality limits in client-side stats (#11387) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use cached span.kind ordinal in metrics producer; drop tag-map lookup JFR profiling showed ~21% of producer CPU time spent in tag-map lookups during ClientStatsAggregator.publish. One of those lookups -- span.kind -- is redundant because DDSpanContext already caches the kind as a byte ordinal that resolves to a String via a small array. - Add CoreSpan.getSpanKindString() with a default that falls back to the tag map for non-DDSpan impls; DDSpan overrides to delegate to the context's cached resolution. - Hoist schema.names array out of the capturePeerTagValues loop. - Avoid an unnecessary toString() in isSynthetic by declaring SYNTHETICS_ORIGIN as String and using contentEquals. Benchmark (ClientStatsAggregatorDDSpanBenchmark): before: 2.410 us/op after: 1.995 us/op (~17% improvement) vs. master baseline (6.428 us/op): now ~3.2x faster. Co-Authored-By: Claude Opus 4.7 (1M context) Add client metrics pipeline design doc Captures the producer/consumer split, the canonical-key trick that makes cardinality-blocking actually save space, the once-per-trace peer-tag schema sync, the role of each file in datadog.trace.common.metrics, and the rationale behind the redesign from ConflatingMetricsAggregator. Co-Authored-By: Claude Opus 4.7 (1M context) Add unit tests for Hashtable and LongHashingUtils LongHashingUtilsTest (14 cases): - hashCodeX null sentinel + non-null pass-through - all primitive hash() overloads match the boxed Java hashCodes - hash(Object...) 2/3/4/5-arg overloads match the chained addToHash formula they are documented to constant-fold to - addToHash(long, primitive) overloads match the Object-version - linear-accumulation invariant (31 * h + v) holds across a sequence - iterable / deprecated int[] / deprecated Object[] variants match chained addToHash - intHash treats null as 0 (observable via hash(null, "x")) HashtableTest (24 cases across 5 nested classes): - D1: insert/get/remove/insertOrReplace/clear/forEach, in-place value mutation, null-key handling, hash-collision chaining with disambig- uating equals, remove-from-collided-chain leaves siblings intact - D2: pair-key identity, remove(pair), insertOrReplace matches on both parts, forEach - Support: capacity rounds up to a power of two, bucketIndex stays in range across a wide hash sample, clear nulls every slot - BucketIterator: walks only matching-hash entries in a chain, throws NoSuchElementException when exhausted - MutatingBucketIterator: remove from head-of-chain unlinks, replace swaps the entry while preserving chain, remove() without prior next() throws IllegalStateException Tests live in internal-api/src/test/java/datadog/trace/util and use the already-present JUnit 5 setup. Co-Authored-By: Claude Opus 4.7 (1M context) Apply spotless formatting to Hashtable and LongHashingUtils Bring the new util/ files in line with google-java-format (tabs → spaces, line wrapping, javadoc list markup) so spotlessCheck passes in CI. Co-Authored-By: Claude Opus 4.7 (1M context) Add JMH benchmarks for Hashtable.D1 and D2 Compares Hashtable.D1 and Hashtable.D2 against equivalent HashMap usage for add, update, and iterate operations. Each benchmark thread owns its own map (Scope.Thread), but @Threads(8) is used so the allocation/GC pressure that Hashtable is designed to avoid surfaces in the throughput numbers. Co-Authored-By: Claude Opus 4.7 (1M context) Add benchmark results to HashtableBenchmark header Co-Authored-By: Claude Opus 4.7 (1M context) Address review feedback on Hashtable - Guard Support.sizeFor against overflow and use Integer.highestOneBit; reject capacities above 1 << 30 instead of looping forever. - Add braces around single-statement while bodies in BucketIterator. - Split HashtableBenchmark into HashtableD1Benchmark / HashtableD2Benchmark. - Add regression tests for Support.sizeFor bounds. Co-Authored-By: Claude Opus 4.7 (1M context) Fix dropped argument in HashingUtils 5-arg Object hash The 5-arg Object overload was forwarding only obj0..obj3 to the int overload, silently dropping obj4. Also align LongHashingUtils.hash 3-arg signature with its 2/4/5-arg siblings (int parameters) and strengthen the 5-arg HashingUtilsTest to detect the missing-arg regression. Co-Authored-By: Claude Opus 4.7 (1M context) Address review feedback on Hashtable - Split D1Tests and D2Tests into HashtableD1Test and HashtableD2Test; extract shared test entry classes into HashtableTestEntries. - Reduce visibility of LongHashingUtils.hash(int...) chaining overloads to package-private; they are internal building blocks. Co-Authored-By: Claude Opus 4.7 (1M context) Drop reflection in iterator tests via package-private D1.buckets The iterator tests need a populated Hashtable.Entry[] to drive Support.bucketIterator / mutatingBucketIterator. Relaxing D1.buckets from private to package-private lets the same-package tests read it directly, removing the reflection helper. Co-Authored-By: Claude Opus 4.7 (1M context) Resize previousCounts for inbox-full health metric The new reason:inbox_full reportIfChanged call advances countIndex to 51, but previousCounts was still sized for 51 counters (max index 50), so the metric never emitted and the resize warning fired every flush. Bump the array to 52 and add a regression test that exercises the flush path. Co-Authored-By: Claude Opus 4.7 (1M context) Fold AggregateMetric into AggregateEntry The label fields and the mutable counters/histograms are 1:1 with each entry; carrying them on a separate object meant one extra allocation per unique key plus an indirection on every hot-path update. Merging them puts the counters directly on AggregateEntry, drops the entry.aggregate hop, and consolidates ERROR_TAG / TOP_LEVEL_TAG onto the same class the consumer uses to decode them. AggregateTable.findOrInsert now returns AggregateEntry. Callers in Aggregator and SerializingMetricWriter updated. Migrated AggregateMetricTest.groovy to AggregateEntryTest.java per project policy. Co-Authored-By: Claude Opus 4.7 (1M context) Avoid capturing lambda in Aggregator.report Add a context-passing forEach(T, BiConsumer) overload to AggregateTable, mirroring TagMap's pattern. Aggregator.report now hands the writer in as context to a static BiConsumer so no fresh Consumer is allocated each report cycle. Co-Authored-By: Claude Opus 4.7 (1M context) Add context-passing forEach to Hashtable.D1 and D2 Mirrors the TagMap pattern: pairs the existing forEach(Consumer) with a forEach(T context, BiConsumer) overload so callers can hand side-band state to a non-capturing lambda and avoid the fresh-Consumer-per-call allocation. Co-Authored-By: Claude Opus 4.7 (1M context) Move forEach loop body to Support helper Factors the unchecked (TEntry) cast out of D1.forEach / D2.forEach (and the BiConsumer variants) into Support.forEach(buckets, ...). The cast now lives in one place, mirroring how Entry.next() handles it, and the D1/D2 methods become one-liners. Downstream higher-arity tables built on Support gain the same helper. Co-Authored-By: Claude Opus 4.7 (1M context) Merge branch 'dougqh/util-hashtable' into dougqh/optimize-metric-key Delegate AggregateTable.forEach to Support.forEach Now that Hashtable.Support exposes the parameterized forEach helpers, AggregateTable's own forEach methods can drop their duplicated loop body and the (AggregateEntry) cast. Co-Authored-By: Claude Opus 4.7 (1M context) Move bucket-head cast to Support.bucket helper Adds Support.bucket(buckets, keyHash) which returns the bucket head already cast to the caller's concrete entry type. D1.get and D2.get now drop the raw-Entry intermediate variable and walk the chain via Entry.next() directly. The unchecked cast lives in one place, consistent with Entry.next() and Support.forEach. Co-Authored-By: Claude Opus 4.7 (1M context) Merge branch 'dougqh/util-hashtable' into dougqh/optimize-metric-key Use Support.bucket and type chain walks as AggregateEntry - findOrInsert: walks via Support.bucket(buckets, keyHash) instead of Hashtable.Entry + intermediate cast; bucketIndex is only computed on the miss path now. - evictOneStale / expungeStaleAggregates: chain variables typed as AggregateEntry from the head down, leveraging Entry.next()'s generic inference, so the per-iteration getHitCount() checks drop their (AggregateEntry) cast. Co-Authored-By: Claude Opus 4.7 (1M context) Drop d1_/d2_ prefix from per-table benchmark methods Holdover from when both lived in a shared HashtableBenchmark; redundant now that each lives in its own class. Co-Authored-By: Claude Opus 4.7 (1M context) Add DDAgentFeaturesDiscovery.peerTagsRevision() Monotonically increases each time the discovered peerTags Set differs from the previous one. Lets callers detect peer-tag config changes with a long compare instead of a Set.equals (or leaning on Set-identity, which was an implementation accident, not part of the public contract). Co-Authored-By: Claude Opus 4.7 (1M context) Move peer-tag schema cache from PeerTagSchema statics to ClientStatsAggregator PeerTagSchema previously held its current schema + last-synced-Set in static volatile fields with a synchronized rebuild. The "is it stale?" signal was an identity check on the Set instance returned by features.peerTags() -- a correct but indirect reading of a DDAgentFeaturesDiscovery invariant. Replace that with: - ClientStatsAggregator keeps its own (volatile PeerTagSchema, volatile long cachedPeerTagsRevision) cache pair, rebuilt under synchronized when the revision returned by features.peerTagsRevision() doesn't match. - PeerTagSchema becomes a pure data holder: static factory PeerTagSchema.of, the INTERNAL singleton, and an instance resetCardinalityHandlers(). The static CURRENT, LAST_SYNCED_INPUT, and the synchronized rebuild block are gone. - Aggregator gains a Runnable onResetCardinality hook fired right after AggregateEntry.resetCardinalityHandlers(). ClientStatsAggregator wires it to reset its cached schema's handlers each report cycle. - AggregateEntry.resetCardinalityHandlers() resets PeerTagSchema.INTERNAL directly instead of the removed PeerTagSchema.resetAll(). Co-Authored-By: Claude Opus 4.7 (1M context) Add Hashtable.Support helpers: MAX_RATIO, insertHeadEntry, MutatingTableIterator Three consumer-facing helpers that callers building higher-arity tables on top of Hashtable.Support kept open-coding: - MAX_RATIO_NUMERATOR / _DENOMINATOR: the 4/3 multiplier for sizing a bucket array from a target working-set under a 75% load factor. - insertHeadEntry(buckets, bucketIndex, entry): the (setNext + array-store) pair for splicing a new entry at the head of a bucket chain. - MutatingTableIterator + Support.mutatingTableIterator(buckets): walks every entry in the table (not filtered by hash) with remove() support, for sweeps like eviction and expunge that aren't keyed to a specific hash. Sibling of MutatingBucketIterator. Tests cover the table-wide iterator at head-of-bucket and mid-chain removal, empty buckets between live entries, exhaustion, and remove-without-next. Co-Authored-By: Claude Opus 4.7 (1M context) Merge branch 'dougqh/util-hashtable' into dougqh/optimize-metric-key Simplify AggregateTable via new Hashtable.Support helpers - Constructor sizing now uses Support.MAX_RATIO_NUMERATOR / _DENOMINATOR instead of an open-coded * 4 / 3. - findOrInsert delegates the chain-head splice to Support.insertHeadEntry. - evictOneStale and expungeStaleAggregates both rewritten in terms of Support.mutatingTableIterator. Drops the bespoke head-vs-mid-chain branching that read as more complicated than the operation actually is. Net -28 lines in AggregateTable. Co-Authored-By: Claude Opus 4.7 (1M context) Swap MAX_RATIO numerator/denominator pair for a single float + scaled create() Replace Support.MAX_RATIO_NUMERATOR / _DENOMINATOR with a single float MAX_RATIO constant, and add a Support.create(int, float) overload that takes a scale factor. Callers now write Support.create(n, MAX_RATIO) instead of stitching together the int arithmetic at the call site. The scaled size is truncated (not ceiled) before going through sizeFor. sizeFor already rounds up to the next power of two, so truncation just absorbs float fuzz that would otherwise push a result like 12 * 4/3 = 16.0000005f past 16 and double the bucket array size for no reason. Co-Authored-By: Claude Opus 4.7 (1M context) Merge branch 'dougqh/util-hashtable' into dougqh/optimize-metric-key Address second-round review on AggregateTable / Aggregator - AggregateTable: switch to Support.create(maxAggregates, Support.MAX_RATIO) now that the load-factor scaling is a Support concern. - AggregateTable: replace open-coded "keyHash == X && matches(s)" with a new AggregateEntry.matches(long keyHash, SpanSnapshot) overload that bundles the hash gate. - AggregateTable: rename local iterator var "it" -> "iter". - Aggregator: drop WRITE_AND_CLEAR static field, inline as a non-capturing lambda; the JIT reuses non-capturing lambdas, no need for the static until a profile says otherwise. - Aggregator: comment the ClearSignal branch with the thread-safety rationale (single-writer invariant for AggregateTable). Co-Authored-By: Claude Opus 4.7 (1M context) Tighten Hashtable docs + rename MAX_CAPACITY to MAX_BUCKETS Five small cleanups from a design re-review pass: 1. Support javadoc: drop the stale "methods are package-private" sentence; most of them were made public in earlier commits for higher-arity callers. Also drop the "nested BucketIterator" framing (iterators are peers of Support inside Hashtable, not nested inside Support). 2. MAX_RATIO javadoc: drop the Math.ceil recommendation; create(int, float) deliberately truncates and is the canonical pathway. 3. Document the null-hash treatment on D1.Entry.hash and D2.Entry.hash so the behavior difference is explicit: D1 uses Long.MIN_VALUE as a sentinel that's collision-free against any int-valued hashCode(); D2 has no such sentinel and relies on matches() to resolve null/null vs hash-0 collisions. 4. Rename Support.MAX_CAPACITY -> MAX_BUCKETS and sizeFor's parameter to requestedSize. The cap is on the bucket-array length, not entry count; the new name reflects that. Error messages updated to match. 5. Drop the `abstract` modifier on Hashtable in favor of `final` with a private constructor. Nothing actually subclasses Hashtable -- the abstract was a namespace device that read as "intended for extension." Co-Authored-By: Claude Opus 4.7 (1M context) Dedupe chain-head splice in D1/D2 via keyHash insertHeadEntry overload - Add Support.insertHeadEntry(buckets, long keyHash, entry) overload that derives the bucket index itself. Callers that already have a hash but not the index (the common case) now avoid the redundant bucketIndex(...) hop. - D1.insert, D1.insertOrReplace, D2.insert, D2.insertOrReplace: use the new overload, drop the (thisBuckets local, bucketIndex compute, setNext, store) sequence at each call site. - D2.buckets: drop the `private` modifier to match D1.buckets. Both are package-private so iterator tests in the same package can drive Support.bucketIterator against the table's bucket array. Added a short comment on both fields documenting the rationale. Co-Authored-By: Claude Opus 4.7 (1M context) Tighten Entry.next encapsulation; doc hasNext; add D1/D2 getOrCreate Three follow-ups from the design review: - Make Hashtable.Entry.next private. All same-package readers (BucketIterator) already had a next() accessor; the leftover direct field reads now route through it. Closes the "mixed encapsulation" gap where some readers used the accessor and same-package ones reached for the field. - BucketIterator and MutatingBucketIterator now document that chain-walk work happens in next() (and the constructor for the first match); hasNext() is an O(1) field read. - Add D1.getOrCreate(K, Function) and D2.getOrCreate(K1, K2, BiFunction). Both reuse the lookup hash for the insert on miss, avoiding the double-hash that "get; if null then insert" callers would otherwise pay. Co-Authored-By: Claude Opus 4.7 (1M context) Merge branch 'dougqh/util-hashtable' into dougqh/optimize-metric-key Use keyHash insertHeadEntry overload in AggregateTable.findOrInsert Picks up the Support.insertHeadEntry(buckets, long keyHash, entry) overload added on the util-hashtable branch; saves the redundant Support.bucketIndex(buckets, keyHash) hop at the call site. Co-Authored-By: Claude Opus 4.7 (1M context) Merge dougqh/optimize-metric-key into dougqh/control-tag-cardinality Pulls in the util-hashtable design pass (MAX_RATIO, insertHeadEntry keyHash overload, MutatingTableIterator, Entry.next privatization, getOrCreate, MAX_BUCKETS rename, doc tightening, etc.) and the AggregateTable simplifications that came with it. Reconciliation notes: - AggregateEntry / AggregateMetric: this branch keeps the split design (AggregateEntry holds labels + an AggregateMetric counter ref). The optimize-metric-key branch had collapsed them into a single AggregateEntry. Resolution: keep the split (HEAD's design) -- it's more recent and supports the cardinality-canonicalization layer. - AggregateEntryTest.java (new in optimize-metric-key, exercises the collapsed design) deleted; AggregateMetricTest.groovy stays as the counter-side coverage for the split design. - AggregateTable: apply the optimize-metric-key cleanups on top of the Canonical-pattern findOrInsert -- Support.create(n, MAX_RATIO), Support.bucket for the chain head, Support.insertHeadEntry(keyHash), Support.mutatingTableIterator for evictOneStale and expungeStaleAggregates, Support.forEach for forEach. Also add the context-passing forEach overload to match the BiConsumer the Aggregator already uses. - Aggregator.report: keep the BiConsumer + context lambda (non-capturing); body adapted to entry.aggregate.clear() for the split design. - Aggregator.Drainer: keep AggregateMetric as the findOrInsert return type (matches the table's actual signature). - SerializingMetricWriter, SerializingMetricWriterTest, ClientStatsAggregatorTest, AggregateTableTest, SpanSnapshot, MetricWriter: restore HEAD's versions where the auto-merge had taken the optimize-metric-key shape (counters via entry.* vs entry.aggregate.*) -- HEAD's versions match this branch's design. Co-Authored-By: Claude Opus 4.7 (1M context) Fold AggregateMetric into AggregateEntry Adopts the optimize-metric-key design choice: one entry type that holds both the canonical label fields and the counter / histogram state. The prior split (AggregateMetric for counters, AggregateEntry for labels) required every counter read to hop through entry.aggregate -- ~30 sites across SerializingMetricWriter, the Aggregator, and the test suites. - AggregateEntry now owns ERROR_TAG, TOP_LEVEL_TAG, the okLatencies and errorLatencies histograms, hitCount/errorCount/topLevelCount/duration counters, and the recordOneDuration / recordDurations / clear methods that used to live on AggregateMetric. - AggregateMetric.java and AggregateMetricTest.groovy deleted. - AggregateTable.findOrInsert now returns AggregateEntry (not the inner AggregateMetric); Canonical.toEntry no longer takes an AggregateMetric arg. - Aggregator.Drainer reverts to AggregateEntry; the report lambda calls entry.clear() directly. - SerializingMetricWriter, ClientStatsAggregator imports, and all three test files updated to read counters from entry.* (not entry.aggregate.*). - AggregateEntryTest.java added with the recordOneDuration / recordDurations / clear coverage that AggregateMetricTest.groovy used to provide. Co-Authored-By: Claude Opus 4.7 (1M context) Remove accidentally-staged .claude/worktrees entries Replace // nullable comments with @Nullable annotations on AggregateEntry Use javax.annotation.Nullable (the codebase's convention -- see DDSpan, TagInterceptor, ScopeContext, etc.) on the four nullable label fields (serviceSource, httpMethod, httpEndpoint, grpcStatusCode), their getters, and the corresponding parameters of AggregateEntry.of. Co-Authored-By: Claude Opus 4.7 (1M context) Drop redundant load-factor comment from AggregateTable ctor Support.MAX_RATIO and the scaled create(int, float) overload already convey the 75% load-factor intent at the call site -- the inline comment was duplicating their self-documentation. Co-Authored-By: Claude Opus 4.7 (1M context) Import java.util.Objects in AggregateEntry instead of fully qualifying Style nit -- the equals() method had eight fully-qualified references to java.util.Objects.equals; add the import and drop the qualifier. Co-Authored-By: Claude Opus 4.7 (1M context) Document evictOneStale cost and disable() best-effort offer Two design-review trade-offs that won't change in this PR but should be explicit at the call sites: - AggregateTable.evictOneStale: O(N) scan per call (vs LRUCache's O(1)), acceptable because the new policy drops the *new* key on cap-overrun rather than evicting an established one -- so eviction is expected to be rare. Cursor-caching is the future optimization if a workload runs persistently at cap. - ConflatingMetricsAggregator.disable: single inbox.offer(CLEAR) is best-effort. If the inbox is full the clear is dropped, but the system self-heals (supportsMetrics() is already false, the next report-sink-rejection retries disable). Worst case is one extra cycle of stale data, not a leak. Co-Authored-By: Claude Opus 4.7 (1M context) Skip SpanSnapshot allocation when the inbox is already at capacity publish() previously did all of the tag extraction (peer-tag pairs, HTTP method/endpoint, span kind, gRPC status) and the SpanSnapshot allocation before calling inbox.offer; on a full inbox the offer failed and everything became garbage. Early-out with an approximate size() vs capacity() check up front. The jctools MPSC queue's size() is best-effort but that's fine: under- estimation falls through to the existing offer-as-source-of-truth path, over-estimation drops a snapshot that would have fit (and onStatsInboxFull was about to fire on the next span anyway). error is computed first so the force-keep return is correct whether or not the snapshot is built. Co-Authored-By: Claude Opus 4.7 (1M context) Address review on AggregateEntry nullables + PeerTagSchema revision - Replace `// nullable` comments on AggregateEntry's 4 nullable label fields (entry + Canonical scratch buffer) with `@Nullable` annotations. Also annotate the matching getters and of(...) factory parameters. - Move the cache revision into PeerTagSchema as a final field (peerTagsRevision), built via PeerTagSchema.of(names, revision). One field on the schema carries the cache key, so the hot path is a single volatile read + long compare against schema.peerTagsRevision -- no separate cachedPeerTagsRevision field on ClientStatsAggregator. When peer tags are unconfigured the cache stores an empty schema (size 0) carrying the revision rather than null, so subsequent publishes still short-circuit on the fast path. peerTagSchemaFor treats `schema.size() == 0` as "skip peer-agg processing" for client/producer/consumer kinds. INTERNAL is built with a -1L sentinel revision. Co-Authored-By: Claude Opus 4.7 (1M context) Consolidate cardinality-handler reset behind one entry point Reset was split between two owners: Aggregator.report called AggregateEntry.resetCardinalityHandlers (static handlers + INTERNAL) then ran a separate onResetCardinality callback that ClientStats wired up to reset its cached non-INTERNAL peer-agg schema. Anyone adding a new handler had to know which side to put it on. Make the callback the only entry point. ClientStatsAggregator. resetCardinalityHandlers (renamed from resetCachedPeerAggSchema) now calls AggregateEntry.resetCardinalityHandlers() itself plus the cached peer-agg schema reset. Aggregator.report just runs the callback -- it no longer knows about AggregateEntry's static state. Co-Authored-By: Claude Opus 4.7 (1M context) Parameterize PropertyCardinalityHandler on T extends CharSequence Each handler is now typed to its SpanSnapshot field type, so the HashMap's key class has well-defined equals/hashCode rather than the abstract CharSequence interface. For String-typed fields (service, spanKind, httpMethod, httpEndpoint, grpcStatusCode) the cache hits reliably. For CharSequence-typed fields (resource, operationName, serviceSource, type) consistency still depends on the producer returning a single concrete class per field -- a pre-existing runtime contract -- but the type system now prevents call sites from accidentally passing a different shape. registerOrEmpty is now generic so it threads T through. Co-Authored-By: Claude Opus 4.7 (1M context) Add long-lived LRU cache to PropertyCardinalityHandler Previously, reset() cleared the only cache, so every reporting cycle re-allocated UTF8BytesString instances for every property value seen again. Sustained allocations on the aggregator thread proportional to the sum of per-field cardinality limits, ~bytes/sec, on every reset. Split the state in two: - seenThisCycle (HashSet): consumed-budget tracking, cleared on reset(). - utf8Cache (LinkedHashMap in access-order, 2x cardinalityLimit): long-lived; survives reset; LRU eviction once full. Workloads with stable value sets pay zero UTF8 allocations after the first cycle. The reused instances also short-circuit downstream equals to identity comparisons. Drops the TODO at the prior allocation site. Co-Authored-By: Claude Opus 4.7 (1M context) Centralize per-field cardinality limits in MetricCardinalityLimits The 9 property limits and the peer-tag value limit were sprinkled inline. Pull them into a single class with per-field javadoc so the sizing rationale lives in one place. Six values change from the DDCache-inherited defaults based on workload analysis: - RESOURCE 32 -> 128 (highest-cardinality field; tight today) - HTTP_ENDPOINT 32 -> 64 (same shape as RESOURCE for HTTP-heavy) - TYPE 8 -> 16 (DDSpanTypes catalogue is ~30) - HTTP_METHOD 8 -> 16 (WebDAV/custom verbs push past 8) - SPAN_KIND 16 -> 8 (OTel defines exactly 5 standard kinds) - GRPC_STATUS 32 -> 24 (gRPC spec has exactly 17 codes) SERVICE, OPERATION, SERVICE_SOURCE, and PEER_TAG_VALUE keep their current values. Net worst-case memory delta: roughly +90 KB driven by the RESOURCE and HTTP_ENDPOINT bumps. Co-Authored-By: Claude Opus 4.7 (1M context) Reimplement cardinality handlers as open-addressed flat arrays Replaces the previous LinkedHashMap-based design for PropertyCardinality Handler (and the HashMap-based TagCardinalityHandler) with parallel Object[] / UTF8BytesString[] arrays and linear-probing open addressing. Two tables per handler, "current cycle" and "prior cycle": - Capacity is the next power of two >= 2 * cardinalityLimit, so the linear-probing load factor stays <= 0.5 even when the budget is full. - Current tracks values that have consumed a slot of the cardinality budget this cycle. - Prior holds the just-completed cycle's entries verbatim. A first-time- this-cycle value that hits in prior reuses its UTF8BytesString instance -- no re-allocation. Implements the cross-reset reuse that the prior commit's LinkedHashMap LRU provided, with less overhead. Reset swaps the table pointers (just-completed cycle -> prior; the 2-cycles-ago tables get nulled out and become the new empty current). One O(capacity) pass, half the work of a copy-then-null. Wins: - No per-entry Node allocations (HashMap / LinkedHashMap) and no access-order linked-list maintenance per get. - Smaller working set: two Object[] + two UTF8BytesString[] per handler vs HashMap + HashSet + LinkedHashMap heap shapes. - Stable workloads pay zero UTF8BytesString allocations after the first cycle and produce identical references across cycles, so downstream equals short-circuits to ==. Co-Authored-By: Claude Opus 4.7 (1M context) Drop parallel keys array in PropertyCardinalityHandler The stored UTF8BytesString can serve as the slot's identity on its own: its hashCode() returns the underlying String.hashCode (content-stable with whatever shape the input takes), and equality is checked via stored.toString().contentEquals(value) -- the JDK's content-equality routine that fast-paths to String.equals when the input is a String. Halves the per-handler array footprint: one UTF8BytesString[] per cycle (current + prior) instead of one Object[] + one UTF8BytesString[] per cycle. No behavior change. TagCardinalityHandler keeps the parallel-arrays shape because its stored UTF8 is "tag:value" and cannot be compared directly against the bare incoming value. Co-Authored-By: Claude Opus 4.7 (1M context) Drop type parameter from PropertyCardinalityHandler The type parameter was load-bearing when slot identity went through a parallel Object[] keys array (where T determined the runtime class whose equals/hashCode the HashMap used). The single-array shape probes via UTF8BytesString.hashCode() (content-stable with the underlying String) and stored.toString().contentEquals(value), so any CharSequence input -- String, UTF8BytesString, anything else with a content-stable hash -- collapses to the right slot. register(CharSequence value) is enough. AggregateEntry's 9 static handler declarations and the registerOrEmpty helper lose their type parameters too. Co-Authored-By: Claude Opus 4.7 (1M context) Guard cardinality-handler ctor against pathological inputs - Both handlers now reject cardinalityLimit > 2^29 to prevent overflow in the (cardinalityLimit * 2 - 1) capacity calc. Practical limits are 8..512 so this is well beyond any realistic configuration. - TagCardinalityHandler's keys array is now String[] (was Object[]) to match the actual contract -- minor clarity win. Co-Authored-By: Claude Opus 4.7 (1M context) Make EMPTY the universal absent sentinel for AggregateEntry UTF8 fields PropertyCardinalityHandler.register(null) now returns UTF8BytesString .EMPTY. All AggregateEntry UTF8 fields are non-null. Callers stop checking for null at every site. - AggregateEntry: drop @Nullable on serviceSource/httpMethod/ httpEndpoint/grpcStatusCode (both the entry fields and the Canonical scratch buffer). Drop @Nullable on getters and on the of factory parameters. Drop the unused registerOrEmpty helper. - Canonical.populate: each field is now this.field = HANDLER.register (s.field) -- no inline conditionals. - of() factory: drop the value == null ? null : createUtf8(value) pattern; createUtf8 already returns EMPTY on null. - SerializingMetricWriter: switch the four presence checks from != null to != EMPTY (identity comparison on the singleton). Net win: nine identically-shaped call sites in Canonical.populate and a smaller null surface across the package. Co-Authored-By: Claude Opus 4.7 (1M context) Use EMPTY consistently for absent values in peer-tag canonicalization - TagCardinalityHandler.register now mirrors PropertyCardinalityHandler: null input returns UTF8BytesString.EMPTY. - Canonical.populatePeerTags now calls register for every schema slot and tests the result against EMPTY rather than the input against null. The wire-format buffer still holds only present peer tags (EMPTY is elided), but the check is now consistent with how AggregateEntry's scalar UTF8 fields handle absence. Co-Authored-By: Claude Opus 4.7 (1M context) Tighten handler visibility + add tests for EMPTY-on-null contract #4: PropertyCardinalityHandler and TagCardinalityHandler are only consumed within this package; drop `public` from the class declarations, constructors, and methods. They're package-private now. #6: Add tests that lock down the EMPTY-on-null contract that the rest of the package depends on: - CardinalityHandlerTest covers both handlers: register(null) -> EMPTY, and registering null repeatedly doesn't consume the cardinality budget. - AggregateEntryTest covers the entry shape: optional fields built from a snapshot with null inputs resolve to EMPTY; populated optional fields carry their value. Co-Authored-By: Claude Opus 4.7 (1M context) Notify on peer-tag cardinality blocks Adds a per-cycle one-shot warn log + HealthMetrics counter (`stats.tag_cardinality_blocked` with `tag:`) when a peer-tag value gets collapsed to the `blocked_by_tracer` sentinel because its cardinality budget is exhausted. Implemented as a `register(int i, String value)` method on `PeerTagSchema` that does the post-block notification work; `TagCardinalityHandler` exposes `blockedSentinel()` so the schema can identity-compare and stays free of logger / health metric coupling. Warn-once gating uses a `Set` of names seen this cycle, cleared by `resetCardinalityHandlers()`. Co-Authored-By: Claude Opus 4.7 (1M context) Address PR #11387 review: dual-role docs, rename, @Nullable, consumer-side reconcile - PropertyCardinalityHandler / TagCardinalityHandler: header comment explaining the limiter-and-cache dual role and the prior-cycle reuse trick that preserves UTF8 caching across resets. - ClientStatsAggregator: rename peerAggSchema -> peerTagSchema across field, method, and parameter; disambiguate the inner per-span local as spanPeerTagSchema (return of peerTagSchemaFor). - SpanSnapshot: replace prose "or null" docstrings with javax.annotation.@Nullable on peerTagSchema/peerTagValues fields and their constructor params. - Consumer-side peer-tag reconciliation: * DDAgentFeaturesDiscovery: drop State.peerTagsRevision + bump logic + peerTagsRevision() accessor. Expose getLastTimeDiscovered(). * PeerTagSchema: rename peerTagsRevision -> lastTimeDiscovered, drop final (consumer-thread-only mutation), add hasSameTagsAs(Set). * ClientStatsAggregator: producer hot path is now a single volatile read with a one-time synchronized bootstrap; resetCardinalityHandlers runs reconcilePeerTagSchema first, which fast-paths on timestamp equality and either bumps in place (preserving warm handlers when the tag set is unchanged) or swaps in a fresh schema. The schema's timestamp field no longer needs to be volatile because mutation is confined to the aggregator thread. Note: the @Nullable annotations on AggregateEntry's errorLatencies and related fields only apply after the downstream lazy-init / Canonical buffer work; those land in a separate commit on the downstream branches. Co-Authored-By: Claude Opus 4.7 (1M context) Lock in cardinality-handler prior-cycle UTF8 reuse with explicit tests Addresses PR #11387 review (test coverage gap): - Fix misleading comment in propertyResetRefreshesBudget ("the previous instances aren't reused") -- they ARE reused; the test only passed because it asserted on .toString() content rather than identity. - Add propertyPriorCycleInstancesAreReusedAcrossReset: explicit assertSame check that registering the same value after a reset returns the SAME UTF8BytesString instance from the prior cycle. This is the "dual role as cache" property the canonical-key lookup depends on. - Add propertyPriorCycleReuseSurvivesOneResetButNotTwo: nails down the reuse window depth (one cycle, not two). - Add tagPriorCycleInstancesAreReusedAcrossReset mirroring the property handler test for the tag handler (cached "tag:value" UTF8BytesString). Co-Authored-By: Claude Opus 4.7 (1M context) Hashtable: add missing braces and detach removed/replaced entries Addresses PR #11409 review comments: - #3267164119 / #3267165525: wrap every single-line if/break body in braces (7 sites across BucketIterator, MutatingBucketIterator, and the full-table Iterator). - #3275947761 / #3275948108 (sarahchen6): null out the removed/replaced entry's next pointer after splicing it out of the chain in MutatingBucketIterator.remove / .replace. Applied the same fix to the full-table Iterator.remove for consistency. Rationale: detaching prevents accidental traversal through a removed entry via a stale reference and lets the GC reclaim a chain tail that the removed entry was the last referrer to. Co-Authored-By: Claude Opus 4.7 (1M context) Merge branch 'dougqh/util-hashtable' into dougqh/optimize-metric-key Add Hashtable and LongHashingUtils to datadog.trace.util Two general-purpose utilities used by the client-side stats aggregator work (PR #11382 and follow-ups), extracted into their own change so the metrics-specific PRs can build on a smaller, reviewable foundation. - Hashtable: a generic open-addressed-ish bucket table abstraction keyed by a 64-bit hash, with a public abstract Entry type so client code can subclass it for higher-arity keys. The metrics aggregator uses it to back its AggregateTable. - LongHashingUtils: chained 64-bit hash combiners with primitive overloads (boolean, short, int, long, Object). Used in place of varargs combiners to avoid Object[] allocation and boxing on the hot path. No callers within internal-api itself yet -- the metrics aggregator PR will introduce the first usages. Co-Authored-By: Claude Opus 4.7 (1M context) Add unit tests for Hashtable and LongHashingUtils LongHashingUtilsTest (14 cases): - hashCodeX null sentinel + non-null pass-through - all primitive hash() overloads match the boxed Java hashCodes - hash(Object...) 2/3/4/5-arg overloads match the chained addToHash formula they are documented to constant-fold to - addToHash(long, primitive) overloads match the Object-version - linear-accumulation invariant (31 * h + v) holds across a sequence - iterable / deprecated int[] / deprecated Object[] variants match chained addToHash - intHash treats null as 0 (observable via hash(null, "x")) HashtableTest (24 cases across 5 nested classes): - D1: insert/get/remove/insertOrReplace/clear/forEach, in-place value mutation, null-key handling, hash-collision chaining with disambig- uating equals, remove-from-collided-chain leaves siblings intact - D2: pair-key identity, remove(pair), insertOrReplace matches on both parts, forEach - Support: capacity rounds up to a power of two, bucketIndex stays in range across a wide hash sample, clear nulls every slot - BucketIterator: walks only matching-hash entries in a chain, throws NoSuchElementException when exhausted - MutatingBucketIterator: remove from head-of-chain unlinks, replace swaps the entry while preserving chain, remove() without prior next() throws IllegalStateException Tests live in internal-api/src/test/java/datadog/trace/util and use the already-present JUnit 5 setup. Co-Authored-By: Claude Opus 4.7 (1M context) Apply spotless formatting to Hashtable and LongHashingUtils Bring the new util/ files in line with google-java-format (tabs → spaces, line wrapping, javadoc list markup) so spotlessCheck passes in CI. Co-Authored-By: Claude Opus 4.7 (1M context) Add JMH benchmarks for Hashtable.D1 and D2 Compares Hashtable.D1 and Hashtable.D2 against equivalent HashMap usage for add, update, and iterate operations. Each benchmark thread owns its own map (Scope.Thread), but @Threads(8) is used so the allocation/GC pressure that Hashtable is designed to avoid surfaces in the throughput numbers. Co-Authored-By: Claude Opus 4.7 (1M context) Add benchmark results to HashtableBenchmark header Co-Authored-By: Claude Opus 4.7 (1M context) Address review feedback on Hashtable - Guard Support.sizeFor against overflow and use Integer.highestOneBit; reject capacities above 1 << 30 instead of looping forever. - Add braces around single-statement while bodies in BucketIterator. - Split HashtableBenchmark into HashtableD1Benchmark / HashtableD2Benchmark. - Add regression tests for Support.sizeFor bounds. Co-Authored-By: Claude Opus 4.7 (1M context) Fix dropped argument in HashingUtils 5-arg Object hash The 5-arg Object overload was forwarding only obj0..obj3 to the int overload, silently dropping obj4. Also align LongHashingUtils.hash 3-arg signature with its 2/4/5-arg siblings (int parameters) and strengthen the 5-arg HashingUtilsTest to detect the missing-arg regression. Co-Authored-By: Claude Opus 4.7 (1M context) Address review feedback on Hashtable - Split D1Tests and D2Tests into HashtableD1Test and HashtableD2Test; extract shared test entry classes into HashtableTestEntries. - Reduce visibility of LongHashingUtils.hash(int...) chaining overloads to package-private; they are internal building blocks. Co-Authored-By: Claude Opus 4.7 (1M context) Drop reflection in iterator tests via package-private D1.buckets The iterator tests need a populated Hashtable.Entry[] to drive Support.bucketIterator / mutatingBucketIterator. Relaxing D1.buckets from private to package-private lets the same-package tests read it directly, removing the reflection helper. Co-Authored-By: Claude Opus 4.7 (1M context) Add context-passing forEach to Hashtable.D1 and D2 Mirrors the TagMap pattern: pairs the existing forEach(Consumer) with a forEach(T context, BiConsumer) overload so callers can hand side-band state to a non-capturing lambda and avoid the fresh-Consumer-per-call allocation. Co-Authored-By: Claude Opus 4.7 (1M context) Move forEach loop body to Support helper Factors the unchecked (TEntry) cast out of D1.forEach / D2.forEach (and the BiConsumer variants) into Support.forEach(buckets, ...). The cast now lives in one place, mirroring how Entry.next() handles it, and the D1/D2 methods become one-liners. Downstream higher-arity tables built on Support gain the same helper. Co-Authored-By: Claude Opus 4.7 (1M context) Move bucket-head cast to Support.bucket helper Adds Support.bucket(buckets, keyHash) which returns the bucket head already cast to the caller's concrete entry type. D1.get and D2.get now drop the raw-Entry intermediate variable and walk the chain via Entry.next() directly. The unchecked cast lives in one place, consistent with Entry.next() and Support.forEach. Co-Authored-By: Claude Opus 4.7 (1M context) Drop d1_/d2_ prefix from per-table benchmark methods Holdover from when both lived in a shared HashtableBenchmark; redundant now that each lives in its own class. Co-Authored-By: Claude Opus 4.7 (1M context) Add Hashtable.Support helpers: MAX_RATIO, insertHeadEntry, MutatingTableIterator Three consumer-facing helpers that callers building higher-arity tables on top of Hashtable.Support kept open-coding: - MAX_RATIO_NUMERATOR / _DENOMINATOR: the 4/3 multiplier for sizing a bucket array from a target working-set under a 75% load factor. - insertHeadEntry(buckets, bucketIndex, entry): the (setNext + array-store) pair for splicing a new entry at the head of a bucket chain. - MutatingTableIterator + Support.mutatingTableIterator(buckets): walks every entry in the table (not filtered by hash) with remove() support, for sweeps like eviction and expunge that aren't keyed to a specific hash. Sibling of MutatingBucketIterator. Tests cover the table-wide iterator at head-of-bucket and mid-chain removal, empty buckets between live entries, exhaustion, and remove-without-next. Co-Authored-By: Claude Opus 4.7 (1M context) Swap MAX_RATIO numerator/denominator pair for a single float + scaled create() Replace Support.MAX_RATIO_NUMERATOR / _DENOMINATOR with a single float MAX_RATIO constant, and add a Support.create(int, float) overload that takes a scale factor. Callers now write Support.create(n, MAX_RATIO) instead of stitching together the int arithmetic at the call site. The scaled size is truncated (not ceiled) before going through sizeFor. sizeFor already rounds up to the next power of two, so truncation just absorbs float fuzz that would otherwise push a result like 12 * 4/3 = 16.0000005f past 16 and double the bucket array size for no reason. Co-Authored-By: Claude Opus 4.7 (1M context) Tighten Hashtable docs + rename MAX_CAPACITY to MAX_BUCKETS Five small cleanups from a design re-review pass: 1. Support javadoc: drop the stale "methods are package-private" sentence; most of them were made public in earlier commits for higher-arity callers. Also drop the "nested BucketIterator" framing (iterators are peers of Support inside Hashtable, not nested inside Support). 2. MAX_RATIO javadoc: drop the Math.ceil recommendation; create(int, float) deliberately truncates and is the canonical pathway. 3. Document the null-hash treatment on D1.Entry.hash and D2.Entry.hash so the behavior difference is explicit: D1 uses Long.MIN_VALUE as a sentinel that's collision-free against any int-valued hashCode(); D2 has no such sentinel and relies on matches() to resolve null/null vs hash-0 collisions. 4. Rename Support.MAX_CAPACITY -> MAX_BUCKETS and sizeFor's parameter to requestedSize. The cap is on the bucket-array length, not entry count; the new name reflects that. Error messages updated to match. 5. Drop the `abstract` modifier on Hashtable in favor of `final` with a private constructor. Nothing actually subclasses Hashtable -- the abstract was a namespace device that read as "intended for extension." Co-Authored-By: Claude Opus 4.7 (1M context) Dedupe chain-head splice in D1/D2 via keyHash insertHeadEntry overload - Add Support.insertHeadEntry(buckets, long keyHash, entry) overload that derives the bucket index itself. Callers that already have a hash but not the index (the common case) now avoid the redundant bucketIndex(...) hop. - D1.insert, D1.insertOrReplace, D2.insert, D2.insertOrReplace: use the new overload, drop the (thisBuckets local, bucketIndex compute, setNext, store) sequence at each call site. - D2.buckets: drop the `private` modifier to match D1.buckets. Both are package-private so iterator tests in the same package can drive Support.bucketIterator against the table's bucket array. Added a short comment on both fields documenting the rationale. Co-Authored-By: Claude Opus 4.7 (1M context) Tighten Entry.next encapsulation; doc hasNext; add D1/D2 getOrCreate Three follow-ups from the design review: - Make Hashtable.Entry.next private. All same-package readers (BucketIterator) already had a next() accessor; the leftover direct field reads now route through it. Closes the "mixed encapsulation" gap where some readers used the accessor and same-package ones reached for the field. - BucketIterator and MutatingBucketIterator now document that chain-walk work happens in next() (and the constructor for the first match); hasNext() is an O(1) field read. - Add D1.getOrCreate(K, Function) and D2.getOrCreate(K1, K2, BiFunction). Both reuse the lookup hash for the insert on miss, avoiding the double-hash that "get; if null then insert" callers would otherwise pay. Co-Authored-By: Claude Opus 4.7 (1M context) Hashtable: add missing braces and detach removed/replaced entries Addresses PR #11409 review comments: - #3267164119 / #3267165525: wrap every single-line if/break body in braces (7 sites across BucketIterator, MutatingBucketIterator, and the full-table Iterator). - #3275947761 / #3275948108 (sarahchen6): null out the removed/replaced entry's next pointer after splicing it out of the chain in MutatingBucketIterator.remove / .replace. Applied the same fix to the full-table Iterator.remove for consistency. Rationale: detaching prevents accidental traversal through a removed entry via a stale reference and lets the GC reclaim a chain tail that the removed entry was the last referrer to. Co-Authored-By: Claude Opus 4.7 (1M context) Rename LongHashingUtils.hashCodeX(Object) to hash(Object) for API consistency Addresses PR #11409 review comment #3276167001. The method parallels the primitive hash(boolean) / hash(int) / hash(long) / ... family, so naming it hash(Object) -- with null collapsing to Long.MIN_VALUE as a sentinel distinct from any real hashCode -- matches the rest of the public surface. Test call sites that pass a literal null now disambiguate against hash(int[]) / hash(Object[]) / hash(Iterable) via an (Object) cast. Co-Authored-By: Claude Opus 4.7 (1M context) Merge remote-tracking branch 'origin/master' into dougqh/optimize-metric-key Merge branch 'dougqh/util-hashtable' into dougqh/optimize-metric-key Merge branch 'dougqh/optimize-metric-key' into dougqh/control-tag-cardinality Merge remote-tracking branch 'origin/master' into dougqh/conflating-metrics-background-work Introduce slim PeerTagSchema; capture peer-tag values not pairs Addresses sarahchen6's review comment on ConflatingMetricsAggregator extractPeerTagPairs: replaces the worst-case-allocation + trim-and-copy flat-pairs layout with a parallel-array carrier. - New PeerTagSchema: minimal carrier of String[] names. Two flavors -- a static INTERNAL singleton (one entry: base.service) for internal-kind spans, and per-discovery built schemas for client/producer/consumer spans. Deliberately no cardinality limiters or per-cycle state; that layers on top in a later PR. - ConflatingMetricsAggregator: caches the peer-aggregation schema keyed on reference equality of features.peerTags() -- a single volatile read + a long compare on the steady-state producer hot path, no allocation. The producer now captures only a String[] of values parallel to the schema's names; the schema reference is carried on SpanSnapshot. The prior "build worst-case pairs then trim" code is gone. - SpanSnapshot: replaces String[] peerTagPairs with PeerTagSchema + String[] peerTagValues. Producer drops the schema reference if no values fired so the consumer short-circuits on null. - Aggregator.materializePeerTags: now reads name/value pairs at the same index from (schema.names, snapshot.peerTagValues). Counts hits once for exact-size allocation; preserves the singletonList fast path for the common one-entry case (e.g. internal-kind base.service). Producer-side cost goes from "allocate String[2n] + walk + maybe trim" to "single volatile read + walk + lazy String[n] only on first hit". Co-Authored-By: Claude Opus 4.7 (1M context) Merge branch 'dougqh/conflating-metrics-background-work' into dougqh/optimize-metric-key Merge branch 'dougqh/optimize-metric-key' into dougqh/control-tag-cardinality Address PR #11381 review (round 2) - Aggregator.materializePeerTags: fold the firstHit-discovery nested if into a single guarded post-increment (amarziali, #3279243138). One body line: `if (values[i] != null && hitCount++ == 0) firstHit = i;`. - Drop redundant isKind(SpanKindFilter) overrides in both TraceGenerator.groovy files (amarziali, #3279264553 / #3279382648). CoreSpan.java:84 already supplies a default implementation that reads the same span.kind tag. - Bump TRACER_METRICS_MAX_PENDING default from 2048 -> 131072 to address the capacity regression amarziali flagged (#3279378375). Without producer-side conflation, the inbox now holds 1 SpanSnapshot per metrics-eligible span instead of 1 conflated Batch per ~64 spans; restoring effective capacity parity (~2048 * ~64 = 131072) prevents a ~64x rise in inbox-full drops at the same span rate. ~100 B per SpanSnapshot puts the worst-case heap floor at ~13 MB -- bounded. Co-Authored-By: Claude Opus 4.7 (1M context) Cover inbox-full fast-path in ConflatingMetricsAggregator.publish Addresses PR #11381 review (amarziali, #3279325340 -- "Are the existing tests covering this case?"). New ConflatingMetricsAggregatorInboxFullTest constructs the aggregator with a small inbox (queueSize=8), deliberately does NOT call start() so the consumer thread never drains, then publishes enough spans to overflow the inbox. Verifies that healthMetrics.onStatsInboxFull() is called at least once -- the fast-path's `inbox.size() >= inbox.capacity()` short-circuit triggers when the producer-side queue is at capacity. Test is Java + JUnit 5 + Mockito per the project convention for new tests; uses a CoreSpan Mockito mock rather than the SimpleSpan Groovy fixture so we don't depend on Groovy-then-Java compile order from the test source set. Co-Authored-By: Claude Opus 4.7 (1M context) Reconcile PeerTagSchema once per reporting cycle on the aggregator thread Addresses amarziali's review comment #3279340181 ("It would be more efficient to trigger from the other side"). The producer-side reference compare on every publish goes away; the aggregator thread reconciles the cached schema against feature discovery once per reporting cycle. - DDAgentFeaturesDiscovery: expose getLastTimeDiscovered() so callers can detect a discovery refresh without copying the peerTags Set. - PeerTagSchema: add `long lastTimeDiscovered` (plain, aggregator-only) and `hasSameTagsAs(Set)`. of(Set, long) takes the timestamp; INTERNAL uses a -1L sentinel since it's never reconciled. - ConflatingMetricsAggregator: * Drop the cachedPeerTagsSource volatile and the per-publish reference compare. * Producer fast path is now `cachedPeerTagSchema` volatile read + null-check; first publish takes the one-time synchronized bootstrap. * Add reconcilePeerTagSchema() that runs once per cycle on the aggregator thread: fast-path timestamp compare, slow-path set compare, bump-in-place when the set is unchanged. - Aggregator: new `Runnable onReportCycle` constructor parameter, run at the start of report() (before the flush, so any test awaiting writer.finishBucket() observes the schema in its post-reconcile state and so the next publish sees the new schema without a handoff). - Update "should create bucket for each set of peer tags" to drive two reporting cycles separated by a report() that triggers reconcile. The old test relied on per-publish reference detection, which the new design intentionally doesn't preserve -- the schema is now stable within a cycle. Co-Authored-By: Claude Opus 4.7 (1M context) Merge branch 'dougqh/conflating-metrics-background-work' into dougqh/optimize-metric-key Merge branch 'dougqh/optimize-metric-key' into dougqh/control-tag-cardinality Add bootstrap + reconcile coverage for PeerTagSchema Addresses round-3 review nice-to-haves on PR #11381. - PeerTagSchemaTest: unit coverage for hasSameTagsAs() (the predicate that drives the reconcile fast/slow path split), the of(Set, long) factory, and the INTERNAL singleton. The hasSameTagsAs cases include same-content-different-Set-reference (the case the reconcile fast path relies on after a discovery refresh) and content-mismatch in either direction. - ConflatingMetricsAggregatorBootstrapTest: integration coverage for the producer-side bootstrap + aggregator-thread reconcile flow. * bootstrapHappensOnceOnFirstPublish -- three publishes against an un-started aggregator (no consumer thread, no reconciles); verifies features.peerTags() and features.getLastTimeDiscovered() are each called exactly once. * reconcileSkipsDeepCompareWhenTimestampMatches -- two cycles with constant features.getLastTimeDiscovered(); each post-report reconcile short-circuits on the timestamp fast path, so peerTags() is called only by bootstrap (1 total). * reconcileSurvivesTimestampBumpWhenTagsUnchanged -- timestamps bump every reconcile, forcing the slow set-compare path; the tag set stays identical, so the schema is preserved and continues to flush buckets correctly across cycles. Co-Authored-By: Claude Opus 4.7 (1M context) Merge branch 'dougqh/conflating-metrics-background-work' into dougqh/optimize-metric-key Use writer.finishBucket() count in bootstrap test for cascade compatibility The verify(writer).add(MetricKey, AggregateMetric) signature is unique to #11381; downstream branches use AggregateEntry. Switching to verify(writer, times(2)).finishBucket() keeps the same behavioral guarantee (both cycles flushed) across the stack. Co-Authored-By: Claude Opus 4.7 (1M context) Use writer.finishBucket() count in bootstrap test for cascade compatibility The verify(writer).add(MetricKey, AggregateMetric) signature is unique to #11381; downstream branches use AggregateEntry. Switching to verify(writer, times(2)).finishBucket() keeps the same behavioral guarantee (both cycles flushed) across the stack. Co-Authored-By: Claude Opus 4.7 (1M context) Merge branch 'dougqh/optimize-metric-key' into dougqh/control-tag-cardinality Rename bootstrap test to ClientStatsAggregator + adapt PeerTagSchemaTest #11387's ClientStatsAggregator renames ConflatingMetricsAggregator; the test file's name and class refs need to match. PeerTagSchemaTest's PeerTagSchema.of() calls need the (Set, long, HealthMetrics) signature this branch introduced. Co-Authored-By: Claude Opus 4.7 (1M context) Merge branch 'master' into dougqh/conflating-metrics-background-work Merge branch 'dougqh/conflating-metrics-background-work' into dougqh/optimize-metric-key Preserve TRACER_METRICS_MAX_PENDING semantic + drop stale imports TRACER_METRICS_MAX_PENDING previously counted conflating Batch slots (~64 spans each). The inbox now holds 1 SpanSnapshot per slot, so multiply the configured value by LEGACY_BATCH_SIZE (64) to keep pre-existing customer overrides delivering the same effective span-throughput capacity. Default stays at 2048 logical -> 131072 snapshot slots, identical to the prior 2048 batches * 64 spans. Also drops two unused datadog.trace.core.SpanKindFilter imports left behind in TraceGenerator.groovy after the isKind() override was removed in favor of the CoreSpan default implementation. Co-Authored-By: Claude Opus 4.7 (1M context) Merge branch 'dougqh/conflating-metrics-background-work' into dougqh/optimize-metric-key Add AdversarialMetricsBenchmark for capacity-bound stress testing Ports the adversarial JMH benchmark from #11402 down to this branch so we can compare #11381 vs master on a high-cardinality, high-throughput workload. Adapted to use ConflatingMetricsAggregator (pre-rename) and the FixedAgentFeaturesDiscovery / NullSink helpers already in ConflatingMetricsAggregatorBenchmark. 8 producer threads hammer publish() with unique (service, operation, resource, peer.hostname) per op so the aggregate cache fills+evicts continuously and the inbox saturates. tearDown prints the drop counters (inboxFull vs aggregateDropped) so the test verifies the subsystem stayed bounded under attack. Co-Authored-By: Claude Opus 4.7 (1M context) Merge branch 'dougqh/conflating-metrics-background-work' into dougqh/optimize-metric-key Trim AdversarialMetricsBenchmark counters and clarify printout Drop traceComputedCalls / totalSpansCounted: under 8-way contention the volatile-long ++/+= pattern was losing ~20% of updates (296M counted vs 245M reported), and the numbers duplicate signal JMH's ops/s already provides. Switch inboxFull / aggregateDropped to LongAdder so the printed drop shape (the order-of-magnitude story the bench is built to tell) is accurate under contention. Replace the stale "both forks combined for this run" string with text that matches the actual @Fork(value=1) config and notes that counters accumulate across warmup + measurement. Co-Authored-By: Claude Opus 4.7 (1M context) Merge branch 'dougqh/conflating-metrics-background-work' into dougqh/optimize-metric-key Close PeerTagSchema reconcile race + cover the swap branch buildPeerTagSchema previously read features.peerTags() before features.getLastTimeDiscovered(). DDAgentFeaturesDiscovery exposes those as two separate accessors against its volatile State -- a state-swap interleaving could leave the cached schema tagged with a NEWER timestamp than its names, after which the next reconcile short-circuits on the timestamp compare and misses the tag-set update until the next discovery refresh (~minute later). Swap the read order so timestamp is captured first. With this ordering, an interleaving leaves the schema OLDER than its names instead -- the next reconcile sees a timestamp mismatch, runs the deep compare, and self-heals on the very next cycle. Also adds reconcileSwapsSchemaWhenTagSetChanges, which closes the test gap on the slow-path swap branch (cachedPeerTagSchema = PeerTagSchema.of(...)). End-to-end check via the writer's captured MetricKeys: pre-swap snapshot carries only peer.hostname, post-swap snapshot carries both peer.hostname and peer.service. Co-Authored-By: Claude Opus 4.7 (1M context) Merge branch 'dougqh/conflating-metrics-background-work' into dougqh/optimize-metric-key Adapt reconcileSwapsSchemaWhenTagSetChanges to AggregateEntry shape #11382 collapses MetricWriter.add(MetricKey, AggregateMetric) into add(AggregateEntry). Re-target the captor and accessors on this branch so the test compiles and the same end-to-end peer-tag verification holds. Co-Authored-By: Claude Opus 4.7 (1M context) Clarify materializePeerTags hit-counting loop Splits the `if (values[i] != null && hitCount++ == 0)` conjunction into nested ifs. Same semantics, no codegen impact after JIT -- just visibly says what the loop is doing rather than relying on post-increment-inside-conjunction. Closes amarziali's review thread on this block. Co-Authored-By: Claude Opus 4.7 (1M context) Merge branch 'dougqh/conflating-metrics-background-work' into dougqh/optimize-metric-key # Conflicts: # dd-trace-core/src/main/java/datadog/trace/common/metrics/Aggregator.java Fix MetricsIntegrationTest entry recording call site AggregateEntry consolidated MetricKey + AggregateMetric so recordDurations lives directly on AggregateEntry now. The previous entry1.aggregate. recordDurations(...) form compiles under Groovy's dynamic dispatch but would throw MissingPropertyException at runtime since there is no `aggregate` property. Resolves chatgpt-codex-connector's review comment. Co-Authored-By: Claude Opus 4.7 (1M context) Make ConflatingMetricAggregatorTest counter checks actually verify The `1 * writer.add(value) >> { closure }` pattern treats the closure as a stubbed return value -- Spock evaluates it but discards the result, so `e.getHitCount() == X && ...` was a silent no-op across 31 occurrences. Wrapping the expression in `assert` makes Groovy's power-assert throw on mismatch, which Spock surfaces as a real failure. Resolves chatgpt-codex-connector's review comment. All 41 tests still pass, so the previously-unverified assertions happened to hold. Co-Authored-By: Claude Opus 4.7 (1M context) Drop dead recordDurations(int, AtomicLongArray) batch API This method was a vestige of master's Batch design where multiple producer threads wrote into an AtomicLongArray slot concurrently and the aggregator drained ~64 durations per Batch in one call. The new producer/consumer split publishes one SpanSnapshot per span, so production only ever calls recordOneDuration(long). Migrate the three remaining callers (AggregateEntryTest, SerializingMetricWriterTest, MetricsIntegrationTest) to a loop of recordOneDuration(long) calls, then delete the batched method and its AtomicLongArray imports. Drops the recordDurationsIgnoresTrailingZeros test -- that behavior was a specific quirk of the batched API (count parameter shorter than the array length) and doesn't apply to recordOneDuration. Co-Authored-By: Claude Opus 4.7 (1M context) Warn about colon split in AggregateEntry.of test factory The factory recovers (name, value) pairs from pre-encoded "name:value" strings by splitting at the FIRST colon. Test-only, but worth being explicit so callers don't hand it a peer-tag value containing a colon (URLs, IPv6, service:env) and get a silently wrong (name, value) pair. Co-Authored-By: Claude Opus 4.7 (1M context) Add coverage for disable() -> ClearSignal threading path The bundled fix in this PR routes the agent-downgrade clear through the inbox so the aggregator thread stays the sole writer to AggregateTable. Prior to this test, there was no regression coverage for that routing. The test fires DOWNGRADED from the test thread (production-like OkHttpSink callback path), waits for the immediate no-flush window, then publishes a marker span with a distinct resource name. The subsequent report's writer.add captor must see only the marker -- if CLEAR didn't actually wipe the original entry, the original "resource" would still be present and the assertion would catch it. Cannot directly verify thread identity of the clear from inside this test (CLEAR's inbox.clear() drops any latch signal we'd queue behind it), so this is an observable-contract test rather than a strict thread-id test. Still catches both the missing-clear regression and the bucket-chain-corruption regression that the original threading race could produce. Co-Authored-By: Claude Opus 4.7 (1M context) Drop unused Tags imports flagged by codenarc Leftover from removing the isKind() override in TraceGenerator earlier in this session -- I dropped the SpanKindFilter import but missed datadog.trace.bootstrap.instrumentation.api.Tags, which is no longer referenced in either file. Resolves codenarcTest and codenarcTraceAgentTest UnusedImport violations. Co-Authored-By: Claude Opus 4.7 (1M context) Merge branch 'dougqh/conflating-metrics-background-work' into dougqh/optimize-metric-key Drop unused Tags imports flagged by codenarc Leftover from removing the isKind() override in TraceGenerator earlier in this session -- I dropped the SpanKindFilter import but missed datadog.trace.bootstrap.instrumentation.api.Tags, which is no longer referenced in either file. Resolves codenarcTest and codenarcTraceAgentTest UnusedImport violations. Co-Authored-By: Claude Opus 4.7 (1M context) Drop unused SpanKindFilter imports flagged by codenarc Leftover from earlier cleanup of the isKind() override -- #11387 hadn't yet cascaded that part, so the import is stale here too. Resolves codenarcTest and codenarcTraceAgentTest UnusedImport violations. Co-Authored-By: Claude Opus 4.7 (1M context) Merge branch 'dougqh/optimize-metric-key' into dougqh/control-tag-cardinality Resolved conflicts: - AggregateEntry.java: kept #11387's cardinality-handler constructor shape; dropped the dead recordDurations(int, AtomicLongArray) batch API and its AtomicLongArray import (the #11382 cleanup). The of() colon-split warning from #11382 doesn't apply because #11387's of() takes peerTags as a pre-built list (no colon-splitting on test reconstruction). - ClientStatsAggregator.java: kept #11387's PeerTagSchema.of(..., healthMetrics) 3-arg signature; preserved #11382's read-order race fix (lastTimeDiscovered read before peerTags); preserved the resetCardinalityHandlers method from HEAD. - ClientStatsAggregatorTest.groovy: kept HEAD's cardinality-focused tests; applied the #11382 Spock-assert fix (wrap '>> { closure }' body expressions in assert) to all 31 sites so power-assert surfaces mismatches. - ClientStatsAggregatorBootstrapTest.java: renamed the reconcileSwapsSchemaWhenTagSetChanges test's ConflatingMetricsAggregator references to ClientStatsAggregator. - ConflatingMetricsAggregatorDisableTest.java: renamed file + references to ClientStatsAggregatorDisableTest with corresponding class-name change. - AdversarialMetricsBenchmark.java: updated ConflatingMetricsAggregator + ConflatingMetricsAggregatorBenchmark references to ClientStatsAggregator / ClientStatsAggregatorBenchmark. Co-Authored-By: Claude Opus 4.7 (1M context) Sync client_metrics_design doc with reconcile-on-aggregator-thread The doc described an old design where the producer thread per-trace read a peerTagsRevision() and rebuilt the cached PeerTagSchema under a monitor. The actual implementation (cascaded from #11381) runs reconcile once per report cycle on the aggregator thread via the onReportCycle hook, keyed on getLastTimeDiscovered(). Producers do nothing more than a volatile read of the cached schema. Updates: - Producer-side flow: drop the per-trace sync description; document the volatile-read steady state and the one-time synchronized bootstrap on first publish. - New "Aggregator-side reconcile" section under "Reporting cadence and cardinality reset" describing the timestamp fast path, the same-tags slow path that preserves warm handlers, and the read-order race fix (timestamp before names). - Memory and lifetime: replace peerTagsRevision pairing with the on-schema lastTimeDiscovered + per-aggregator-instance lifecycle. - "Why the redesign" point 6: rewritten to describe the aggregator- thread reconcile rather than the producer-side revision check. Resolves dougqh's open review thread about peerTagsRevision vs lastTimeDiscovered. Co-Authored-By: Claude Opus 4.7 (1M context) Update dd-trace-core/src/main/java/datadog/trace/common/metrics/PeerTagSchema.java Co-authored-by: Sarah Chen Spread input hash before masking in cardinality-handler probes Both PropertyCardinalityHandler and TagCardinalityHandler linear-probe on (value.hashCode() & capacityMask). Without a spreader, inputs that share a low-bit pattern (e.g. URL templates with a common prefix, or String.hashCode values clustered around 0 for short strings) collapse onto the same probe chain. With the load factor capped at 0.5 the chain length is bounded but can still grow under pathological inputs. Mixing the input hash with its upper half (h ^ (h >>> 16)) before masking spreads the high bits down, same trick HashMap.hash uses. Co-Authored-By: Claude Opus 4.7 (1M context) Apply Spotless Javadoc reflows on metrics files Pure formatting -- google-java-format reflows of Javadoc paragraph breaks and parameter wrapping. No behavior change. Picked up from a prior session's spotlessApply that wasn't bundled into the relevant commit. Co-Authored-By: Claude Opus 4.7 (1M context) Address sarahchen6's review pass PeerTagSchema.java: drop the duplicate Javadoc line that the GitHub UI suggestion accept inadvertently added (it added rather than replaced), collapsing back to the single intended line per sarahchen6's suggestion. Original line said "no cardinality limiters or per-cycle state" which was misleading since lastTimeDiscovered IS per-cycle state; suggestion rightly drops that clause. Config.java: wrap the TRACER_METRICS_MAX_PENDING * LEGACY_BATCH_SIZE multiplication in Math.multiplyExact to fail fast on absurd customer overrides (>= ~33M) rather than silently wrap to a negative int and explode the MPSC queue allocation with a confusing downstream error. Per sarahchen6's suggestion citing the codex bot. Co-Authored-By: Claude Opus 4.7 (1M context) Clamp TRACER_METRICS_MAX_PENDING instead of throwing on overflow The previous Math.multiplyExact approach would fail the agent startup with ArithmeticException on absurd customer overrides (>= ~33M for the configured value). Clamping is gentler -- the agent starts successfully and just runs with a capped inbox. Long-promote the multiplication to a long so the product can't wrap, then clamp to MAX_SAFE_ARRAY_SIZE (Integer.MAX_VALUE - 8, the JDK's own SOFT_MAX_ARRAY_LENGTH convention for array allocations). Co-Authored-By: Claude Opus 4.7 (1M context) Fix duplicate-entry bug for null-fielded SpanSnapshots The constructor canonicalizes null fields through canonicalize() which returns UTF8BytesString.EMPTY for null inputs (or a cached UTF8BytesString("") for empty-string inputs). But matches() compared those entries against subsequent snapshots via contentEquals(...) / stringContentEquals(...), which treated non-null UTF8BytesString vs null CharSequence as inequal. Result: two snapshots with the same null-valued resource/operation/ type/serviceSource hashed to the same bucket (intHash(null) == 0 == "".hashCode()), but matches() returned false on the EMPTY-vs-null field comparison, so the second snapshot inserted a *duplicate* entry into the table. Same path for empty-string vs null. Unify the semantics: null and length-zero are treated as equivalent on either side of contentEquals/stringContentEquals. The hash already agreed (intHash(null) == "".hashCode() == 0), so this restores the matches() contract to match the existing hash contract. Adds AggregateTableTest.nullAndEmptyOptionalFieldsCollapseToOneEntry to pin the contract: two null-fielded and one empty-string-fielded snapshot must all hit the same entry. Test would have failed before the fix (a duplicate insert) but the existing 10 cases still pass. Resolves sarahchen6's review comment on AggregateEntry.java:113 and amarziali's related concern on AggregateEntry.java:114. Co-Authored-By: Claude Opus 4.7 (1M context) Clear dirty flag in ClearSignal handler After CLEAR runs the table is empty but dirty would still carry over from any prior SpanSnapshot insert. The next report() would see dirty=true, expunge no-op the empty table, find isEmpty(), and log "skipped metrics reporting because no points have changed" -- same observable outcome, but resetting dirty here keeps the invariant "dirty implies there's data to flush" honest. Resolves amarziali's review comment on Aggregator.java:121. Co-Authored-By: Claude Opus 4.7 (1M context) Merge branch 'master' into dougqh/conflating-metrics-background-work Drop conditional null-skip from peer-tag hashing Previously hashOf wrapped the peer-tag contribution in `if (s.peerTagSchema != null && s.peerTagValues != null)`. That meant two snapshots with different null arrangements (schema-null vs values-null) collapsed to the same hash, getting resolved only by the field-by-field matches() fallback at the bucket walk -- wasteful, and the asymmetry hurt hash quality generally. Replace with unconditional contributions: - PeerTagSchema now overrides hashCode() to be content-based on names (lazy + cached, benign-race pattern matching UTF8BytesString / utf8Bytes elsewhere). addToHash(h, schema) routes through that. - For the String[] values, pass Arrays.hashCode(values) through the int overload -- Object[].hashCode() is identity-based by default, so we have to compute content hash explicitly. Null arrays hash to 0 via Arrays.hashCode's contract. Null inputs on either side now hash to 0 distinctly from any real schema or non-empty values array, so all four null combinations are distinguishable. Same final hash for content-equal inputs across schema replacements (the reconcile path), which preserves the entry- hit invariant after the aggregator rebuilds the schema. Resolves amarziali's review comment on AggregateEntry.java:309 and dougqh's suggestion on AggregateEntry.java:310. Co-Authored-By: Claude Opus 4.7 (1M context) Delete dead Aggregator.clearAggregates() Once the ClearSignal routing replaced the direct disable()-to-table mutation, clearAggregates() lost all its call sites -- no production code, no test code. Worse, leaving it public invited future callers to bypass the ClearSignal contract and race against Drainer.accept on the aggregator thread. Drop the method outright. Update the inline comment in ConflatingMetricsAggregator.disable() to not name the deleted method. Resolves amarziali's review comment on Aggregator.java:82. Co-Authored-By: Claude Opus 4.7 (1M context) Cursor-resume eviction in AggregateTable via half-open MutatingTableIterator Previously AggregateTable.evictOneStale walked the bucket array from bucket 0 on every call. Under sustained cap pressure with mostly-hot entries clustered in low buckets, every eviction re-scanned the same hot prefix before finding a cold entry. amarziali's review concern. Add a cursor: after a successful eviction, remember the bucket where it landed. The next call resumes from there. Worst case for a single call is still O(N) when nearly every entry is hot, but a sustained eviction stream amortizes to O(1) per call -- the hot prefix is never re-scanned more than twice across N evictions. Implemented as two iterators driving [cursor, length) then [0, cursor), which required a small Hashtable.Support API addition: - New `mutatingTableIterator(buckets, startBucket, endBucket)` overload for walking a half-open bucket range. The existing zero-arg overload is kept; it now delegates to the new ctor with [0, buckets.length). - New `MutatingTableIterator.currentBucket()` accessor exposing the bucket index of the entry last returned by next() (or -1 before any next/after a remove). AggregateTable saves this as the new cursor. - The empty-range case (startBucket == endBucket) yields an immediately-exhausted iterator -- this is what makes the wrap-around pass [0, cursor) naturally produce nothing when cursor == 0, so the two-pass driver in evictOneStale needs no special case. Tests: - 4 new HashtableTest cases covering the half-open API, empty ranges, out-of-range bounds, and currentBucket() behavior before/after next. - 2 new AggregateTableTest cases: backToBackEvictionsAllSucceed (drives 3x capacity worth of cap-overrun inserts; each must succeed, which only holds if the cursor advances correctly) and clearResetsCursorForSubsequentEvictions (clear() also resets the cursor so subsequent eviction passes start from bucket 0). Resolves amarziali's review comment on AggregateTable.java:75. Co-Authored-By: Claude Opus 4.7 (1M context) Move AggregateEntry.of() test factory out of production class dougqh's review comment on AggregateEntry.java:153 asked to keep test code out of the production class. Move the factory to a new AggregateEntries helper in src/test/java/datadog/trace/common/metrics. Same package so it can call the package-private forSnapshot(); delegating to forSnapshot also means no need to widen the AggregateEntry constructor visibility. The 37 src/test/groovy call sites get a mechanical rewrite of AggregateEntry.of(...) -> AggregateEntries.of(...) (36 in ConflatingMetricAggregatorTest, 1 in SerializingMetricWriterTest). src/traceAgentTest is a separate source set without compile-time visibility into src/test, so its 2 MetricsIntegrationTest.groovy call sites can't use AggregateEntries. Migrated those to construct a SpanSnapshot inline + call AggregateEntry.forSnapshot(snapshot). Groovy's permissive package-private access makes this work from the default package the integration test currently sits in. Resolves dougqh's review comment on AggregateEntry.java:153. Co-Authored-By: Claude Opus 4.7 (1M context) Fix AggregateEntry equals/hashCode contract violation equals compared the pre-encoded peerTags List while hashCode (via hashOf) mixes in the raw peerTagSchema + values arrays. Two entries built from different schema layouts can collapse to the same encoded form -- e.g. tag "b" at index 1 in schema {a,b} with values {null,"x"} produces the same encoded ["b:x"] as schema {b,c} with values {"x",null}. equals returned true; hashCodes differed. Hashcode contract violated. Switch equals to compare the raw peerTagNames + peerTagValues arrays, mirroring matches(SpanSnapshot) and hashOf(SpanSnapshot). The production lookup path (AggregateTable.findOrInsert) already uses those, so this just brings equals in line with the rest of the class. Adds two regression tests on AggregateEntryTest: - equalsConsistentWithHashCodeAcrossDifferentSchemaLayouts: the failing-case shape above. Pre-fix, the encoded-list equals returned true while hashCodes differed; now equals returns false and the hashCodes differ in agreement. - equalEntriesHaveEqualHashCodes: positive case -- two entries from identical snapshots must equal and share hashCode. Co-Authored-By: Claude Opus 4.7 (1M context) Don't trample queued STOP in ClearSignal handler Prior CLEAR handler called inbox.clear() as belt-and-suspenders cleanup of in-flight snapshots. That would also erase any STOP signal queued behind CLEAR -- a real concern in disable() -> close() sequences, where the trampled STOP leaves the aggregator thread spinning until thread.join's timeout. sarahchen6 surfaced this from a Codex pass on the CLEAR logic; dougqh confirmed it's worth fixing. The CLEAR handler now clears only the aggregates table. Queued snapshots will drain naturally into the just-cleared table -- but since features.supportsMetrics() is already false by the time CLEAR was offered, producers have stopped publishing; the inbox drains and empties on its own. Worst case: one extra reporting cycle of wasted work on stale snapshots that the agent rejects, which triggers another DOWNGRADED -> disable() -> CLEAR. Self-healing, same as before. Adds ConflatingMetricsAggregatorDisableTest.clearDoesNotTrampleQueuedStopSignal: publish a snapshot, fire DOWNGRADED, call close(); the test bounds close() with its own 2s timeout and asserts the thread exits within it. Pre-fix this would have hung out THREAD_JOIN_TIMEOUT_MS; post-fix it returns in milliseconds. Resolves sarahchen6/Codex's CLEAR-trampling-STOP review comment. Co-Authored-By: Claude Opus 4.7 (1M context) Implement PeerTagSchema.equals symmetric with hashCode The prior commit added a content-based hashCode() but left equals falling back to Object.equals (reference identity). That violates the hashCode contract for any caller that compares two distinct schema instances built from the same tag list -- e.g. before/after a reconcile rebuilds the cached schema with an unchanged tag set. equals() now mirrors hashCode(): content-equal on names. The reconcile- timing field lastTimeDiscovered is intentionally excluded from both -- it's bookkeeping for the aggregator's discovery-version compare, not part of schema identity. Tests: - equalsIsContentBasedOnNames -- same names, two instances, equal + matching hashCode. - equalsIgnoresLastTimeDiscovered -- pins that the bookkeeping field doesn't leak into identity. - equalsDistinguishesByOrder -- names is positional (pairs with SpanSnapshot.peerTagValues by index), so reordered schemas are not interchangeable. - equalsHandlesNullAndOtherTypes -- contract corners. Co-Authored-By: Claude Opus 4.7 (1M context) Route service and spanKind through canonicalize for null-safety AggregateEntry's constructor canonicalized resource, operationName, type, and serviceSource (mapping null -> EMPTY via the canonicalize helper) but called SERVICE_CACHE.computeIfAbsent / SPAN_KIND_CACHE .computeIfAbsent directly for service and spanKind. Inputs of null would NPE on the cache call. Production paths never pass null for these -- DDSpan always supplies a service, and the producer defaults spanKind to "" via unsafeGetTag(SPAN_KIND, (CharSequence) "") -- so this is a latent- defense fix, not a live bug. But the matches/contentEquals logic already treats null and length-zero as equal on both sides, and every other label field in the constructor defends via canonicalize. Two unprotected outliers are an inconsistency that bites the next person who reaches for a new code path. Drops the Functions.UTF8_ENCODE import (its sole use was the service cache line) -- canonicalize internally creates the UTF8BytesString. Test: AggregateTableTest.nullServiceAndSpanKindDoNotNpeAndCollapseWithEmpty publishes (null, null), (null, null) again, and ("", ""); asserts a single entry results and that getService()/getSpanKind() are length-0. Without the fix, the first publish would have NPE'd at the .computeIfAbsent call. Co-Authored-By: Claude Opus 4.7 (1M context) Suppress forbiddenApis for tearDown's System.err diagnostics AdversarialMetricsBenchmark.tearDown prints drop counters via System.err so a benchmark run shows how saturated each capacity bound was (inbox-full drops, aggregate-cache drops). forbiddenApisJmh disallows System.err by default to prevent excess logging in production code -- not a concern for a JMH benchmark, where stderr is the conventional channel for diagnostic output and matches the existing pattern in ExtractorBenchmark / InjectorBenchmark. Annotates tearDown with @SuppressForbidden (method-scoped, not class- scoped) so the suppression is narrowly targeted to the three println calls and any future hot-path code that lands in the benchmark stays gated by the check. Co-Authored-By: Claude Opus 4.7 (1M context) Merge branch 'master' into dougqh/conflating-metrics-background-work Use DDAgentFeaturesDiscovery.state() hash for PeerTagSchema reconcile Addresses amarziali's review on getLastTimeDiscovered(): the existing state() accessor returns a SHA-256 of the discovery response, which is a more precise change key than the timestamp. Timestamp advances on every successful refresh regardless of content; the hash only advances when something actually changed -- so reconcile fast-path now fires only on real change, not every cycle. - PeerTagSchema: long lastTimeDiscovered -> String state. Factory signature of(Set, long) -> of(Set, String). INTERNAL carries null (it is never reconciled). - ConflatingMetricsAggregator: read features.state() first then peerTags() (same defensive ordering rationale -- if a discovery refresh interleaves, leave the schema with stale state rather than stale tags so the next reconcile re-runs the deep compare). Objects.equals for null-tolerant comparison (state can be null before discovery has produced a response). - DDAgentFeaturesDiscovery: drop the public getLastTimeDiscovered() accessor added on this branch -- the field stays private for the existing throttling logic in discoverIfOutdated(). - Tests updated to mock state() instead of getLastTimeDiscovered(). Co-Authored-By: Claude Opus 4.7 (1M context) Convert TRACER_METRICS_MAX_PENDING rationale to /* */ block comment Addresses amarziali's readability nit (#3289149416) -- multi-line prose reads better as a single block comment than as a stack of // lines. Co-Authored-By: Claude Opus 4.7 (1M context) Merge remote-tracking branch 'origin/dougqh/conflating-metrics-background-work' into dougqh/conflating-metrics-background-work Add cardinality-isolation companions to AdversarialMetricsBenchmark Two new JMH benches that hold every dimension constant except one, to attribute throughput deltas to a specific axis: - HighCardinalityResourceMetricsBenchmark: ~1M distinct resource values; service/operation/peer.hostname pinned. Exercises the aggregate-cache LRU on the resource axis specifically. - HighCardinalityPeerMetricsBenchmark: ~32K distinct peer.hostname values; service/operation/resource pinned. Isolates the peer-tag encoding hot path (PEER_TAGS_CACHE lookups, UTF8 encoding, parallel-array capture in SpanSnapshot). Same shape as AdversarialMetricsBenchmark (8 threads, 2x15s warmup + 5x15s measurement, 1 fork) and reuse its CountingHealthMetrics so the inbox-full vs aggregate-dropped counters print on teardown for an apples-to-apples comparison. Co-Authored-By: Claude Opus 4.7 (1M context) Merge remote-tracking branch 'origin/dougqh/conflating-metrics-background-work' into dougqh/optimize-metric-key # Conflicts: # dd-trace-core/src/main/java/datadog/trace/common/metrics/PeerTagSchema.java # dd-trace-core/src/test/java/datadog/trace/common/metrics/PeerTagSchemaTest.java Merge remote-tracking branch 'origin/dougqh/optimize-metric-key' into dougqh/control-tag-cardinality # Conflicts: # dd-trace-core/src/main/java/datadog/trace/common/metrics/AggregateEntry.java # dd-trace-core/src/main/java/datadog/trace/common/metrics/ClientStatsAggregator.java # dd-trace-core/src/main/java/datadog/trace/common/metrics/PeerTagSchema.java # dd-trace-core/src/test/groovy/datadog/trace/common/metrics/ClientStatsAggregatorTest.groovy # dd-trace-core/src/test/java/datadog/trace/common/metrics/AggregateEntryTest.java # dd-trace-core/src/test/java/datadog/trace/common/metrics/PeerTagSchemaTest.java Reflow reconcilePeerTagSchema Javadoc after merge Spotless tidy missed in commit b382df5e92. No semantic change. Co-Authored-By: Claude Opus 4.7 (1M context) Consolidate contentEquals; remove redundant stringContentEquals Addresses sarahchen6 review: - AggregateEntry.java:380 — early-return on null-or-empty `a`, then check `b` once, dropping the two split null branches and the duplicate String/UTF8BytesString instanceof checks. - AggregateEntry.java:398 — String is a CharSequence, so the general contentEquals already handles both. Migrate the five service / spanKind / httpMethod / httpEndpoint / grpcStatusCode call sites in matches() and delete the helper. Co-Authored-By: Claude Opus 4.7 (1M context) Rename AggregateEntries -> AggregateEntryFixtures Addresses sarahchen6 review on AggregateEntries.java:13: the prior name reads too close to the production AggregateEntry class. Pick a more test-flavored name. Touches the file itself + the 8 callers across ConflatingMetricAggregatorTest and SerializingMetricWriterTest. Co-Authored-By: Claude Opus 4.7 (1M context) Tidy PR-iteration history out of test comments Addresses sarahchen6 review on AggregateTableTest:237 and ConflatingMetricsAggregatorDisableTest:143: comments narrated the prior- behavior-and-fix path that led to each test, but the test itself is self-evident -- a future reader only needs the expected behavior. Keep the behavior summary, drop the "Regression:" / "prior CLEAR handler ..." flavor. Co-Authored-By: Claude Opus 4.7 (1M context) Merge remote-tracking branch 'origin/dougqh/optimize-metric-key' into dougqh/control-tag-cardinality # Conflicts: # dd-trace-core/src/main/java/datadog/trace/common/metrics/AggregateEntry.java # dd-trace-core/src/test/groovy/datadog/trace/common/metrics/ClientStatsAggregatorTest.groovy Merge remote-tracking branch 'origin/master' into dougqh/optimize-metric-key # Conflicts: # dd-trace-core/src/main/java/datadog/trace/common/metrics/AggregateMetric.java # dd-trace-core/src/main/java/datadog/trace/common/metrics/Aggregator.java # dd-trace-core/src/main/java/datadog/trace/common/metrics/ConflatingMetricsAggregator.java # dd-trace-core/src/main/java/datadog/trace/common/metrics/PeerTagSchema.java # dd-trace-core/src/main/java/datadog/trace/common/metrics/SpanSnapshot.java # dd-trace-core/src/test/groovy/datadog/trace/common/metrics/AggregateMetricTest.groovy # dd-trace-core/src/test/groovy/datadog/trace/common/metrics/ConflatingMetricAggregatorTest.groovy # dd-trace-core/src/test/java/datadog/trace/common/metrics/ConflatingMetricsAggregatorBootstrapTest.java # dd-trace-core/src/test/java/datadog/trace/common/metrics/PeerTagSchemaTest.java Merge remote-tracking branch 'origin/dougqh/optimize-metric-key' into dougqh/control-tag-cardinality Merge remote-tracking branch 'origin/master' into dougqh/optimize-metric-key Merge remote-tracking branch 'origin/dougqh/optimize-metric-key' into dougqh/control-tag-cardinality Make AggregateEntry.ERROR_TAG / TOP_LEVEL_TAG package-private The class itself is package-private, so the public modifier on these constants is meaningless and misleads about the actual access surface. All six call sites (ConflatingMetricsAggregator + tests) are in the same package and continue to compile. Co-Authored-By: Claude Opus 4.7 (1M context) Merge remote-tracking branch 'origin/dougqh/optimize-metric-key' into dougqh/control-tag-cardinality Move AggregateEntry equality contract to test-only helper Eliminates the dual-equality-contract maintenance hazard on AggregateEntry. Production code never invoked equals/hashCode -- AggregateTable bucketing goes through keyHash + matches(SpanSnapshot) directly. The contract existed only to support Spock mock argument matchers in tests. - Delete equals/hashCode from production AggregateEntry; class stays final. - Make peerTagNames/peerTagValues fields package-private so a sibling helper in the same package can read them. - Add src/test AggregateEntryTestUtils.equals/hashCode that implements the same field-wise contract (raw-array based, consistent with hashOf) for tests. - Update Spock argument matchers from `writer.add(fixture)` to `writer.add({ AggregateEntryTestUtils.equals(it, fixture) })`. For loop-driven expectations, hoist the fixture into a per-iteration `def expected = ...` local so it's captured by value rather than by reference to the loop variable. - Update the JUnit contract tests to drive the helper directly. Co-Authored-By: Claude Opus 4.7 (1M context) Merge remote-tracking branch 'origin/dougqh/optimize-metric-key' into dougqh/control-tag-cardinality # Conflicts: # dd-trace-core/src/main/java/datadog/trace/common/metrics/AggregateEntry.java # dd-trace-core/src/test/groovy/datadog/trace/common/metrics/ClientStatsAggregatorTest.groovy # dd-trace-core/src/test/java/datadog/trace/common/metrics/AggregateEntryTest.java Move AggregateEntry equality contract to test-only helper Mirrors the #11382 cleanup. Production AggregateEntry never invokes equals/hashCode -- AggregateTable bucketing goes through keyHash + Canonical.matches directly. The contract existed only to support Spock mock argument matchers. - Delete equals/hashCode from production AggregateEntry; class stays final. - Add src/test AggregateEntryTestUtils.equals/hashCode that implements the same field-wise contract (peerTags compared as an encoded list, consistent with hashOf on this branch). - Update Spock argument matchers from `writer.add(AggregateEntry.of(...))` to `writer.add({ AggregateEntryTestUtils.equals(it, AggregateEntry.of(...)) })`. - For loop-driven expectations, hoist the fixture into a per-iteration `def expected = ...` local so it's captured by value rather than by reference to the loop variable. Co-Authored-By: Claude Opus 4.7 (1M context) Consolidate AggregateEntryFixtures into AggregateEntryTestUtils Both classes existed only to support tests against AggregateEntry -- one for positional-args fixture construction, the other for value- based equality matching. The split was artificial; folding them into a single AggregateEntryTestUtils removes a file and gives test sites one place to look for AggregateEntry test helpers. - Move `of(...)` into AggregateEntryTestUtils alongside the existing `equals(a, b)` / `hashCode(e)` helpers. - Delete AggregateEntryFixtures.java. - Rename 51 caller sites across ConflatingMetricAggregatorTest and SerializingMetricWriterTest. Co-Authored-By: Claude Opus 4.7 (1M context) Merge remote-tracking branch 'origin/dougqh/optimize-metric-key' into dougqh/control-tag-cardinality # Conflicts: # dd-trace-core/src/test/groovy/datadog/trace/common/metrics/ClientStatsAggregatorTest.groovy # dd-trace-core/src/test/java/datadog/trace/common/metrics/AggregateEntryFixtures.java # dd-trace-core/src/test/java/datadog/trace/common/metrics/AggregateEntryTestUtils.java Document deliberate cohesion + single-writer invariant on AggregateEntry Two doc-only additions surfacing design context that reviewers would otherwise have to reconstruct: - AggregateEntry: name the "5 responsibilities concentrated on one object" tradeoff explicitly (UTF8 caches + label fields + raw peerTag arrays + encoded peerTag list + counter/histogram state). Prior MetricKey + AggregateMetric design allocated two objects per unique key on miss; folding them yields one. The class is wider as a result; that's the trade we chose. - AggregateEntry + AggregateTable: note that the single-writer invariant is convention-enforced -- the @SuppressFBWarnings documents the assumption but nothing checks the calling thread at runtime. Point to ClearSignal as the explicit mechanism for funneling cross-thread mutators back onto the aggregator thread. Co-Authored-By: Claude Opus 4.7 (1M context) Merge remote-tracking branch 'origin/dougqh/optimize-metric-key' into dougqh/control-tag-cardinality # Conflicts: # dd-trace-core/src/main/java/datadog/trace/common/metrics/AggregateEntry.java Avoid recomputing keyHash on AggregateTable miss On the miss path, AggregateTable.findOrInsert computed the snapshot hash for the lookup, then AggregateEntry.forSnapshot computed it again via the same hashOf(s) call to set keyHash on the new entry. Three reads per snapshot field on a miss (findOrInsert hashOf + forSnapshot hashOf + constructor canonicalize), with two of those also paying for the per-call Arrays.hashCode(peerTagValues). Pass the hash that findOrInsert already computed into forSnapshot instead. Two reads per field on miss, one Arrays.hashCode(peerTagValues) per miss. Kept a no-arg forSnapshot overload for test callers that don't have a precomputed hash on hand. Co-Authored-By: Claude Opus 4.7 (1M context) Tighten client-stats cardinality plumbing - Drop unused PeerTagSchema.hashCode/equals + cachedHashCode field; the schema is never compared via Object.equals or used as a Set/Map key. hasSameTagsAs(Set) is the only schema-equivalence primitive in use, and it's a name-content check that doesn't go through hashCode. - Canonical.populatePeerTags now skips null values directly instead of round-tripping them through handler.register only to filter EMPTY back out. Cheap win on sparse-null peer-tag arrays from capturePeerTagValues. - Canonical.matches reordered to compare highest-cardinality fields (resource, service, operationName) first for faster short-circuit on bucket-chain collisions; UTF8 fields use direct .equals (the EMPTY-sentinel invariant guarantees non-null on both sides) instead of Objects.equals + dead null branches. - PropertyCardinalityHandler/TagCardinalityHandler.register compute the mixed hash once and reuse the start index for both the current-cycle and prior-cycle probe paths. The probe helper is inlined since it's no longer shared. - ClientStatsAggregator.reconcilePeerTagSchema now flushes the outgoing schema's accumulated blockedCounts via resetCardinalityHandlers() before discarding it on a tag-set change, otherwise partial-cycle block telemetry would silently disappear. - Document the "one ClientStatsAggregator per JVM" invariant implied by AggregateEntry's static cardinality handlers and PeerTagSchema.INTERNAL, plus the load-bearing size guard in TagCardinalityHandler.isBlockedResult that prevents accidental sentinel materialization. Co-Authored-By: Claude Opus 4.7 (1M context) Document AggregateEntry.clear key-field persistence + SignalItem singleton contract AggregateEntry.clear(): note that only per-cycle counters/histograms reset; the label fields (resource, service, ..., peerTagNames, peerTagValues) are the entry's bucket identity and persist across cycles so subsequent same-key snapshots reuse the entry. Stale entries get reaped by AggregateTable.expungeStaleAggregates. SignalItem: document the singleton fire-and-forget contract -- the inherited CompletableFuture is completed on first handling and never reset, so callers that want one-shot completion semantics (e.g. forceReport) must allocate a fresh instance instead of reusing the STOP/REPORT/CLEAR singletons. Pre-existing pattern on master (this PR added the CLEAR singleton following the same convention); doc just makes the contract explicit. Co-Authored-By: Claude Opus 4.7 (1M context) Merge branch 'dougqh/optimize-metric-key' into dougqh/control-tag-cardinality # Conflicts: # dd-trace-core/src/main/java/datadog/trace/common/metrics/AggregateEntry.java # dd-trace-core/src/main/java/datadog/trace/common/metrics/AggregateTable.java Encapsulate EMPTY-as-absent sentinel + align hashOf field order with matches Optional fields on AggregateEntry (serviceSource, httpMethod, httpEndpoint, grpcStatusCode) carry UTF8BytesString.EMPTY when the snapshot had no value. SerializingMetricWriter (and its test) previously read this contract via reference-eq against EMPTY, leaking the storage choice into callers. Add hasServiceSource / hasHttpMethod / hasHttpEndpoint / hasGrpcStatusCode predicates on AggregateEntry; switch the four serializer sites and the mirroring four test sites to call them. The EMPTY-sentinel is now an internal implementation detail of AggregateEntry. Reorder AggregateEntry.hashOf so its field order mirrors Canonical.matches (UTF8 fields first, then peer-tag list, then primitives). The hash value itself is order-stable across all callers; this is purely so future readers can reason about lookup and equality in lockstep. Co-Authored-By: Claude Opus 4.7 (1M context) Preserve warm TagCardinalityHandlers across peer-tag schema rebuilds When peer-tag discovery returns a different tag set than the cached schema carries, ClientStatsAggregator.reconcilePeerTagSchema replaces the schema. Previously every per-tag TagCardinalityHandler was rebuilt from scratch, losing the prior-cycle UTF8 cache for tags that survived the rebuild -- so a persistent tag like peer.hostname re-allocated UTF8BytesStrings for every value on the cycle following the rebuild. Split PeerTagSchema.resetCardinalityHandlers into two operations: - resetCardinalityHandlers: full rotate (called at end-of-cycle on the cached schema). - flushBlockedCounts: telemetry-only flush (used by reconcile on the outgoing schema before discard, so partial-cycle counts still reach HealthMetrics without disturbing the handlers). Add a donor overload PeerTagSchema.of(names, state, healthMetrics, previous) that transfers TagCardinalityHandler instances by name for any tag present in both the previous and replacement schemas. Names absent from the previous schema get fresh handlers; names absent from the replacement schema are dropped along with the outgoing schema. reconcilePeerTagSchema now calls flushBlockedCounts then constructs the replacement via the donor overload. The end-of-cycle reset that runs immediately after reconcile rotates the (now-transferred) handlers in the normal way, so cycle N+1 sees cycle N's UTF8 values as priorValues for persisting tags. Co-Authored-By: Claude Opus 4.7 (1M context) Revert "Preserve warm TagCardinalityHandlers across peer-tag schema rebuilds" This reverts commit 703c9e11639d0a7fd5a2d274d4812faf73c66767. Add trace.stats.cardinality.limits.enabled flag (default off) Cardinality limiting alters the wire format under high cardinality -- overflow values get the "blocked_by_tracer" sentinel and collapse into one aggregate bucket. Customers with dashboards or alerts keyed on specific tag values would see the sentinel value appear unexpectedly if their workload exceeds the per-field budgets. Put the substitution behavior behind a config flag so the rollout is opt-in. With the flag off (the new default), the per-field handlers still act as bounded UTF8 reuse caches sized by their cardinality budget, but over-cap values get a freshly-allocated UTF8BytesString instead of the sentinel and flow to distinct aggregate buckets. The wire format is unchanged from master for any workload. With the flag on, current behavior (sentinel substitution + bucket collapse). Handler refactor: - PropertyCardinalityHandler / TagCardinalityHandler take a useBlockedSentinel constructor arg. On cap-exhaust the cache no longer claims a slot (since it's full), but prior-cycle reuse still runs so repeat over-cap values pay only the probe, not the allocation. - TagCardinalityHandler.isBlockedResult now reads cacheBlocked directly rather than calling blockedByTracer(), so query-time never forces the sentinel to materialize when limits are disabled. - Test-convenience single-arg constructors default useBlockedSentinel to true so existing tests of the limits-enabled mode don't churn; new tests cover the disabled mode. Wiring: - AggregateEntry exposes static final LIMITS_ENABLED read from Config.get() at class init, threaded through all PropertyCardinality Handlers and the PeerTagSchema-built TagCardinalityHandlers. Config: - GeneralConfig.TRACE_STATS_CARDINALITY_LIMITS_ENABLED (default false) - Config.isTraceStatsCardinalityLimitsEnabled() - Registered in metadata/supported-configurations.json Co-Authored-By: Claude Opus 4.7 (1M context) Doc the regime shift after cardinality-limits flag landed Three small doc additions calling out behavior that's correct in code but easy to miss on a cold read: - AggregateTable.evictOneStale: explain that this is no longer just a pathological-case backstop. With LIMITS_ENABLED=false (the new default), over-cap values flow to distinct buckets and maxAggregates becomes the load-bearing cardinality enforcement -- the cursor- resumed scan was added for this regime. - AggregateEntry.LIMITS_ENABLED: document the over-cap repeat tradeoff in disabled mode (over-cap values can't promote into the current cache so repeats re-allocate) and the class-init caveat (static final read of Config, frozen for the JVM at first class load -- tests needing to exercise the limits-on path through the static handlers must construct handlers directly with explicit useBlockedSentinel args). Co-Authored-By: Claude Opus 4.7 (1M context) Drop useless @SuppressFBWarnings on AggregateEntry spotbugs now flags three suppression annotations as unnecessary: - Class-level AT_NONATOMIC_OPERATIONS_ON_SHARED_VARIABLE + AT_STALE_THREAD_WRITE_OF_PRIMITIVE — the int counter fields are no longer mutated cross-thread now that producer threads only enqueue SpanSnapshots and the aggregator thread is the sole writer. - clear() AT_NONATOMIC_64BIT_PRIMITIVE on the duration field — same reason; the long write is single-threaded. The class Javadoc already documents the single-writer invariant, so removing the annotations doesn't lose any documentation; the prose paragraph that referenced "the SuppressFBWarnings below" is updated in place. Co-Authored-By: Claude Opus 4.7 (1M context) Update stale Javadoc on AggregateEntry's no-equals contract The "use the TestAggregateEntry subclass in src/test" reference pointed to a subclass that was replaced earlier in the stack by the AggregateEntryTestUtils helper class. Test-side value-equality is now a helper, not a subclass; AggregateEntry stayed final. Co-Authored-By: Claude Opus 4.7 (1M context) Tighten AggregateEntry / PeerTagSchema surface area Three small cleanups that the recent design review surfaced: - Move test-only AggregateEntry.forSnapshot(SpanSnapshot) to AggregateEntryTestUtils. Production callers (AggregateTable.findOrInsert) already use the two-arg forSnapshot(snap, keyHash); the no-keyHash overload existed for tests. AggregateEntryTest now goes through the test helper. MetricsIntegrationTest can't see src/test, so it inlines forSnapshot(snap, hashOf(snap)) using the production API directly. - Change AggregateEntry.recordOneDuration to return void. Returned `this` for fluent-style chaining but the only caller (Aggregator.accept) discards the return. - Remove PeerTagSchema.hashCode/equals + cachedHashCode field. Used only by AggregateEntry.hashOf, which now inlines Arrays.hashCode(schema.names) with an explicit null guard. Drops 42 lines from PeerTagSchema and three now-redundant equals tests from PeerTagSchemaTest -- the schema's identity contract is enforced by the hash function and hasSameTagsAs rather than the Object#equals contract. Co-Authored-By: Claude Opus 4.7 (1M context) Tighten AggregateEntry surface — drop one-line factory, doc the conventions Five small cleanups surfaced by the design re-review: - Drop AggregateEntry.forSnapshot(SpanSnapshot, long). It wrapped the private constructor for no reason; make the constructor package- private and have AggregateTable.findOrInsert and AggregateEntryTestUtils.forSnapshot call it directly. - Class-level Javadoc now documents the required-vs-optional field absence convention: required fields canonicalize null -> EMPTY, optional fields stay null so the serializer's `!= null` check works. Previously a reader had to infer it from the constructor body. - Field Javadocs on `synthetic` (synthetic-monitoring origin tag) and `traceRoot` (parentId == 0). Both make it onto the wire; neither was obvious to a fresh reader. - Tighten the `peerTagNames` / `peerTagValues` field comment. The previous wording implied package-private was for "test-only" access; in fact production matches() reads them from within the class and the test helper is just one consumer. - Add a `canonicalizeOptional` helper that mirrors `canonicalize` but returns null (not EMPTY) for null input. Folds the four optional- field assignments in the constructor from three-line ternaries into one-liners. Keeps the `instanceof UTF8BytesString` short-circuit consistent across all label fields -- dead code for the String-typed optionals (httpMethod/Endpoint/grpcStatusCode), live for the CharSequence-typed serviceNameSource. Co-Authored-By: Claude Opus 4.7 (1M context) Merge branch 'dougqh/optimize-metric-key' into dougqh/control-tag-cardinality # Conflicts: # dd-trace-core/src/main/java/datadog/trace/common/metrics/AggregateEntry.java # dd-trace-core/src/main/java/datadog/trace/common/metrics/AggregateTable.java # dd-trace-core/src/main/java/datadog/trace/common/metrics/PeerTagSchema.java # dd-trace-core/src/test/java/datadog/trace/common/metrics/AggregateEntryTest.java # dd-trace-core/src/test/java/datadog/trace/common/metrics/AggregateEntryTestUtils.java # dd-trace-core/src/test/java/datadog/trace/common/metrics/PeerTagSchemaTest.java Merge branch 'master' into dougqh/optimize-metric-key Drop unused UTF8BytesString import in MetricsIntegrationTest Flagged by codenarcTraceAgentTest (UnusedImport rule). Left over from a prior rewrite of the entry-construction flow. Co-Authored-By: Claude Opus 4.7 (1M context) Merge branch 'dougqh/optimize-metric-key' into dougqh/control-tag-cardinality Merge branch 'master' into dougqh/optimize-metric-key Lazy-allocate the error latency histogram on AggregateEntry Each AggregateEntry allocated two DDSketchHistograms in its constructor (ok + error latencies). DDSketchHistogram wraps a DDSketch + lazy store, roughly 60-80 bytes per histogram even when empty. Most spans aren't errors, so most entries' errorLatencies sit empty for life. Now the field starts null. recordOneDuration lazy-allocates on the first error; if no error ever lands on the entry, it stays null and ~80 bytes of empty-histogram overhead are reclaimed. Across a full 2048-entry table that's ~150 KB if 95% of entries never error -- the typical case. For the wire format, SerializingMetricWriter caches the serialized form of an empty histogram (~17 bytes) on first use and writes those cached bytes when an entry's errorLatencies is null. The cache is per-writer (not a global static) so each writer instance picks up the Histograms factory state at the time of its first report, avoiding races with test setup that registers the DDSketch factory at varying points. Trade-off: entries that DO see an error retain the histogram across clear() (just cleared, not nulled), so always-erroring entries allocate exactly once. Same total allocation as before for that case. Co-Authored-By: Claude Opus 4.7 (1M context) Merge branch 'dougqh/lazy-error-latencies' into dougqh/control-tag-cardinality Lazy-allocate the error latency histogram on AggregateEntry Each AggregateEntry allocated two DDSketchHistograms in its constructor (ok + error latencies). DDSketchHistogram wraps a DDSketch + lazy store, roughly 60-80 bytes per histogram even when empty. Most spans aren't errors, so most entries' errorLatencies sit empty for life. Now the field starts null. recordOneDuration lazy-allocates on the first error; if no error ever lands on the entry, it stays null and ~80 bytes of empty-histogram overhead are reclaimed. Across a full 2048-entry table that's ~150 KB if 95% of entries never error -- the typical case. For the wire format, SerializingMetricWriter caches the serialized form of an empty histogram (~17 bytes) on first use and writes those cached bytes when an entry's errorLatencies is null. The cache is per-writer (not a global static) so each writer instance picks up the Histograms factory state at the time of its first report, avoiding races with test setup that registers the DDSketch factory at varying points. Trade-off: entries that DO see an error retain the histogram across clear() (just cleared, not nulled), so always-erroring entries allocate exactly once. Same total allocation as before for that case. Co-Authored-By: Claude Opus 4.7 (1M context) Merge master into dougqh/control-tag-cardinality Conflicts resolved by taking HEAD (cardinality branch) for all metrics-package files; master added ConflatingMetricsAggregatorDisableTest which duplicates the already-renamed ClientStatsAggregatorDisableTest — removed the old-named copy. Co-Authored-By: Claude Sonnet 4.6 Address amarziali review: move emptyHistogramBytesCache field, use imports - Move emptyHistogramBytesCache up to the instance fields block - Import java.nio.ByteBuffer and datadog.metrics.api.Histogram; drop FQNs Co-Authored-By: Claude Sonnet 4.6 Add [Claude] comment explaining lazy init on emptyHistogramBytesCache Co-Authored-By: Claude Sonnet 4.6 Drop [Claude] tag from emptyHistogramBytesCache comment Co-Authored-By: Claude Sonnet 4.6 Merge branch 'master' into dougqh/lazy-error-latencies Cache PeerTagSchema.namesHash Precompute Arrays.hashCode(peerTagSchema.names) once at schema construction and read it from the field on the AggregateEntry.hashOf hot path instead of recomputing per publish. The schema is shared across many publishes; the per-publish recomputation was a top aggregator-thread sample in the 64m CPU profile. Identified by the 64m JFR profile alongside the park/unpark change. Co-Authored-By: Claude Opus 4.7 (1M context) Merge dougqh/lazy-error-latencies: lazy histogram + namesHash caching Picks up two changes from the base branch: - Lazy-allocate error latency histogram on AggregateEntry (#11478) - Cache PeerTagSchema.namesHash to avoid recomputing Arrays.hashCode on every snapshot publish Co-Authored-By: Claude Sonnet 4.6 Clamp populatePeerTags iteration to Math.min(schema.size(), values.length) Defensive against a future schema/values length mismatch (safe by construction today, but the clamp makes the invariant explicit and avoids a silent ArrayIndexOutOfBoundsException if the two ever diverge). Co-Authored-By: Claude Sonnet 4.6 Replace Canonical.peerTagsBuffer ArrayList with UTF8BytesString[] + size The ArrayList in AggregateEntry.Canonical was a small allocation at construction time (header + backing array for 4 initial slots). Replace with a plain array + int size counter: - On the hit path (no peer tags, or already-seen values): zero allocation, same as before but one fewer object in the Canonical struct. - On resize (schema grows): allocates a new array sized to the schema; subsequent calls reuse it until the schema grows again. - In toEntry() (miss path): Arrays.copyOf + Arrays.asList instead of new ArrayList<>(buffer), saving one ArrayList wrapper per new entry. - hashOf() and peerTagsEqual() updated to take array + size directly, removing the get() indirection. Co-Authored-By: Claude Sonnet 4.6 Move blockedCount from PeerTagSchema into TagCardinalityHandler block counts now live inside each TagCardinalityHandler alongside the blocking decision. reset() returns the accumulated count and zeros it atomically with the table swap, so the caller (PeerTagSchema. resetCardinalityHandlers) picks it up and reports it to HealthMetrics. PeerTagSchema drops the blockedCounts[] array entirely; register() is simplified to a single isBlockedResult + warn-once check. Co-Authored-By: Claude Sonnet 4.6 Update client_metrics_design.md for post-#11382 state - Remove AggregateMetric (folded into AggregateEntry in #11382) - Replace lastTimeDiscovered / getLastTimeDiscovered() with state() hash throughout (changed in #11381) - Update reconcile section to mention telemetry flush on schema swap - Note that blockedCount now lives in TagCardinalityHandler, not PeerTagSchema Co-Authored-By: Claude Sonnet 4.6 Emit health metrics for property-field cardinality blocks PropertyCardinalityHandler.reset() now returns the accumulated block count (mirroring TagCardinalityHandler). AggregateEntry.reset- CardinalityHandlers(HealthMetrics) reports each field's block count via onTagCardinalityBlocked so operators can see when resource/service/ operation/etc. limits are hit, not just peer-tag limits. The no-arg overload is preserved for tests and uses HealthMetrics.NO_OP. Co-Authored-By: Claude Sonnet 4.6 Apply spotless formatting to PeerTagSchema javadoc Co-Authored-By: Claude Opus 4.8 (1M context) Merge remote-tracking branch 'origin/master' into dougqh/control-tag-cardinality # Conflicts: # dd-trace-core/src/main/java/datadog/trace/common/metrics/AggregateEntry.java # dd-trace-core/src/main/java/datadog/trace/common/metrics/PeerTagSchema.java Rename Canonical.toEntry to createEntry Addresses dougqh's review comment on #11387. Co-Authored-By: Claude Opus 4.8 (1M context) Trim multi-paragraph javadocs to one-liners per conventions Co-Authored-By: Claude Sonnet 4.6 Port review fixes: handler names, lazy statsDTag, has*() length checks, HealthMetrics interface - PropertyCardinalityHandler and TagCardinalityHandler gain a name field and a lazy statsDTag() accessor (String[]{"tag:"}), built only on first block - HealthMetrics.onTagCardinalityBlocked takes String[] so callers pass the pre-built array; TracerHealthMetrics forwards it directly to StatsD - AggregateEntry.has*() switch from identity (!=EMPTY) to length()>0 so empty-string values are treated as absent on the wire - EMPTY_PEER_TAGS renamed to EMPTY_TAGS - ignoredResources.isEmpty() guard on the publish hot path - CardinalityHandlerTest updated for the new PropertyCardinalityHandler(name,...) constructor Co-Authored-By: Claude Sonnet 4.6 Fix stale Javadoc, add property-field warn log, fix SerializingMetricWriter ctor, add @Nullable - Aggregator.onReportCycle Javadoc: ConflatingMetricsAggregator -> ClientStatsAggregator - PropertyCardinalityHandler gains shouldWarnThisCycle() (cleared on reset()); name is package-private; AggregateEntry.reportIfBlocked() logs warn on first block per field per cycle, matching PeerTagSchema and AdditionalTagsSchema behaviour - SerializingMetricWriter 4-arg constructor was constructing new GitInfoProvider() instead of assigning the injected parameter - SpanSnapshot.httpMethod/httpEndpoint/grpcStatusCode annotated @Nullable Co-Authored-By: Claude Sonnet 4.6 Pass HealthMetrics through to PeerTagSchema.resetCardinalityHandlers() at call time PeerTagSchema.INTERNAL was constructed with HealthMetrics.NO_OP so base.service cardinality blocks were silently dropped from StatsD. Removing the healthMetrics field from PeerTagSchema entirely and passing it at call time means INTERNAL and all other schemas report through the same real HealthMetrics instance. PeerTagSchema.of() drops the HealthMetrics parameter accordingly. Co-Authored-By: Claude Sonnet 4.6 Identity fast-path in property handler probes Add identity check (existing == value) before contentEquals in both the cur-cycle and prior-cycle probe loops. In steady state the same UTF8BytesString instance recurs every span, so contentEquals is never reached. Co-Authored-By: Claude Sonnet 4.6 Identity fast-path in tag handler probes Add identity check (curKey == value / priorKey == value) before equals() in both probe loops. Incoming values are often string literals or interned strings so the reference check hits reasonably often. Co-Authored-By: Claude Sonnet 4.6 Restore inbox-full fast-path in publish() Accidentally dropped when publish(CoreSpan, boolean) was refactored to publish(CoreSpan, boolean, PeerTagSchema). Short-circuits before any tag extraction or SpanSnapshot allocation when the inbox is at capacity. Co-Authored-By: Claude Sonnet 4.6 Remove shouldWarnThisCycle: reset() always clears the flag before the check Co-Authored-By: Claude Sonnet 4.6 Merge branch 'master' into dougqh/control-tag-cardinality Port cardinality review fixes from #11402: drop warnedCardinality, add NO_STATE, rename resetHandlers, Config.toString Back-ports the self-contained #11387 review-comment fixes that were mistakenly committed to the stacked child branch (dougqh/metrics-arbitrary-tags) instead of here: - Remove the per-registration warnedCardinality warn-once set from PeerTagSchema; emit the warn once per cycle in resetHandlers() when blocked > 0. Drops the now-dead TagCardinalityHandler.isBlockedResult() and updates CardinalityHandlerTest accordingly. - Add an explanatory NO_STATE constant for the null state passed by never-reconciled schemas (INTERNAL singleton, test schemas). - Rename PeerTagSchema.resetCardinalityHandlers -> resetHandlers (callers in AggregateEntry and ClientStatsAggregator updated; the aggregator's own no-arg orchestration method keeps its name). - Add traceStatsCardinalityLimitsEnabled to Config.toString() for diagnostics. - Fix SerializingMetricWriterTest: validate the header map size against the injected git provider (shaCommit) instead of the global GitInfoProvider.INSTANCE, which returns null in environments without resolvable git info and made the test fail there. The LIMITS_ENABLED relocation and CardinalityBlocks extraction were intentionally NOT ported: they depend on PropertyHandlers/AdditionalTagsSchema, which only exist on the child branch. Co-Authored-By: Claude Sonnet 4.6 Add missing package declaration to MetricsIntegrationTest The file lives in src/traceAgentTest/groovy/datadog/trace/common/metrics/ but had no package declaration, so it compiled into the default package and hit java.lang.IllegalAccessError accessing package-private PeerTagSchema (and the other package-private metrics classes it uses) at runtime, failing the traceAgentTest job. Declaring `package datadog.trace.common.metrics` restores legal access. Co-Authored-By: Claude Sonnet 4.6 Drop now-redundant same-package imports in MetricsIntegrationTest After moving the test into package datadog.trace.common.metrics, its imports of the package's own classes became same-package imports rejected by CodeNarc's ImportFromSamePackage rule (codenarcTraceAgentTest). Removed them; classes resolve in-package. Co-Authored-By: Claude Sonnet 4.6 Suppress false-positive SpotBugs ES_COMPARING in TagCardinalityHandler.register spotbugsMain flagged ES_COMPARING_PARAMETER_STRING_WITH_EQ on the intentional reference-equality fast-path that short-circuits the .equals() call when the stored key and probe value are the same instance. Suppressed with @SuppressFBWarnings + justification (repo convention). Co-Authored-By: Claude Sonnet 4.6 Migrate MetricsIntegrationTest from Spock/Groovy to JUnit 5 Java Same stale-API problem as on #11402: the Groovy test built entries via AggregateEntry.hashOf(SpanSnapshot) and a (SpanSnapshot,long) constructor that don't exist here (hashOf takes the canonicalized UTF8 field list), so it only failed at runtime in traceAgentTest. Rewritten as a self-contained JUnit 5 Java test that builds entries through AggregateTable.findOrInsert (15-arg SpanSnapshot on this branch -- no additionalTagValues). Agent wiring replicated inline; metrics meter initialized in @BeforeAll. One test, unchanged intent. NOTE: local compile/lint not yet re-verified (Gradle cache was locked by a concurrent build); the file is the verified #11402 migration minus the additionalTagValues arg. Co-Authored-By: Claude Sonnet 4.6 Revert unnecessary discoverIfOutdated refactor in DDAgentFeaturesDiscovery Drops the redundant `final State previous = discoveryState;` local (introduced earlier in the stack); discoverIfOutdated now reads discoveryState.lastTimeDiscovered directly, matching master. Reviewers (sarahchen6, amarziali) flagged this for reversion; the revert had landed on #11402 but not here on #11387 where the change actually originates. File is now identical to master. Co-Authored-By: Claude Sonnet 4.6 Address PR review feedback: revert stray change, clean up CoreSpan, raise RESOURCE limit - Revert DDAgentFeaturesDiscovery: remove orgPropagationMarker field/parser/getter added accidentally; unrelated to this PR's goal - CoreSpan: refactor isKind to delegate to getSpanKindString (removes duplication); use already-imported Tags.SPAN_KIND instead of FQN in getSpanKindString - MetricCardinalityLimits: raise RESOURCE from 128 to 256 — typical service range is 30-200 unique values so 128 sat in the middle of normal workloads - ClientStatsAggregatorTest: add setup() to call resetCardinalityHandlers() before each test, preventing cross-test handler pollution from static state - docs: remove AI-generated client_metrics_design.md Co-Authored-By: Claude Sonnet 4.6 Fix forceKeep reset on ignored resource and stale spanKind test stubs Drop the spurious `forceKeep = false` before `break` in ClientStatsAggregator.publish(): the assignment silently discarded a force-keep signal accumulated from earlier spans in the same trace whenever a later span matched an ignored resource. Update three test helpers that were stubbing the removed 2-arg unsafeGetTag(SPAN_KIND, default) overload — the aggregator now calls getSpanKindString() directly, so the old stubs never matched and spanKind was silently null in those tests. Complete the revert of the stray OrgGuard integration in CoreTracer (the DDAgentFeaturesDiscovery side was reverted in the previous commit; the CoreTracer side was missed). Co-Authored-By: Claude Sonnet 4.6 Merge branch 'master' into dougqh/control-tag-cardinality Rename sentinel blocked_by_tracer → tracer_blocked_value per Cardinality Limits RFC Co-Authored-By: Claude Sonnet 4.6 Rename statsd metric to datadog.tracer.stats.collapsed_spans per Cardinality Limits RFC Co-Authored-By: Claude Sonnet 4.6 Add DD_TRACE_STATS_CARDINALITY_LIMIT config per Cardinality Limits RFC tunability guidance Co-Authored-By: Claude Sonnet 4.6 Guard field handler reset against partial updates via FIELD_HANDLERS array Co-Authored-By: Claude Sonnet 4.6 Avoid redundant isKind() calls and null peerTagsBuffer check on hot path peerTagSchemaFor now takes the already-resolved spanKind String and calls SpanKindFilter.matches(String) directly, avoiding two tag-map lookups that getSpanKindString() had already paid for. Canonical.peerTagsBuffer initialized to EMPTY_TAGS instead of null, removing the null check in populate()'s hashOf() call and the null branch in populatePeerTags(). Co-Authored-By: Claude Sonnet 4.6 Fix stale AdditionalTagsSchema javadoc references in AggregateEntry Co-Authored-By: Claude Sonnet 4.6 Remove TRACE_STATS_CARDINALITY_LIMIT config; defer per-component config to follow-up PR Co-Authored-By: Claude Sonnet 4.6 Remove cardinality limits enabled config; hardcode false until per-component config lands Co-Authored-By: Claude Sonnet 4.6 Use RFC-aligned 'collapsed:' tag prefix for stats cardinality health metrics Per RFC §2, the health metric tag dimension should use 'collapsed:' (e.g. 'collapsed:resource') rather than 'tag:', and whole-key overflow should emit 'collapsed:whole_key' rather than only the existing stats.dropped_aggregates counter. Co-Authored-By: Claude Sonnet 4.6 Add @BeforeEach resetCardinalityHandlers to AggregateEntryTest and MetricsIntegrationTest Static per-field handlers on AggregateEntry accumulate state across tests. AggregateTableTest and ClientStatsAggregatorTest already reset them; these two were missing the guard. Co-Authored-By: Claude Sonnet 4.6 Move testSchema() out of PeerTagSchema into its sole test caller The factory was test-only but lived in the production class. Making the constructor package-private lets AggregateTableTest (same package) call it directly; the test-only method is removed from the production API. Co-Authored-By: Claude Sonnet 4.6 Merge branch 'master' into dougqh/control-tag-cardinality Co-Authored-By: Claude Sonnet 4.6 Fix MetricsIntegrationTest: replace removed testSchema() with package-private constructor Co-Authored-By: Claude Sonnet 4.6 Fix HealthMetricsTest: onStatsAggregateDropped now emits two statsd calls onStatsAggregateDropped() now emits an immediate collapsed_spans count (RFC §2) in addition to the existing periodic stats.dropped_aggregates report. Update the test to use CountDownLatch(2) and verify both calls. Co-Authored-By: Claude Sonnet 4.6 Address PR review: CI fixes + Javadoc rewrites from review feedback - DDAgentFeaturesDiscoveryTest: remove two tests referencing removed getOrgPropagationMarker() — fixes CI compilation failure - ClientStatsAggregator: swap null-before-isEmpty check order per review - PeerTagSchema/AggregateTable/AggregateEntry/MetricCardinalityLimits: Javadoc rewrites per reviewer feedback — remove change-history orientation, clarify thread-safety prose, drop stale MetricKey references, rename populate() to populateFrom() - AggregateEntryTestUtils: remove "On this branch" phrasing Co-Authored-By: Claude Sonnet 4.6 Address review: AggregateTable + PropertyCardinalityHandler improvements - AggregateTable: use Hashtable.Support.xxx() qualified form, fix stale ConflatingMetricsAggregator reference in Javadoc - PropertyCardinalityHandler: add @VisibleForTesting, extract MAX_CARDINALITY_LIMIT constant, restructure inline comments in register() per review suggestions, add cycle definition to class doc Co-Authored-By: Claude Sonnet 4.6 Mirror bric3 review suggestions from PropertyCardinalityHandler onto TagCardinalityHandler Applied all bric3 review suggestions for TagCardinalityHandler: - Replace class Javadoc with self-contained description of the tag-value encoding path - Extract MAX_CARDINALITY_LIMIT = 1 << 29 constant (mirrors PropertyCardinalityHandler) - Add @VisibleForTesting on 2-arg test constructor (uses datadog.trace.api.internal) - Rewrite register() Javadoc to match PropertyCardinalityHandler's style - Add inline comments throughout register() matching the parallel structure in PropertyCardinalityHandler (probe slot, current-cycle lookup, sentinel mode, prior reuse) - Rename curKey -> existing to match PropertyCardinalityHandler naming Also applied remaining PropertyCardinalityHandler suggestion: - Add "This value is new for the current cycle." comment before capExhausted (MjO4h) Test additions: - tagRegisterOfNullDoesNotConsumeBudget (mirror of property equivalent) - propertyResetReturnsBlockedCount + tagResetReturnsBlockedCount (verify reset() return value) - PeerTagSchemaTest.resetHandlersReportsBlockedCountToHealthMetrics (verifies onTagCardinalityBlocked is called for any tag that hit its limit) Co-Authored-By: Claude Sonnet 4.6 Merge branch 'master' into dougqh/control-tag-cardinality Move AggregateEntry.of() test factory to AggregateEntryTestUtils The factory was always test-only and the class Javadoc on AggregateEntryTestUtils already stated the intent: "Lives in src/test so the production class stays free of test-only API." Moving it there completes that design. To enable the move: - AggregateEntry constructor: private → package-private - AggregateEntry.createUtf8(): private static → package-private static Both are non-public internal helpers; widening to package-private exposes them only within the same source set. AggregateEntryTestUtils.of() now owns the implementation directly. All callers updated: AggregateEntryTest (Java) and ClientStatsAggregatorTest (Groovy). Co-Authored-By: Claude Sonnet 4.6 Simplify class Javadoc on PropertyCardinalityHandler and TagCardinalityHandler Remove DDCache history, storage layout details, and reset mechanics from the class headers -- those belong in a design doc or the inline comments that already explain them at the call site. Keep just what's non-obvious from the class name: the cycle/budget concept and the prior-cycle reuse invariant. Co-Authored-By: Claude Sonnet 4.6 Restore dual-role and prior-cycle design paragraphs to PropertyCardinalityHandler Co-Authored-By: Claude Sonnet 4.6 Merge origin/master into dougqh/control-tag-cardinality Conflict in CoreSpan.java: master made isKind() abstract (enforcing that all implementors provide an efficient implementation); our branch had made it a default that delegates to getSpanKindString(). Resolution: keep isKind() abstract per master, retain getSpanKindString() as a default since ClientStatsAggregator calls it on the CoreSpan interface. Co-Authored-By: Claude Sonnet 4.6 Add missing Tags import to CoreSpan after merge The getSpanKindString() default method references Tags.SPAN_KIND but the import was not present after the merge conflict resolution. Co-Authored-By: Claude Sonnet 4.6 Apply spotless formatting Co-Authored-By: Claude Sonnet 4.6 Merge branch 'master' into dougqh/control-tag-cardinality Merge branch 'master' into dougqh/control-tag-cardinality Merge branch 'master' into dougqh/control-tag-cardinality Update dd-trace-core/src/main/java/datadog/trace/common/metrics/PropertyCardinalityHandler.java Co-authored-by: Brice Dutheil Merge branch 'master' into dougqh/control-tag-cardinality Merge branch 'master' into dougqh/control-tag-cardinality Move HealthMetrics-dependent cardinality reporting out of AggregateEntry AggregateEntry importing HealthMetrics causes GraalVM native-image failures: HealthMetrics.onOrgGuardEnforce(OrgGuard.Reason) pulls OrgGuard$Reason into the reachability graph, and getDeclaringClass0() on an inner enum stored in the agent's .classdata classloader fails at native-image build time. ClientStatsAggregator already owns HealthMetrics and the reset hook; inline the per-field blocked-count reporting there, make FIELD_HANDLERS package- private for the loop, and reduce AggregateEntry.resetCardinalityHandlers() to a plain reset with no HealthMetrics dependency. Co-Authored-By: Claude Sonnet 4.6 Fix GraalVM native-image failures: remove HealthMetrics from PeerTagSchema and fix PropertyCardinalityHandler PeerTagSchema.INTERNAL is a static field, so GraalVM's reachability analysis initializes PeerTagSchema at build time. With HealthMetrics in its method signatures, this pulls in OrgGuard$Reason (an inner enum stored in the agent's .classdata classloader), and getDeclaringClass0() fails at native-image time. Move the per-cycle block-count reporting out of PeerTagSchema.resetHandlers into a new ClientStatsAggregator.resetPeerTagSchema helper, which already owns HealthMetrics and the reset hook. PeerTagSchema and its handlers are now free of HealthMetrics. Also removes a stale class-level Javadoc block that was accidentally embedded inside PropertyCardinalityHandler.reset() instead of at the top of the file. This was causing the persistent spotless failure in CI. Co-Authored-By: Claude Sonnet 4.6 Restore OrgGuard and orgPropagationMarker removed by accidental merge conflicts - Restore OrgGuard creation in CoreTracer (decorates extractor and injector for _dd.p.opm header propagation) - Restore orgPropagationMarker field/parser/getter in DDAgentFeaturesDiscovery - Move propagationTagsFactory initialization back before OrgGuard setup - Fix PeerTagSchemaTest to not call removed resetHandlers(HealthMetrics) method Fixes spring-boot-3-native GraalVM CI failure and parametric OPM test failure. Co-Authored-By: Claude Sonnet 4.6 Co-authored-by: devflow.devflow-routing-intake --- .../ddagent/DDAgentFeaturesDiscovery.java | 8 +- .../DDAgentFeaturesDiscoveryTest.groovy | 29 - .../trace/api/config/GeneralConfig.java | 1 - .../metrics/AdversarialMetricsBenchmark.java | 8 +- ...va => ClientStatsAggregatorBenchmark.java} | 6 +- ...ClientStatsAggregatorDDSpanBenchmark.java} | 14 +- .../HighCardinalityPeerMetricsBenchmark.java | 8 +- ...ghCardinalityResourceMetricsBenchmark.java | 8 +- .../trace/common/metrics/AggregateEntry.java | 624 ++++++++++-------- .../trace/common/metrics/AggregateTable.java | 59 +- .../trace/common/metrics/Aggregator.java | 8 +- ...egator.java => ClientStatsAggregator.java} | 183 +++-- .../metrics/MetricCardinalityLimits.java | 73 ++ .../metrics/MetricsAggregatorFactory.java | 2 +- .../trace/common/metrics/PeerTagSchema.java | 102 +-- .../metrics/PropertyCardinalityHandler.java | 181 +++++ .../metrics/SerializingMetricWriter.java | 13 +- .../trace/common/metrics/SpanSnapshot.java | 26 +- .../common/metrics/TagCardinalityHandler.java | 170 +++++ .../java/datadog/trace/core/CoreSpan.java | 11 + .../main/java/datadog/trace/core/DDSpan.java | 5 + .../trace/core/monitor/HealthMetrics.java | 9 + .../core/monitor/TracerHealthMetrics.java | 7 + ...roovy => ClientStatsAggregatorTest.groovy} | 106 ++- .../common/metrics/FootprintForkedTest.groovy | 2 +- .../MetricsAggregatorFactoryTest.groovy | 2 +- .../SerializingMetricWriterTest.groovy | 17 +- .../common/metrics/AggregateEntryTest.java | 107 ++- .../metrics/AggregateEntryTestUtils.java | 120 ++-- .../common/metrics/AggregateTableTest.java | 12 +- .../metrics/CardinalityHandlerTest.java | 260 ++++++++ ...> ClientStatsAggregatorBootstrapTest.java} | 25 +- ... => ClientStatsAggregatorDisableTest.java} | 16 +- ...> ClientStatsAggregatorInboxFullTest.java} | 12 +- .../common/metrics/PeerTagSchemaTest.java | 30 +- .../trace/core/monitor/HealthMetricsTest.java | 5 +- .../metrics/MetricsIntegrationTest.groovy | 75 --- .../metrics/MetricsIntegrationTest.java | 187 ++++++ .../main/java/datadog/trace/api/Config.java | 1 - 39 files changed, 1722 insertions(+), 810 deletions(-) rename dd-trace-core/src/jmh/java/datadog/trace/common/metrics/{ConflatingMetricsAggregatorBenchmark.java => ClientStatsAggregatorBenchmark.java} (95%) rename dd-trace-core/src/jmh/java/datadog/trace/common/metrics/{ConflatingMetricsAggregatorDDSpanBenchmark.java => ClientStatsAggregatorDDSpanBenchmark.java} (87%) rename dd-trace-core/src/main/java/datadog/trace/common/metrics/{ConflatingMetricsAggregator.java => ClientStatsAggregator.java} (72%) create mode 100644 dd-trace-core/src/main/java/datadog/trace/common/metrics/MetricCardinalityLimits.java create mode 100644 dd-trace-core/src/main/java/datadog/trace/common/metrics/PropertyCardinalityHandler.java create mode 100644 dd-trace-core/src/main/java/datadog/trace/common/metrics/TagCardinalityHandler.java rename dd-trace-core/src/test/groovy/datadog/trace/common/metrics/{ConflatingMetricAggregatorTest.groovy => ClientStatsAggregatorTest.groovy} (92%) create mode 100644 dd-trace-core/src/test/java/datadog/trace/common/metrics/CardinalityHandlerTest.java rename dd-trace-core/src/test/java/datadog/trace/common/metrics/{ConflatingMetricsAggregatorBootstrapTest.java => ClientStatsAggregatorBootstrapTest.java} (95%) rename dd-trace-core/src/test/java/datadog/trace/common/metrics/{ConflatingMetricsAggregatorDisableTest.java => ClientStatsAggregatorDisableTest.java} (95%) rename dd-trace-core/src/test/java/datadog/trace/common/metrics/{ConflatingMetricsAggregatorInboxFullTest.java => ClientStatsAggregatorInboxFullTest.java} (87%) delete mode 100644 dd-trace-core/src/traceAgentTest/groovy/datadog/trace/common/metrics/MetricsIntegrationTest.groovy create mode 100644 dd-trace-core/src/traceAgentTest/java/datadog/trace/common/metrics/MetricsIntegrationTest.java diff --git a/communication/src/main/java/datadog/communication/ddagent/DDAgentFeaturesDiscovery.java b/communication/src/main/java/datadog/communication/ddagent/DDAgentFeaturesDiscovery.java index 55929c73f51..7cef3e02924 100644 --- a/communication/src/main/java/datadog/communication/ddagent/DDAgentFeaturesDiscovery.java +++ b/communication/src/main/java/datadog/communication/ddagent/DDAgentFeaturesDiscovery.java @@ -406,10 +406,6 @@ public Set peerTags() { return discoveryState.peerTags; } - public String getOrgPropagationMarker() { - return discoveryState.orgPropagationMarker; - } - public String getMetricsEndpoint() { return discoveryState.metricsEndpoint; } @@ -460,6 +456,10 @@ public String state() { return discoveryState.state; } + public String getOrgPropagationMarker() { + return discoveryState.orgPropagationMarker; + } + @Override public boolean active() { return supportsMetrics(); diff --git a/communication/src/test/groovy/datadog/communication/ddagent/DDAgentFeaturesDiscoveryTest.groovy b/communication/src/test/groovy/datadog/communication/ddagent/DDAgentFeaturesDiscoveryTest.groovy index ff97ef6d3a2..8bcda6eb811 100644 --- a/communication/src/test/groovy/datadog/communication/ddagent/DDAgentFeaturesDiscoveryTest.groovy +++ b/communication/src/test/groovy/datadog/communication/ddagent/DDAgentFeaturesDiscoveryTest.groovy @@ -50,7 +50,6 @@ class DDAgentFeaturesDiscoveryTest extends DDSpecification { static final String INFO_WITH_LONG_RUNNING_SPANS = loadJsonFile("agent-info-with-long-running-spans.json") static final String INFO_WITH_TELEMETRY_PROXY_RESPONSE = loadJsonFile("agent-info-with-telemetry-proxy.json") static final String INFO_WITH_OLD_EVP_PROXY = loadJsonFile("agent-info-with-old-evp-proxy.json") - static final String INFO_WITH_OPM = loadJsonFile("agent-info-with-opm.json") static final String PROBE_STATE = "probestate" def "test parse /info response"() { @@ -210,34 +209,6 @@ class DDAgentFeaturesDiscoveryTest extends DDSpecification { 0 * _ } - def "test parse /info response with org propagation marker"() { - setup: - OkHttpClient client = Mock(OkHttpClient) - DDAgentFeaturesDiscovery features = new DDAgentFeaturesDiscovery(client, monitoring, agentUrl, V0_5, true, false) - - when: "/info available" - features.discover() - - then: - 1 * client.newCall(_) >> { Request request -> infoResponse(request, INFO_WITH_OPM) } - features.getOrgPropagationMarker() == "abc123def0" - 0 * _ - } - - def "test parse /info response without org propagation marker"() { - setup: - OkHttpClient client = Mock(OkHttpClient) - DDAgentFeaturesDiscovery features = new DDAgentFeaturesDiscovery(client, monitoring, agentUrl, V0_5, true, false) - - when: "/info available" - features.discover() - - then: - 1 * client.newCall(_) >> { Request request -> infoResponse(request, INFO_RESPONSE) } - features.getOrgPropagationMarker() == null - 0 * _ - } - def "test fallback when /info empty"() { setup: OkHttpClient client = Mock(OkHttpClient) diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/GeneralConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/GeneralConfig.java index 79d3861d8ab..c9963516f1a 100644 --- a/dd-trace-api/src/main/java/datadog/trace/api/config/GeneralConfig.java +++ b/dd-trace-api/src/main/java/datadog/trace/api/config/GeneralConfig.java @@ -79,7 +79,6 @@ public final class GeneralConfig { public static final String TRACER_METRICS_MAX_PENDING = "trace.tracer.metrics.max.pending"; public static final String TRACER_METRICS_IGNORED_RESOURCES = "trace.tracer.metrics.ignored.resources"; - public static final String AZURE_APP_SERVICES = "azure.app.services"; public static final String INTERNAL_EXIT_ON_FAILURE = "trace.internal.exit.on.failure"; diff --git a/dd-trace-core/src/jmh/java/datadog/trace/common/metrics/AdversarialMetricsBenchmark.java b/dd-trace-core/src/jmh/java/datadog/trace/common/metrics/AdversarialMetricsBenchmark.java index 634dea23358..01ba90097a4 100644 --- a/dd-trace-core/src/jmh/java/datadog/trace/common/metrics/AdversarialMetricsBenchmark.java +++ b/dd-trace-core/src/jmh/java/datadog/trace/common/metrics/AdversarialMetricsBenchmark.java @@ -60,7 +60,7 @@ @Fork(value = 1) public class AdversarialMetricsBenchmark { - private ConflatingMetricsAggregator aggregator; + private ClientStatsAggregator aggregator; private CountingHealthMetrics health; @State(Scope.Thread) @@ -72,13 +72,13 @@ public static class ThreadState { public void setup() { this.health = new CountingHealthMetrics(); this.aggregator = - new ConflatingMetricsAggregator( + new ClientStatsAggregator( new WellKnownTags("", "", "", "", "", ""), Collections.emptySet(), - new ConflatingMetricsAggregatorBenchmark.FixedAgentFeaturesDiscovery( + new ClientStatsAggregatorBenchmark.FixedAgentFeaturesDiscovery( Collections.singleton("peer.hostname"), Collections.emptySet()), this.health, - new ConflatingMetricsAggregatorBenchmark.NullSink(), + new ClientStatsAggregatorBenchmark.NullSink(), 2048, 2048, false); diff --git a/dd-trace-core/src/jmh/java/datadog/trace/common/metrics/ConflatingMetricsAggregatorBenchmark.java b/dd-trace-core/src/jmh/java/datadog/trace/common/metrics/ClientStatsAggregatorBenchmark.java similarity index 95% rename from dd-trace-core/src/jmh/java/datadog/trace/common/metrics/ConflatingMetricsAggregatorBenchmark.java rename to dd-trace-core/src/jmh/java/datadog/trace/common/metrics/ClientStatsAggregatorBenchmark.java index b9a2f7f8c54..b9d72eaf3ab 100644 --- a/dd-trace-core/src/jmh/java/datadog/trace/common/metrics/ConflatingMetricsAggregatorBenchmark.java +++ b/dd-trace-core/src/jmh/java/datadog/trace/common/metrics/ClientStatsAggregatorBenchmark.java @@ -34,12 +34,12 @@ @BenchmarkMode(Mode.AverageTime) @OutputTimeUnit(MICROSECONDS) @Fork(value = 1) -public class ConflatingMetricsAggregatorBenchmark { +public class ClientStatsAggregatorBenchmark { private final DDAgentFeaturesDiscovery featuresDiscovery = new FixedAgentFeaturesDiscovery( Collections.singleton("peer.hostname"), Collections.emptySet()); - private final ConflatingMetricsAggregator aggregator = - new ConflatingMetricsAggregator( + private final ClientStatsAggregator aggregator = + new ClientStatsAggregator( new WellKnownTags("", "", "", "", "", ""), Collections.emptySet(), featuresDiscovery, diff --git a/dd-trace-core/src/jmh/java/datadog/trace/common/metrics/ConflatingMetricsAggregatorDDSpanBenchmark.java b/dd-trace-core/src/jmh/java/datadog/trace/common/metrics/ClientStatsAggregatorDDSpanBenchmark.java similarity index 87% rename from dd-trace-core/src/jmh/java/datadog/trace/common/metrics/ConflatingMetricsAggregatorDDSpanBenchmark.java rename to dd-trace-core/src/jmh/java/datadog/trace/common/metrics/ClientStatsAggregatorDDSpanBenchmark.java index 89059857d9c..0453b8888db 100644 --- a/dd-trace-core/src/jmh/java/datadog/trace/common/metrics/ConflatingMetricsAggregatorDDSpanBenchmark.java +++ b/dd-trace-core/src/jmh/java/datadog/trace/common/metrics/ClientStatsAggregatorDDSpanBenchmark.java @@ -28,8 +28,8 @@ import org.openjdk.jmh.infra.Blackhole; /** - * Parallels {@link ConflatingMetricsAggregatorBenchmark} but uses real {@link DDSpan} instances - * instead of the lightweight {@code SimpleSpan} mock, so the JIT exercises the production {@link + * Parallels {@link ClientStatsAggregatorBenchmark} but uses real {@link DDSpan} instances instead + * of the lightweight {@code SimpleSpan} mock, so the JIT exercises the production {@link * CoreSpan#isKind} path (cached span.kind ordinal + bit-test) rather than the groovy mock's * dispatch. * @@ -50,21 +50,21 @@ @BenchmarkMode(Mode.AverageTime) @OutputTimeUnit(MICROSECONDS) @Fork(value = 1) -public class ConflatingMetricsAggregatorDDSpanBenchmark { +public class ClientStatsAggregatorDDSpanBenchmark { private static final CoreTracer TRACER = CoreTracer.builder().writer(new NoopWriter()).strictTraceWrites(false).build(); private final DDAgentFeaturesDiscovery featuresDiscovery = - new ConflatingMetricsAggregatorBenchmark.FixedAgentFeaturesDiscovery( + new ClientStatsAggregatorBenchmark.FixedAgentFeaturesDiscovery( Collections.singleton("peer.hostname"), Collections.emptySet()); - private final ConflatingMetricsAggregator aggregator = - new ConflatingMetricsAggregator( + private final ClientStatsAggregator aggregator = + new ClientStatsAggregator( new WellKnownTags("", "", "", "", "", ""), Collections.emptySet(), featuresDiscovery, HealthMetrics.NO_OP, - new ConflatingMetricsAggregatorBenchmark.NullSink(), + new ClientStatsAggregatorBenchmark.NullSink(), 2048, 2048, false); diff --git a/dd-trace-core/src/jmh/java/datadog/trace/common/metrics/HighCardinalityPeerMetricsBenchmark.java b/dd-trace-core/src/jmh/java/datadog/trace/common/metrics/HighCardinalityPeerMetricsBenchmark.java index 67caaca6ced..8fc45b4acd8 100644 --- a/dd-trace-core/src/jmh/java/datadog/trace/common/metrics/HighCardinalityPeerMetricsBenchmark.java +++ b/dd-trace-core/src/jmh/java/datadog/trace/common/metrics/HighCardinalityPeerMetricsBenchmark.java @@ -50,7 +50,7 @@ @Fork(value = 1) public class HighCardinalityPeerMetricsBenchmark { - private ConflatingMetricsAggregator aggregator; + private ClientStatsAggregator aggregator; private CountingHealthMetrics health; @State(Scope.Thread) @@ -62,13 +62,13 @@ public static class ThreadState { public void setup() { this.health = new CountingHealthMetrics(); this.aggregator = - new ConflatingMetricsAggregator( + new ClientStatsAggregator( new WellKnownTags("", "", "", "", "", ""), Collections.emptySet(), - new ConflatingMetricsAggregatorBenchmark.FixedAgentFeaturesDiscovery( + new ClientStatsAggregatorBenchmark.FixedAgentFeaturesDiscovery( Collections.singleton("peer.hostname"), Collections.emptySet()), this.health, - new ConflatingMetricsAggregatorBenchmark.NullSink(), + new ClientStatsAggregatorBenchmark.NullSink(), 2048, 2048, false); diff --git a/dd-trace-core/src/jmh/java/datadog/trace/common/metrics/HighCardinalityResourceMetricsBenchmark.java b/dd-trace-core/src/jmh/java/datadog/trace/common/metrics/HighCardinalityResourceMetricsBenchmark.java index 5ae8c3a715f..90c1f088935 100644 --- a/dd-trace-core/src/jmh/java/datadog/trace/common/metrics/HighCardinalityResourceMetricsBenchmark.java +++ b/dd-trace-core/src/jmh/java/datadog/trace/common/metrics/HighCardinalityResourceMetricsBenchmark.java @@ -46,7 +46,7 @@ @Fork(value = 1) public class HighCardinalityResourceMetricsBenchmark { - private ConflatingMetricsAggregator aggregator; + private ClientStatsAggregator aggregator; private CountingHealthMetrics health; @State(Scope.Thread) @@ -58,13 +58,13 @@ public static class ThreadState { public void setup() { this.health = new CountingHealthMetrics(); this.aggregator = - new ConflatingMetricsAggregator( + new ClientStatsAggregator( new WellKnownTags("", "", "", "", "", ""), Collections.emptySet(), - new ConflatingMetricsAggregatorBenchmark.FixedAgentFeaturesDiscovery( + new ClientStatsAggregatorBenchmark.FixedAgentFeaturesDiscovery( Collections.singleton("peer.hostname"), Collections.emptySet()), this.health, - new ConflatingMetricsAggregatorBenchmark.NullSink(), + new ClientStatsAggregatorBenchmark.NullSink(), 2048, 2048, false); diff --git a/dd-trace-core/src/main/java/datadog/trace/common/metrics/AggregateEntry.java b/dd-trace-core/src/main/java/datadog/trace/common/metrics/AggregateEntry.java index 5bc985491de..29ce3d0bea4 100644 --- a/dd-trace-core/src/main/java/datadog/trace/common/metrics/AggregateEntry.java +++ b/dd-trace-core/src/main/java/datadog/trace/common/metrics/AggregateEntry.java @@ -1,131 +1,97 @@ package datadog.trace.common.metrics; -import static datadog.trace.bootstrap.instrumentation.api.UTF8BytesString.EMPTY; - import datadog.metrics.api.Histogram; -import datadog.trace.api.Pair; -import datadog.trace.api.cache.DDCache; -import datadog.trace.api.cache.DDCaches; import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString; import datadog.trace.util.Hashtable; import datadog.trace.util.LongHashingUtils; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; -import java.util.function.Function; import javax.annotation.Nullable; /** - * Hashtable entry for the consumer-side aggregator. Holds the UTF8-encoded label fields that {@link - * SerializingMetricWriter} writes to the wire plus the mutable counter/histogram state for the key. - * - *

{@link #matches(SpanSnapshot)} compares the entry's stored UTF8 forms against the snapshot's - * raw {@code CharSequence}/{@code String}/{@code String[]} fields via content-equality, so {@code - * String} vs {@code UTF8BytesString} mixing on the same logical key collapses into one entry - * instead of splitting. - * - *

The static UTF8 caches that used to live on {@code MetricKey} and {@code - * ConflatingMetricsAggregator} are consolidated here. - * - *

Deliberate cohesion. This class concentrates five responsibilities -- the static UTF8 - * caches, the canonicalized label fields, the raw {@code peerTagNames}/{@code peerTagValues} arrays - * used by {@link #matches}, the pre-encoded {@code peerTags} list used by the serializer, and the - * mutable counter/histogram aggregate state -- on a single object. The prior design split the label - * fields and aggregate state across separate {@code MetricKey} and {@code AggregateMetric} - * instances, allocating both per unique key on miss; folding them yields one allocation per unique - * key. The class is wider than its predecessors as a result, but that's the trade we explicitly - * chose. + * {@link datadog.trace.util.Hashtable} entry used by the aggregator thread. * - *

Required vs optional field absence. Required label fields ({@code resource}, {@code - * service}, {@code operationName}, {@code type}, {@code spanKind}) canonicalize a {@code null} - * snapshot value into {@link UTF8BytesString#EMPTY} via {@link #canonicalize} -- they are never - * {@code null} on a constructed entry. Optional label fields ({@code serviceSource}, {@code - * httpMethod}, {@code httpEndpoint}, {@code grpcStatusCode}) stay {@code null} on the entry when - * the snapshot value was {@code null}; the serializer uses {@code != null} to decide whether to - * emit them on the wire. {@link #contentEquals} treats {@code null} and length-0 as equivalent so - * {@link #matches} works against either form. + *

Stores the canonical UTF8 label values that identify one aggregate row, plus the mutable + * counter and histogram state for that row. Labels are canonicalized before hashing, so overflow + * values replaced with the sentinel use the same hash and map to the same row. * - *

Not thread-safe. Counter and histogram updates are performed by the single aggregator - * thread; producer threads tag durations via {@link #ERROR_TAG} / {@link #TOP_LEVEL_TAG} bits and - * hand them off through the snapshot inbox. - * - *

Single-writer invariant relies on convention. The aggregator thread is the only mutator - * of this class and of {@link AggregateTable}. Nothing enforces this at runtime -- a stray mutation - * from a different thread (e.g. an HTTP-client callback) would corrupt counters or hashtable chains - * silently. The {@code ClearSignal} routing in {@link Aggregator} is the explicit mechanism for - * funneling cross-thread requests (e.g. {@code disable()}) back onto the aggregator thread; any new - * entry point that mutates aggregate state must do the same. + *

Not thread-safe — all mutation is on the aggregator thread. Tests must call {@link + * #resetCardinalityHandlers()} in setup to avoid cross-test handler pollution (handlers are + * static); tests using {@link PeerTagSchema} must also call {@code PeerTagSchema#resetHandlers} on + * the schema instance. */ final class AggregateEntry extends Hashtable.Entry { static final long ERROR_TAG = 0x8000000000000000L; static final long TOP_LEVEL_TAG = 0x4000000000000000L; - // UTF8 caches consolidated from the previous MetricKey + ConflatingMetricsAggregator split. - private static final DDCache RESOURCE_CACHE = - DDCaches.newFixedSizeCache(32); - private static final DDCache SERVICE_CACHE = - DDCaches.newFixedSizeCache(32); - private static final DDCache OPERATION_CACHE = - DDCaches.newFixedSizeCache(64); - private static final DDCache SERVICE_SOURCE_CACHE = - DDCaches.newFixedSizeCache(16); - private static final DDCache TYPE_CACHE = DDCaches.newFixedSizeCache(8); - private static final DDCache SPAN_KIND_CACHE = - DDCaches.newFixedSizeCache(16); - private static final DDCache HTTP_METHOD_CACHE = - DDCaches.newFixedSizeCache(8); - private static final DDCache HTTP_ENDPOINT_CACHE = - DDCaches.newFixedSizeCache(32); - private static final DDCache GRPC_STATUS_CODE_CACHE = - DDCaches.newFixedSizeCache(32); - - /** - * Outer cache keyed by peer-tag name, with an inner per-name cache keyed by value. The inner - * cache produces the "name:value" encoded form the serializer writes. - */ - private static final DDCache< - String, Pair, Function>> - PEER_TAGS_CACHE = DDCaches.newFixedSizeCache(64); - - private static final Function< - String, Pair, Function>> - PEER_TAGS_CACHE_ADDER = - key -> - Pair.of( - DDCaches.newFixedSizeCache(512), - value -> UTF8BytesString.create(key + ":" + value)); - - private final UTF8BytesString resource; - private final UTF8BytesString service; - private final UTF8BytesString operationName; - @Nullable private final UTF8BytesString serviceSource; - private final UTF8BytesString type; - private final UTF8BytesString spanKind; - @Nullable private final UTF8BytesString httpMethod; - @Nullable private final UTF8BytesString httpEndpoint; - @Nullable private final UTF8BytesString grpcStatusCode; - private final short httpStatusCode; - - /** Whether the root span carried the {@code synthetics} origin tag (synthetic-monitoring run). */ - private final boolean synthetic; - - /** Whether this span is the trace root ({@code parentId == 0}). */ - private final boolean traceRoot; - - // Peer tags carried in two forms: parallel String[] arrays mirroring the snapshot's (schema + - // values) shape for matches(), and pre-encoded List ("name:value") for the - // serializer. peerTagNames is the schema's names array (shared by-reference when the schema - // hasn't been replaced); peerTagValues is the per-span String[] parallel to it. - // - // Package-private so the in-package test helper (AggregateEntryTestUtils) can compare entries - // by raw layout; production access comes from this class's own matches() + constructor. - @Nullable final String[] peerTagNames; - @Nullable final String[] peerTagValues; - private final List peerTags; - - // Mutable aggregate state -- single-thread (consumer/aggregator) writer. + private static final UTF8BytesString[] EMPTY_TAGS = new UTF8BytesString[0]; + + // Sentinel substitution is disabled until per-component config is wired in a follow-up PR. + // Tests that need sentinel mode should pass useBlockedSentinel=true explicitly. + static final boolean LIMITS_ENABLED = false; + + // Per-field cardinality handlers. Limits live on MetricCardinalityLimits -- see that class for + // per-field rationale. + static final PropertyCardinalityHandler RESOURCE_HANDLER = + new PropertyCardinalityHandler("resource", MetricCardinalityLimits.RESOURCE, LIMITS_ENABLED); + static final PropertyCardinalityHandler SERVICE_HANDLER = + new PropertyCardinalityHandler("service", MetricCardinalityLimits.SERVICE, LIMITS_ENABLED); + static final PropertyCardinalityHandler OPERATION_HANDLER = + new PropertyCardinalityHandler( + "operation", MetricCardinalityLimits.OPERATION, LIMITS_ENABLED); + static final PropertyCardinalityHandler SERVICE_SOURCE_HANDLER = + new PropertyCardinalityHandler( + "service_source", MetricCardinalityLimits.SERVICE_SOURCE, LIMITS_ENABLED); + static final PropertyCardinalityHandler TYPE_HANDLER = + new PropertyCardinalityHandler("type", MetricCardinalityLimits.TYPE, LIMITS_ENABLED); + static final PropertyCardinalityHandler SPAN_KIND_HANDLER = + new PropertyCardinalityHandler( + "span_kind", MetricCardinalityLimits.SPAN_KIND, LIMITS_ENABLED); + static final PropertyCardinalityHandler HTTP_METHOD_HANDLER = + new PropertyCardinalityHandler( + "http_method", MetricCardinalityLimits.HTTP_METHOD, LIMITS_ENABLED); + static final PropertyCardinalityHandler HTTP_ENDPOINT_HANDLER = + new PropertyCardinalityHandler( + "http_endpoint", MetricCardinalityLimits.HTTP_ENDPOINT, LIMITS_ENABLED); + static final PropertyCardinalityHandler GRPC_STATUS_CODE_HANDLER = + new PropertyCardinalityHandler( + "grpc_status_code", MetricCardinalityLimits.GRPC_STATUS_CODE, LIMITS_ENABLED); + + // Single authoritative list used by resetCardinalityHandlers(). populateFrom() and hashOf() keep + // named access for readability and to avoid per-span iteration overhead; this array ensures the + // reset site stays in sync even if a new field is added without updating the loop by name. + static final PropertyCardinalityHandler[] FIELD_HANDLERS = { + RESOURCE_HANDLER, + SERVICE_HANDLER, + OPERATION_HANDLER, + SERVICE_SOURCE_HANDLER, + TYPE_HANDLER, + SPAN_KIND_HANDLER, + HTTP_METHOD_HANDLER, + HTTP_ENDPOINT_HANDLER, + GRPC_STATUS_CODE_HANDLER, + }; + + final UTF8BytesString resource; + final UTF8BytesString service; + final UTF8BytesString operationName; + // Optional fields use UTF8BytesString.EMPTY as the "absent" sentinel rather than null. The + // cardinality handlers map null inputs to EMPTY, and createUtf8 does the same for the of(...) + // factory, so callers don't need to special-case absence. + final UTF8BytesString serviceSource; + final UTF8BytesString type; + final UTF8BytesString spanKind; + final UTF8BytesString httpMethod; + final UTF8BytesString httpEndpoint; + final UTF8BytesString grpcStatusCode; + final short httpStatusCode; + final boolean synthetic; + final boolean traceRoot; + final List peerTags; + + // Mutable aggregate state -- single-thread (aggregator) writer. private final Histogram okLatencies = Histogram.newHistogram(); /** @@ -141,31 +107,46 @@ final class AggregateEntry extends Hashtable.Entry { private int topLevelCount; private long duration; - /** Hot-path constructor for the producer/consumer flow. Builds UTF8 fields via the caches. */ - AggregateEntry(SpanSnapshot s, long keyHash) { + /** + * Field-bearing constructor. Package-private so {@link AggregateEntryTestUtils} can build + * expected entries. + */ + AggregateEntry( + long keyHash, + UTF8BytesString resource, + UTF8BytesString service, + UTF8BytesString operationName, + UTF8BytesString serviceSource, + UTF8BytesString type, + UTF8BytesString spanKind, + UTF8BytesString httpMethod, + UTF8BytesString httpEndpoint, + UTF8BytesString grpcStatusCode, + short httpStatusCode, + boolean synthetic, + boolean traceRoot, + List peerTags) { super(keyHash); - this.resource = canonicalize(RESOURCE_CACHE, s.resourceName); - this.service = canonicalize(SERVICE_CACHE, s.serviceName); - this.operationName = canonicalize(OPERATION_CACHE, s.operationName); - this.serviceSource = canonicalizeOptional(SERVICE_SOURCE_CACHE, s.serviceNameSource); - this.type = canonicalize(TYPE_CACHE, s.spanType); - this.spanKind = canonicalize(SPAN_KIND_CACHE, s.spanKind); - this.httpMethod = canonicalizeOptional(HTTP_METHOD_CACHE, s.httpMethod); - this.httpEndpoint = canonicalizeOptional(HTTP_ENDPOINT_CACHE, s.httpEndpoint); - this.grpcStatusCode = canonicalizeOptional(GRPC_STATUS_CODE_CACHE, s.grpcStatusCode); - this.httpStatusCode = s.httpStatusCode; - this.synthetic = s.synthetic; - this.traceRoot = s.traceRoot; - this.peerTagNames = s.peerTagSchema == null ? null : s.peerTagSchema.names; - this.peerTagValues = s.peerTagValues; - this.peerTags = materializePeerTags(this.peerTagNames, this.peerTagValues); + this.resource = resource; + this.service = service; + this.operationName = operationName; + this.serviceSource = serviceSource; + this.type = type; + this.spanKind = spanKind; + this.httpMethod = httpMethod; + this.httpEndpoint = httpEndpoint; + this.grpcStatusCode = grpcStatusCode; + this.httpStatusCode = httpStatusCode; + this.synthetic = synthetic; + this.traceRoot = traceRoot; + this.peerTags = peerTags; } /** * Records a single hit. {@code tagAndDuration} carries the duration nanos with optional {@link * #ERROR_TAG} / {@link #TOP_LEVEL_TAG} bits OR-ed in. */ - void recordOneDuration(long tagAndDuration) { + AggregateEntry recordOneDuration(long tagAndDuration) { ++hitCount; if ((tagAndDuration & TOP_LEVEL_TAG) == TOP_LEVEL_TAG) { tagAndDuration ^= TOP_LEVEL_TAG; @@ -179,6 +160,7 @@ void recordOneDuration(long tagAndDuration) { okLatencies.accept(tagAndDuration); } duration += tagAndDuration; + return this; } int getErrorCount() { @@ -223,10 +205,10 @@ private Histogram errorLatenciesForWrite() { /** * Resets the per-cycle counters and histograms. Label fields ({@code resource}, {@code service}, - * ..., {@code peerTagNames}, {@code peerTagValues}) are deliberately left intact -- they're the - * entry's bucket identity and must persist so a subsequent snapshot with the same key reuses this - * entry instead of allocating a fresh one. Entries that stay at {@code hitCount == 0} across a - * cycle are reaped by {@link AggregateTable#expungeStaleAggregates}. + * ..., {@code peerTags}) are deliberately left intact -- they're the entry's bucket identity and + * must persist so a subsequent snapshot with the same key reuses this entry instead of allocating + * a fresh one. Entries that stay at {@code hitCount == 0} across a cycle are reaped by {@link + * AggregateTable#expungeStaleAggregates}. */ void clear() { this.errorCount = 0; @@ -240,70 +222,55 @@ void clear() { } } - boolean matches(SpanSnapshot s) { - String[] snapshotNames = s.peerTagSchema == null ? null : s.peerTagSchema.names; - return httpStatusCode == s.httpStatusCode - && synthetic == s.synthetic - && traceRoot == s.traceRoot - && contentEquals(resource, s.resourceName) - && contentEquals(service, s.serviceName) - && contentEquals(operationName, s.operationName) - && contentEquals(serviceSource, s.serviceNameSource) - && contentEquals(type, s.spanType) - && contentEquals(spanKind, s.spanKind) - && Arrays.equals(peerTagNames, snapshotNames) - && Arrays.equals(peerTagValues, s.peerTagValues) - && contentEquals(httpMethod, s.httpMethod) - && contentEquals(httpEndpoint, s.httpEndpoint) - && contentEquals(grpcStatusCode, s.grpcStatusCode); - } - - /** - * Pre-checks {@link #keyHash} against {@code keyHash} before delegating to {@link - * #matches(SpanSnapshot)}. The hash check is cheap and rules out most mismatches without touching - * the field-by-field comparison. - */ - boolean matches(long keyHash, SpanSnapshot s) { - return this.keyHash == keyHash && matches(s); + /** Resets the static per-field cardinality handlers. Does not cover {@link PeerTagSchema}. */ + static void resetCardinalityHandlers() { + for (PropertyCardinalityHandler handler : FIELD_HANDLERS) { + handler.reset(); + } } /** - * Computes the 64-bit lookup hash for a {@link SpanSnapshot}. Chained per-field calls -- no - * varargs / Object[] allocation, no autoboxing on primitive overloads. The constructor's - * super({@code hashOf(s)}) call uses the same function so an entry built from a snapshot hashes - * to the same bucket the snapshot itself looks up. + * 64-bit lookup hash, computed over UTF8-encoded fields so that cardinality-blocked values (which + * all canonicalize to the same sentinel {@link UTF8BytesString}) collide in the same bucket. + * {@link UTF8BytesString#hashCode()} returns the underlying String hash, so entries built via + * {@link #of} produce the same hash as entries built from a snapshot with matching content. * - *

Hashes are content-stable across {@code String} / {@code UTF8BytesString}: {@link - * UTF8BytesString#hashCode()} returns the underlying {@code String}'s hash. + *

Field order intentionally mirrors {@link Canonical#matches} -- UTF8 fields first (highest + * cardinality first for matches' short-circuit benefit), then the peer-tag list, then the + * primitives. The hash itself is order-stable across all callers; the lockstep ordering is purely + * for readability when reasoning about lookup and equality in tandem. */ - static long hashOf(SpanSnapshot s) { + static long hashOf( + UTF8BytesString resource, + UTF8BytesString service, + UTF8BytesString operationName, + UTF8BytesString serviceSource, + UTF8BytesString type, + UTF8BytesString spanKind, + UTF8BytesString httpMethod, + UTF8BytesString httpEndpoint, + UTF8BytesString grpcStatusCode, + short httpStatusCode, + boolean synthetic, + boolean traceRoot, + UTF8BytesString[] peerTags, + int peerTagCount) { long h = 0; - h = LongHashingUtils.addToHash(h, s.resourceName); - h = LongHashingUtils.addToHash(h, s.serviceName); - h = LongHashingUtils.addToHash(h, s.operationName); - h = LongHashingUtils.addToHash(h, s.serviceNameSource); - h = LongHashingUtils.addToHash(h, s.spanType); - h = LongHashingUtils.addToHash(h, s.httpStatusCode); - h = LongHashingUtils.addToHash(h, s.synthetic); - h = LongHashingUtils.addToHash(h, s.traceRoot); - h = LongHashingUtils.addToHash(h, s.spanKind); - // Always mix in both the schema's content hash and the values' content hash, unconditionally - // (no null-skip). Arrays.hashCode is content-based for both String[]s; the default - // Object[].hashCode is identity-based, which would let two snapshots with content-equal but - // distinct PeerTagSchema instances hash to different buckets. Null inputs hash to 0 here, - // distinct from {@code Arrays.hashCode(empty)} = 1 or any non-empty array. - // - // peerTagValues is gated by peerTagSchema: the slot's peerTagValues is a reusable scratch - // buffer that may carry stale contents from a prior tag-firing publish when this publish had - // no peer tags. Hash it only when the schema says it's meaningful, matching the matches() - // contract. - h = LongHashingUtils.addToHash(h, s.peerTagSchema == null ? 0 : s.peerTagSchema.namesHash); - h = - LongHashingUtils.addToHash( - h, s.peerTagSchema == null ? 0 : Arrays.hashCode(s.peerTagValues)); - h = LongHashingUtils.addToHash(h, s.httpMethod); - h = LongHashingUtils.addToHash(h, s.httpEndpoint); - h = LongHashingUtils.addToHash(h, s.grpcStatusCode); + h = LongHashingUtils.addToHash(h, resource); + h = LongHashingUtils.addToHash(h, service); + h = LongHashingUtils.addToHash(h, operationName); + h = LongHashingUtils.addToHash(h, serviceSource); + h = LongHashingUtils.addToHash(h, type); + h = LongHashingUtils.addToHash(h, spanKind); + h = LongHashingUtils.addToHash(h, httpMethod); + h = LongHashingUtils.addToHash(h, httpEndpoint); + h = LongHashingUtils.addToHash(h, grpcStatusCode); + for (int i = 0; i < peerTagCount; i++) { + h = LongHashingUtils.addToHash(h, peerTags[i]); + } + h = LongHashingUtils.addToHash(h, httpStatusCode); + h = LongHashingUtils.addToHash(h, synthetic); + h = LongHashingUtils.addToHash(h, traceRoot); return h; } @@ -320,11 +287,20 @@ UTF8BytesString getOperationName() { return operationName; } - @Nullable UTF8BytesString getServiceSource() { return serviceSource; } + /** + * Whether the snapshot carried a service-source value. Encapsulates the EMPTY-as-absent + * convention: optional fields use {@link UTF8BytesString#EMPTY} as the sentinel for "no value + * captured" (see field comment) -- callers that need a presence check should go through this + * predicate rather than comparing against {@code EMPTY} directly. + */ + boolean hasServiceSource() { + return serviceSource.length() > 0; + } + UTF8BytesString getType() { return type; } @@ -333,21 +309,40 @@ UTF8BytesString getSpanKind() { return spanKind; } - @Nullable UTF8BytesString getHttpMethod() { return httpMethod; } - @Nullable + /** + * Whether the snapshot carried an HTTP method. See {@link #hasServiceSource} for the contract. + */ + boolean hasHttpMethod() { + return httpMethod.length() > 0; + } + UTF8BytesString getHttpEndpoint() { return httpEndpoint; } - @Nullable + /** + * Whether the snapshot carried an HTTP endpoint. See {@link #hasServiceSource} for the contract. + */ + boolean hasHttpEndpoint() { + return httpEndpoint.length() > 0; + } + UTF8BytesString getGrpcStatusCode() { return grpcStatusCode; } + /** + * Whether the snapshot carried a gRPC status code. See {@link #hasServiceSource} for the + * contract. + */ + boolean hasGrpcStatusCode() { + return grpcStatusCode.length() > 0; + } + int getHttpStatusCode() { return httpStatusCode; } @@ -365,101 +360,184 @@ List getPeerTags() { } // Production AggregateEntry intentionally has no equals/hashCode override -- AggregateTable - // bucketing uses keyHash + matches(SpanSnapshot) directly and never invokes Object.equals. - // For tests that need value-equality (Spock argument matchers), use AggregateEntryTestUtils in - // src/test, which provides equals/hashCode helpers without exposing the contract in production. - - // ----- helpers ----- - - private static UTF8BytesString canonicalize( - DDCache cache, CharSequence charSeq) { - if (charSeq == null) { - return EMPTY; - } - if (charSeq instanceof UTF8BytesString) { - return (UTF8BytesString) charSeq; - } - return cache.computeIfAbsent(charSeq.toString(), UTF8BytesString::create); - } + // bucketing uses keyHash + Canonical.matches and never invokes Object.equals. For tests that + // need value-equality (Spock argument matchers), use AggregateEntryTestUtils in src/test. /** - * Like {@link #canonicalize} but returns {@code null} for a {@code null} input (rather than - * {@link UTF8BytesString#EMPTY}). Used for the four optional fields so the serializer can - * distinguish "absent" via a {@code != null} check and elide the field on the wire. + * Reusable scratch buffer for canonicalizing a {@link SpanSnapshot} into UTF8 fields, computing + * its lookup hash, comparing against existing entries, and building a fresh entry on miss. * - *

The {@code instanceof UTF8BytesString} short-circuit is dead code for {@link - * SpanSnapshot#httpMethod}/{@code httpEndpoint}/{@code grpcStatusCode} (statically {@code - * String}) but live for {@link SpanSnapshot#serviceNameSource} ({@link CharSequence}); keeping a - * single helper keeps the constructor consistent. + *

One instance is held by an {@link AggregateTable} and reused on every {@code findOrInsert} + * call. Single-threaded use only. Fields are deliberately mutable -- this is a hot-path scratch + * area, not a value class. */ - @Nullable - private static UTF8BytesString canonicalizeOptional( - DDCache cache, @Nullable CharSequence charSeq) { - if (charSeq == null) { - return null; - } - if (charSeq instanceof UTF8BytesString) { - return (UTF8BytesString) charSeq; + static final class Canonical { + UTF8BytesString resource; + UTF8BytesString service; + UTF8BytesString operationName; + UTF8BytesString serviceSource; + UTF8BytesString type; + UTF8BytesString spanKind; + UTF8BytesString httpMethod; + UTF8BytesString httpEndpoint; + UTF8BytesString grpcStatusCode; + short httpStatusCode; + boolean synthetic; + boolean traceRoot; + + /** + * Reusable buffer of canonicalized peer-tag UTF8 forms. Cleared and refilled in {@link + * #populate}; on miss, {@link #createEntry} copies it into an immutable list for the entry to + * own. Zero allocation on the hit path. Sized lazily to the schema's tag count; resized if the + * schema grows. + */ + UTF8BytesString[] peerTagsBuffer = EMPTY_TAGS; + + int peerTagsSize = 0; + + long keyHash; + + /** Canonicalize all fields from {@code s} through the handlers into this buffer. */ + void populateFrom(SpanSnapshot s) { + this.resource = RESOURCE_HANDLER.register(s.resourceName); + this.service = SERVICE_HANDLER.register(s.serviceName); + this.operationName = OPERATION_HANDLER.register(s.operationName); + this.serviceSource = SERVICE_SOURCE_HANDLER.register(s.serviceNameSource); + this.type = TYPE_HANDLER.register(s.spanType); + this.spanKind = SPAN_KIND_HANDLER.register(s.spanKind); + this.httpMethod = HTTP_METHOD_HANDLER.register(s.httpMethod); + this.httpEndpoint = HTTP_ENDPOINT_HANDLER.register(s.httpEndpoint); + this.grpcStatusCode = GRPC_STATUS_CODE_HANDLER.register(s.grpcStatusCode); + this.httpStatusCode = s.httpStatusCode; + this.synthetic = s.synthetic; + this.traceRoot = s.traceRoot; + populatePeerTags(s.peerTagSchema, s.peerTagValues); + this.keyHash = + hashOf( + resource, + service, + operationName, + serviceSource, + type, + spanKind, + httpMethod, + httpEndpoint, + grpcStatusCode, + httpStatusCode, + synthetic, + traceRoot, + peerTagsBuffer, + peerTagsSize); } - return cache.computeIfAbsent(charSeq.toString(), UTF8BytesString::create); - } - /** - * UTF8 vs raw CharSequence content-equality, no allocation in the common (String) case. - * - *

Treats {@code null} and empty (length 0) as equivalent on either side. This matches the - * canonicalization semantics: {@link #canonicalize} maps a {@code null} input to {@link - * UTF8BytesString#EMPTY}, so an entry built from a snapshot with a null field needs to match a - * subsequent snapshot whose field is still null. {@code intHash(null) == 0 == "".hashCode()}, so - * the hash already agrees with this view. - */ - private static boolean contentEquals(UTF8BytesString a, CharSequence b) { - if (a == null || a.length() == 0) { - return b == null || b.length() == 0; + /** + * Replaces the current peer-tag buffer contents with the canonical UTF8 forms for this + * snapshot. + * + *

Each non-null value is canonicalized with the handler at the same schema index. Null + * values are skipped because they would canonicalize to {@link UTF8BytesString#EMPTY} and be + * filtered out anyway. Producer-side {@code capturePeerTagValues} produces sparse-null arrays, + * so the skip pays off whenever a span carries only a subset of the configured peer tags. + */ + private void populatePeerTags(PeerTagSchema schema, String[] values) { + peerTagsSize = 0; + if (schema == null || values == null) { + return; + } + int n = Math.min(schema.size(), values.length); + if (peerTagsBuffer.length < n) { + peerTagsBuffer = new UTF8BytesString[n]; + } + for (int i = 0; i < n; i++) { + String value = values[i]; + if (value == null) { + continue; + } + peerTagsBuffer[peerTagsSize++] = schema.register(i, value); + } } - // UTF8BytesString.toString() returns the underlying String -- O(1), no allocation. - return b != null && a.toString().contentEquals(b); - } - /** - * Encodes the per-span peer-tag values into the {@code List} the serializer - * consumes. Reads name/value pairs at the same index from the schema's names and the snapshot's - * values; null value slots are skipped (the span didn't set that peer tag). Counts hits once for - * exact-size allocation and preserves the singletonList fast path for the common one-entry case - * (e.g. internal-kind base.service). - */ - private static List materializePeerTags( - @Nullable String[] names, @Nullable String[] values) { - if (names == null || values == null) { - return Collections.emptyList(); + /** + * Whether this canonicalized snapshot matches the given entry. Compares UTF8 fields via + * content-equality (so an entry surviving a handler reset still matches a freshly-canonicalized + * snapshot of the same content). + * + *

Field order is cardinality-tuned: resource / service / operationName first because they + * vary most across collisions, then the remaining UTF8 fields, then the peer-tag list + * comparison (slowest), then the primitives. All UTF8 fields are non-null by the EMPTY- + * sentinel invariant (see field comments above), so direct {@code a.equals(b)} is safe. + */ + boolean matches(AggregateEntry e) { + return resource.equals(e.resource) + && service.equals(e.service) + && operationName.equals(e.operationName) + && serviceSource.equals(e.serviceSource) + && type.equals(e.type) + && spanKind.equals(e.spanKind) + && httpMethod.equals(e.httpMethod) + && httpEndpoint.equals(e.httpEndpoint) + && grpcStatusCode.equals(e.grpcStatusCode) + && peerTagsEqual(peerTagsBuffer, peerTagsSize, e.peerTags) + && httpStatusCode == e.httpStatusCode + && synthetic == e.synthetic + && traceRoot == e.traceRoot; } - int n = names.length; - int firstHit = -1; - int hitCount = 0; - for (int i = 0; i < n; i++) { - if (values[i] != null) { - if (hitCount == 0) firstHit = i; - hitCount++; + + private static boolean peerTagsEqual(UTF8BytesString[] a, int aSize, List b) { + if (aSize != b.size()) { + return false; } + for (int i = 0; i < aSize; i++) { + if (!a[i].equals(b.get(i))) { + return false; + } + } + return true; } - if (hitCount == 0) { - return Collections.emptyList(); - } - if (hitCount == 1) { - return Collections.singletonList(encodePeerTag(names[firstHit], values[firstHit])); - } - List tags = new ArrayList<>(hitCount); - for (int i = firstHit; i < n; i++) { - if (values[i] != null) { - tags.add(encodePeerTag(names[i], values[i])); + + /** + * Build a new entry from the currently-populated canonical fields. The peer-tag buffer is + * copied into an immutable list so the entry's reference stays stable across subsequent {@link + * #populate} calls. + */ + AggregateEntry createEntry() { + List snapshottedPeerTags; + int n = peerTagsSize; + if (n == 0) { + snapshottedPeerTags = Collections.emptyList(); + } else if (n == 1) { + snapshottedPeerTags = Collections.singletonList(peerTagsBuffer[0]); + } else { + snapshottedPeerTags = Arrays.asList(Arrays.copyOf(peerTagsBuffer, n)); } + return new AggregateEntry( + keyHash, + resource, + service, + operationName, + serviceSource, + type, + spanKind, + httpMethod, + httpEndpoint, + grpcStatusCode, + httpStatusCode, + synthetic, + traceRoot, + snapshottedPeerTags); } - return tags; } - private static UTF8BytesString encodePeerTag(String name, String value) { - final Pair, Function> - cacheAndCreator = PEER_TAGS_CACHE.computeIfAbsent(name, PEER_TAGS_CACHE_ADDER); - return cacheAndCreator.getLeft().computeIfAbsent(value, cacheAndCreator.getRight()); + // ----- helpers ----- + + /** Direct {@link UTF8BytesString} creation that bypasses the cardinality handlers. */ + static UTF8BytesString createUtf8(CharSequence cs) { + if (cs == null) { + return UTF8BytesString.EMPTY; + } + if (cs instanceof UTF8BytesString) { + return (UTF8BytesString) cs; + } + return UTF8BytesString.create(cs.toString()); } } diff --git a/dd-trace-core/src/main/java/datadog/trace/common/metrics/AggregateTable.java b/dd-trace-core/src/main/java/datadog/trace/common/metrics/AggregateTable.java index abadc7e5f17..fcd6c5fcdb4 100644 --- a/dd-trace-core/src/main/java/datadog/trace/common/metrics/AggregateTable.java +++ b/dd-trace-core/src/main/java/datadog/trace/common/metrics/AggregateTable.java @@ -2,24 +2,23 @@ import datadog.trace.util.Hashtable; import datadog.trace.util.Hashtable.MutatingTableIterator; -import datadog.trace.util.Hashtable.Support; import java.util.function.BiConsumer; import java.util.function.Consumer; /** - * Consumer-side {@link AggregateEntry} store, keyed on the raw fields of a {@link SpanSnapshot}. + * The {@link AggregateEntry} store of the consuming aggregator thread, keyed on the canonical + * UTF8-encoded labels of a {@link SpanSnapshot}. * - *

Replaces the prior {@code LRUCache}. The win is on the - * steady-state hit path: a snapshot lookup is a 64-bit hash compute + bucket walk + field-wise - * {@code matches}, with no per-snapshot {@link AggregateEntry} allocation and no UTF8 cache - * lookups. The UTF8-encoded forms (formerly held on {@code MetricKey}) and the mutable counters - * (formerly held on {@code AggregateMetric}) both live on the {@link AggregateEntry} now, built - * once per unique key at insert time. + *

{@link #findOrInsert} canonicalizes the snapshot's fields through the cardinality handlers (so + * cardinality-blocked values share a sentinel and collapse into one entry) and then computes the + * lookup hash from that canonical form. Canonicalization runs into a reusable {@link + * AggregateEntry.Canonical} scratch buffer; on a hit nothing is allocated, on a miss the buffer's + * references are copied into a fresh entry and the buffer is overwritten on the next call. * *

Not thread-safe. The aggregator thread is the sole writer of both this table and its * contained {@link AggregateEntry} state. Any cross-thread request that needs to mutate -- e.g. - * {@link ConflatingMetricsAggregator#disable()} -- must funnel onto the aggregator thread via the - * inbox (see the {@code ClearSignal} routing in {@link Aggregator}). The invariant is convention- + * {@link ClientStatsAggregator#disable()} -- must funnel onto the aggregator thread via the inbox + * (see the {@code ClearSignal} routing in {@link Aggregator}). The invariant is convention- * enforced; nothing here checks the calling thread at runtime, so a wrong-thread call would corrupt * bucket chains silently. */ @@ -27,6 +26,7 @@ final class AggregateTable { private final Hashtable.Entry[] buckets; private final int maxAggregates; + private final AggregateEntry.Canonical canonical = new AggregateEntry.Canonical(); private int size; /** @@ -37,7 +37,7 @@ final class AggregateTable { private int evictCursor; AggregateTable(int maxAggregates) { - this.buckets = Support.create(maxAggregates, Support.MAX_RATIO); + this.buckets = Hashtable.Support.create(maxAggregates, Hashtable.Support.MAX_RATIO); this.maxAggregates = maxAggregates; } @@ -55,33 +55,39 @@ boolean isEmpty() { * caller should drop the data point in that case. */ AggregateEntry findOrInsert(SpanSnapshot snapshot) { - long keyHash = AggregateEntry.hashOf(snapshot); - for (AggregateEntry candidate = Support.bucket(buckets, keyHash); + canonical.populateFrom(snapshot); + long keyHash = canonical.keyHash; + for (AggregateEntry candidate = Hashtable.Support.bucket(buckets, keyHash); candidate != null; candidate = candidate.next()) { - if (candidate.matches(keyHash, snapshot)) { + if (candidate.keyHash == keyHash && canonical.matches(candidate)) { return candidate; } } if (size >= maxAggregates && !evictOneStale()) { return null; } - AggregateEntry entry = new AggregateEntry(snapshot, keyHash); - Support.insertHeadEntry(buckets, keyHash, entry); + AggregateEntry entry = canonical.createEntry(); + Hashtable.Support.insertHeadEntry(buckets, keyHash, entry); size++; return entry; } /** * Unlinks the first entry whose {@code getHitCount() == 0}, resuming the scan from {@link - * #evictCursor} so back-to-back evictions amortize to O(1) per call. Worst case for a single call + * #evictCursor} so consecutive evictions amortize to O(1) per call. Worst case for a single call * is still O(N) when nearly every entry is hot, but a sustained eviction stream never re-scans * the hot prefix more than twice across N evictions. * - *

The semantic intent: at cap with all entries live, drop the new key (reported via {@code - * onStatsAggregateDropped}) rather than evicting an established one. Cap is sized to the - * steady-state working set, so eviction is rare; this cursor optimization handles the - * pathological "persistently at cap" case. + *

If the table is full and every entry was used in this cycle, drop the new key (reported via + * {@code onStatsAggregateDropped}) rather than evicting an established one. Cap is sized to the + * steady-state working set, so eviction is rare in the common case. + * + *

How often this fires depends on {@link AggregateEntry#LIMITS_ENABLED}. With limits enabled, + * over-cap values for a given field collapse into a shared {@code blocked_by_tracer} bucket, so + * the table itself rarely reaches {@code maxAggregates}. With limits disabled (the default), + * over-cap values flow to distinct buckets and {@code maxAggregates} becomes the load-bearing + * backstop -- the cursor-resumed scan was added specifically for this regime. */ private boolean evictOneStale() { // Two passes -- [cursor, length) then [0, cursor) -- using the half-open-range iterator. The @@ -93,7 +99,7 @@ private boolean evictOneStale() { /** Scans {@code [startBucket, endBucket)} for the first stale entry and unlinks it. */ private boolean evictOneStaleInRange(int startBucket, int endBucket) { MutatingTableIterator iter = - Support.mutatingTableIterator(buckets, startBucket, endBucket); + Hashtable.Support.mutatingTableIterator(buckets, startBucket, endBucket); while (iter.hasNext()) { AggregateEntry e = iter.next(); if (e.getHitCount() == 0) { @@ -108,7 +114,7 @@ private boolean evictOneStaleInRange(int startBucket, int endBucket) { } void forEach(Consumer consumer) { - Support.forEach(buckets, consumer); + Hashtable.Support.forEach(buckets, consumer); } /** @@ -117,12 +123,13 @@ void forEach(Consumer consumer) { * plus whatever side-band state it needs as {@code context}. */ void forEach(T context, BiConsumer consumer) { - Support.forEach(buckets, context, consumer); + Hashtable.Support.forEach(buckets, context, consumer); } /** Removes entries whose {@code getHitCount() == 0}. */ void expungeStaleAggregates() { - for (MutatingTableIterator iter = Support.mutatingTableIterator(buckets); + for (MutatingTableIterator iter = + Hashtable.Support.mutatingTableIterator(buckets); iter.hasNext(); ) { AggregateEntry e = iter.next(); if (e.getHitCount() == 0) { @@ -133,7 +140,7 @@ void expungeStaleAggregates() { } void clear() { - Support.clear(buckets); + Hashtable.Support.clear(buckets); size = 0; evictCursor = 0; } diff --git a/dd-trace-core/src/main/java/datadog/trace/common/metrics/Aggregator.java b/dd-trace-core/src/main/java/datadog/trace/common/metrics/Aggregator.java index d809d452522..8a33d3f1ea7 100644 --- a/dd-trace-core/src/main/java/datadog/trace/common/metrics/Aggregator.java +++ b/dd-trace-core/src/main/java/datadog/trace/common/metrics/Aggregator.java @@ -30,10 +30,10 @@ final class Aggregator implements Runnable { /** * Per-cycle hook run on the aggregator thread at the start of each report cycle, before the - * flush. Used by {@link ConflatingMetricsAggregator} to reconcile its cached peer-tag schema - * against {@link datadog.communication.ddagent.DDAgentFeaturesDiscovery}; running before the - * flush guarantees that any test awaiting {@code writer.finishBucket()} observes the schema in - * its post-reconcile state. May be {@code null}. + * flush. Used by {@link ClientStatsAggregator} to reconcile its cached peer-tag schema against + * {@link datadog.communication.ddagent.DDAgentFeaturesDiscovery}; running before the flush + * guarantees that any test awaiting {@code writer.finishBucket()} observes the schema in its + * post-reconcile state. May be {@code null}. */ private final Runnable onReportCycle; diff --git a/dd-trace-core/src/main/java/datadog/trace/common/metrics/ConflatingMetricsAggregator.java b/dd-trace-core/src/main/java/datadog/trace/common/metrics/ClientStatsAggregator.java similarity index 72% rename from dd-trace-core/src/main/java/datadog/trace/common/metrics/ConflatingMetricsAggregator.java rename to dd-trace-core/src/main/java/datadog/trace/common/metrics/ClientStatsAggregator.java index 895ee434854..3a3ded31ff8 100644 --- a/dd-trace-core/src/main/java/datadog/trace/common/metrics/ConflatingMetricsAggregator.java +++ b/dd-trace-core/src/main/java/datadog/trace/common/metrics/ClientStatsAggregator.java @@ -4,7 +4,6 @@ import static datadog.trace.api.DDSpanTypes.RPC; import static datadog.trace.bootstrap.instrumentation.api.Tags.HTTP_ENDPOINT; import static datadog.trace.bootstrap.instrumentation.api.Tags.HTTP_METHOD; -import static datadog.trace.bootstrap.instrumentation.api.Tags.SPAN_KIND; import static datadog.trace.common.metrics.AggregateEntry.ERROR_TAG; import static datadog.trace.common.metrics.AggregateEntry.TOP_LEVEL_TAG; import static datadog.trace.common.metrics.SignalItem.ClearSignal.CLEAR; @@ -40,14 +39,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public final class ConflatingMetricsAggregator implements MetricsAggregator, EventListener { +public final class ClientStatsAggregator implements MetricsAggregator, EventListener { - private static final Logger log = LoggerFactory.getLogger(ConflatingMetricsAggregator.class); + private static final Logger log = LoggerFactory.getLogger(ClientStatsAggregator.class); private static final Map DEFAULT_HEADERS = Collections.singletonMap(DDAgentApi.DATADOG_META_TRACER_VERSION, DDTraceCoreInfo.VERSION); - private static final CharSequence SYNTHETICS_ORIGIN = "synthetics"; + private static final String SYNTHETICS_ORIGIN = "synthetics"; private static final SpanKindFilter METRICS_ELIGIBLE_KINDS = SpanKindFilter.builder() @@ -75,25 +74,26 @@ public final class ConflatingMetricsAggregator implements MetricsAggregator, Eve private final boolean includeEndpointInMetrics; /** - * Cached peer-aggregation schema. Producers read this reference once per trace and pass it - * through to the consumer in {@link SpanSnapshot}; they never inspect the schema's discovery - * state or rebuild it. Reconciliation is the aggregator thread's job: {@link - * #reconcilePeerTagSchema()} compares the schema's {@link PeerTagSchema#state} against {@link - * DDAgentFeaturesDiscovery#state()} once per reporting cycle and either updates the state in - * place (when the tag set is unchanged) or swaps in a freshly-built schema. + * Cached peer-aggregation schema read by producer threads. * - *

{@code null} only on the bootstrap window before {@link #bootstrapPeerTagSchema()} runs on - * the first publish. + *

Producers read this reference once per trace and store it on each {@link SpanSnapshot}. They + * do not inspect the schema's discovery state or rebuild it. The aggregator thread reconciles the + * schema once per reporting cycle in {@link #resetCardinalityHandlers()}: if feature discovery + * has a new state but the tag set is unchanged, it updates {@link PeerTagSchema#state} in-place + * to preserve the warm cardinality handlers; otherwise it swaps in a freshly-built schema. * - *

{@code volatile} so the consumer's reconcile-time replacement is visible to producer - * threads; the schema's own internal mutable state ({@link PeerTagSchema#state}) is exercised + *

An empty schema (size 0) represents the "peer tags unconfigured" state; {@code null} only on + * the bootstrap window before {@link #bootstrapPeerTagSchema()} runs on the first publish. + * + *

{@code volatile} so producer threads always see the latest replacement. The schema's own + * internal mutable state (handlers, block counters, {@link PeerTagSchema#state}) is exercised * only on the aggregator thread. */ private volatile PeerTagSchema cachedPeerTagSchema; private volatile AgentTaskScheduler.Scheduled cancellation; - public ConflatingMetricsAggregator( + public ClientStatsAggregator( Config config, SharedCommunicationObjects sharedCommunicationObjects, HealthMetrics healthMetrics) { @@ -114,7 +114,7 @@ public ConflatingMetricsAggregator( config.isTraceResourceRenamingEnabled()); } - ConflatingMetricsAggregator( + ClientStatsAggregator( WellKnownTags wellKnownTags, Set ignoredResources, DDAgentFeaturesDiscovery features, @@ -136,7 +136,7 @@ public ConflatingMetricsAggregator( includeEndpointInMetrics); } - ConflatingMetricsAggregator( + ClientStatsAggregator( WellKnownTags wellKnownTags, Set ignoredResources, DDAgentFeaturesDiscovery features, @@ -160,7 +160,7 @@ public ConflatingMetricsAggregator( includeEndpointInMetrics); } - ConflatingMetricsAggregator( + ClientStatsAggregator( Set ignoredResources, DDAgentFeaturesDiscovery features, HealthMetrics healthMetric, @@ -185,7 +185,7 @@ public ConflatingMetricsAggregator( reportingInterval, timeUnit, healthMetric, - this::reconcilePeerTagSchema); + this::resetCardinalityHandlers); this.thread = newAgentThread(METRICS_AGGREGATOR, aggregator); this.reportingInterval = reportingInterval; this.reportingIntervalTimeUnit = timeUnit; @@ -267,17 +267,26 @@ public boolean publish(List> trace) { boolean forceKeep = false; int counted = 0; if (features.supportsMetrics()) { + // Producer-side fast path: one volatile read and use whatever schema is currently cached. + // The aggregator thread keeps this schema in sync with feature discovery in + // resetCardinalityHandlers(). The only producer-side rebuild is the one-time bootstrap on + // the first publish. + PeerTagSchema peerTagSchema = cachedPeerTagSchema; + if (peerTagSchema == null) { + peerTagSchema = bootstrapPeerTagSchema(); + } for (CoreSpan span : trace) { boolean isTopLevel = span.isTopLevel(); if (shouldComputeMetric(span, isTopLevel)) { final CharSequence resourceName = span.getResourceName(); - if (resourceName != null && ignoredResources.contains(resourceName.toString())) { + if (resourceName != null + && !ignoredResources.isEmpty() + && ignoredResources.contains(resourceName.toString())) { // skip publishing all children - forceKeep = false; break; } counted++; - forceKeep |= publish(span, isTopLevel); + forceKeep |= publish(span, isTopLevel, peerTagSchema); } } healthMetrics.onClientStatTraceComputed(counted, trace.size(), !forceKeep); @@ -292,20 +301,13 @@ private boolean shouldComputeMetric(CoreSpan span, boolean isTopLevel) { && span.getDurationNano() > 0; } - private boolean publish(CoreSpan span, boolean isTopLevel) { - // Error decision drives force-keep sampling regardless of whether the snapshot gets queued. + private boolean publish(CoreSpan span, boolean isTopLevel, PeerTagSchema peerTagSchema) { boolean error = span.getError() > 0; - - // Fast-path the inbox-full case before any tag extraction or snapshot allocation. size() is - // approximate on jctools' MPSC queue but that's fine: if we under-estimate, we fall through - // and let inbox.offer be the source of truth (existing behavior); if we over-estimate, we - // drop a snapshot that would have fit -- acceptable, onStatsInboxFull was going to fire - // imminently anyway. + // size() is approximate on jctools MPSC queues but good enough for a fast-path overflow check. if (inbox.size() >= inbox.capacity()) { healthMetrics.onStatsInboxFull(); return error; } - // Extract HTTP method and endpoint only if the feature is enabled String httpMethod = null; String httpEndpoint = null; @@ -322,20 +324,23 @@ private boolean publish(CoreSpan span, boolean isTopLevel) { Object grpcStatusObj = span.unsafeGetTag(InstrumentationTags.GRPC_STATUS_CODE); grpcStatusCode = grpcStatusObj != null ? grpcStatusObj.toString() : null; } - // CharSequence default keeps unsafeGetTag's generic at CharSequence so UTF8BytesString - // tag values don't trigger a ClassCastException on the String assignment. - final String spanKind = span.unsafeGetTag(SPAN_KIND, (CharSequence) "").toString(); + // DDSpan resolves this from a cached span.kind ordinal via a small lookup array, skipping a + // tag-map lookup. Other CoreSpan impls fall back to the tag map by default. + String spanKind = span.getSpanKindString(); + if (spanKind == null) { + spanKind = ""; + } long tagAndDuration = span.getDurationNano() | (error ? ERROR_TAG : 0L) | (isTopLevel ? TOP_LEVEL_TAG : 0L); - PeerTagSchema peerTagSchema = peerTagSchemaFor(span); + PeerTagSchema spanPeerTagSchema = peerTagSchemaFor(spanKind, peerTagSchema); String[] peerTagValues = - peerTagSchema == null ? null : capturePeerTagValues(span, peerTagSchema); + spanPeerTagSchema == null ? null : capturePeerTagValues(span, spanPeerTagSchema); if (peerTagValues == null) { - // No tags fired -- drop the schema reference so the consumer doesn't bother iterating an - // all-null array. - peerTagSchema = null; + // capture returned no non-null values -- drop the schema reference so the consumer doesn't + // bother iterating an all-null array. + spanPeerTagSchema = null; } SpanSnapshot snapshot = @@ -349,7 +354,7 @@ private boolean publish(CoreSpan span, boolean isTopLevel) { isSynthetic(span), span.getParentId() == 0, spanKind, - peerTagSchema, + spanPeerTagSchema, peerTagValues, httpMethod, httpEndpoint, @@ -362,26 +367,6 @@ private boolean publish(CoreSpan span, boolean isTopLevel) { return error; } - /** - * Picks the peer-tag schema for a span. For internal-kind spans we always use the static {@link - * PeerTagSchema#INTERNAL} singleton (one entry for {@code base.service}); for {@code - * client}/{@code producer}/{@code consumer} kinds we use the cached peer-aggregation schema - * synced from {@link DDAgentFeaturesDiscovery#peerTags()}. Other kinds get {@code null}. - */ - private PeerTagSchema peerTagSchemaFor(CoreSpan span) { - if (span.isKind(PEER_AGGREGATION_KINDS)) { - PeerTagSchema schema = cachedPeerTagSchema; - if (schema == null) { - schema = bootstrapPeerTagSchema(); - } - return schema.size() > 0 ? schema : null; - } - if (span.isKind(INTERNAL_KIND)) { - return PeerTagSchema.INTERNAL; - } - return null; - } - /** * One-time producer-side bootstrap of {@link #cachedPeerTagSchema}. Synchronized double-check * guards against two producers racing on the very first publish; after this returns, {@code @@ -416,14 +401,52 @@ private PeerTagSchema buildPeerTagSchema() { return PeerTagSchema.of(names == null ? Collections.emptySet() : names, state); } + /** + * Single reset hook invoked on the aggregator thread at the end of each report cycle. Reconciles + * the cached peer-tag schema against the latest feature discovery, then resets all cardinality + * state in lockstep: the static property handlers, {@code PeerTagSchema.INTERNAL}, and the cached + * peer-tag schema. New handlers added anywhere in this pipeline should be reset from here. + */ + private void resetCardinalityHandlers() { + reconcilePeerTagSchema(); + for (PropertyCardinalityHandler handler : AggregateEntry.FIELD_HANDLERS) { + long blocked = handler.reset(); + if (blocked > 0) { + log.warn( + "Cardinality limit reached for stats field '{}'; further values will be reported as tracer_blocked_value", + handler.name); + healthMetrics.onTagCardinalityBlocked(handler.statsDTag(), blocked); + } + } + resetPeerTagSchema(PeerTagSchema.INTERNAL); + PeerTagSchema schema = cachedPeerTagSchema; + if (schema != null) { + resetPeerTagSchema(schema); + } + } + + private void resetPeerTagSchema(PeerTagSchema schema) { + for (int i = 0; i < schema.handlers.length; i++) { + long blocked = schema.handlers[i].reset(); + if (blocked > 0) { + log.warn( + "Cardinality limit reached for peer tag '{}'; further values are reported as" + + " 'tracer_blocked_value' until the next reporting cycle", + schema.names[i]); + healthMetrics.onTagCardinalityBlocked(schema.handlers[i].statsDTag(), blocked); + } + } + } + /** * Reconciles {@link #cachedPeerTagSchema} with the latest feature discovery. Runs on the * aggregator thread once per reporting cycle via the reset hook passed to {@link Aggregator}. * Cheap fast path: an equality check against the cached schema's embedded {@link * DDAgentFeaturesDiscovery#state()} hash short-circuits when discovery's response hasn't changed * since the schema was built. On mismatch, a set compare distinguishes "discovery response - * changed but peer tags are the same" (just update the cached state in place) from "tags actually - * changed" (build a new schema and swap the volatile reference). + * changed but peer tags are the same" (just update the cached state in place to preserve the warm + * cardinality handlers) from "tags actually changed" (build a new schema and swap the volatile + * reference). */ private void reconcilePeerTagSchema() { PeerTagSchema cached = cachedPeerTagSchema; @@ -436,19 +459,37 @@ private void reconcilePeerTagSchema() { return; } Set latestNames = features.peerTags(); - Set normalized = latestNames == null ? Collections.emptySet() : latestNames; + Set normalized = latestNames == null ? Collections.emptySet() : latestNames; if (cached.hasSameTagsAs(normalized)) { cached.state = latestState; } else { + // Tags actually changed: flush the outgoing schema's accumulated block telemetry before + // discarding it, otherwise the partial-cycle blockedCounts would silently disappear. + resetPeerTagSchema(cached); cachedPeerTagSchema = PeerTagSchema.of(normalized, latestState); } } /** - * Captures the span's peer-tag values into a {@code String[]} parallel to {@code schema.names}. - * Slots remain {@code null} for tags the span didn't set; the array itself is lazily allocated on - * the first hit so spans that fire no peer tags pay zero allocation. Returns {@code null} when - * none of the configured peer tags are set on the span. + * Picks the peer-tag schema for a span. The {@code peerTagSchema} argument is the per-trace + * cached schema (read once in {@link #publish(List)} via the volatile {@link + * #cachedPeerTagSchema}, with {@link #bootstrapPeerTagSchema()} taking care of the first-publish + * window) -- always non-null but possibly empty when peer tags are unconfigured. For + * internal-kind spans the static {@link PeerTagSchema#INTERNAL} schema is used regardless. + */ + private static PeerTagSchema peerTagSchemaFor(String spanKind, PeerTagSchema peerTagSchema) { + if (peerTagSchema.size() > 0 && PEER_AGGREGATION_KINDS.matches(spanKind)) { + return peerTagSchema; + } + if (INTERNAL_KIND.matches(spanKind)) { + return PeerTagSchema.INTERNAL; + } + return null; + } + + /** + * Captures the span's peer tag values into a {@code String[]} parallel to {@code schema.names}. + * Returns {@code null} when none of the configured peer tags are set on the span. */ private static String[] capturePeerTagValues(CoreSpan span, PeerTagSchema schema) { String[] names = schema.names; @@ -467,7 +508,8 @@ private static String[] capturePeerTagValues(CoreSpan span, PeerTagSchema sch } private static boolean isSynthetic(CoreSpan span) { - return span.getOrigin() != null && SYNTHETICS_ORIGIN.equals(span.getOrigin().toString()); + CharSequence origin = span.getOrigin(); + return origin != null && SYNTHETICS_ORIGIN.contentEquals(origin); } public void stop() { @@ -526,11 +568,10 @@ private void disable() { } } - private static final class ReportTask - implements AgentTaskScheduler.Task { + private static final class ReportTask implements AgentTaskScheduler.Task { @Override - public void run(ConflatingMetricsAggregator target) { + public void run(ClientStatsAggregator target) { target.report(); } } diff --git a/dd-trace-core/src/main/java/datadog/trace/common/metrics/MetricCardinalityLimits.java b/dd-trace-core/src/main/java/datadog/trace/common/metrics/MetricCardinalityLimits.java new file mode 100644 index 00000000000..58dcd3a70a1 --- /dev/null +++ b/dd-trace-core/src/main/java/datadog/trace/common/metrics/MetricCardinalityLimits.java @@ -0,0 +1,73 @@ +package datadog.trace.common.metrics; + +/** + * Per-field limits for distinct metric-key values seen during one reporting cycle. When a field + * exceeds its limit, additional values are replaced with {@code tracer_blocked_value} so they share + * one aggregate row instead of creating more rows in the table. + * + *

Values are sized to the typical-service workload with headroom; "typical" estimates are noted + * inline. Raise if a workload routinely hits the sentinel; lower carries proportional memory + * savings but risks suppressing legitimate distinctions. + */ +final class MetricCardinalityLimits { + private MetricCardinalityLimits() {} + + /** + * Distinct {@code resource.name} values per cycle. Highest-cardinality field by far: DB-query + * obfuscations, HTTP route templates, custom resources. Typical service: 30-200 unique. + */ + static final int RESOURCE = 256; + + /** + * Distinct {@code service.name} values per cycle. Local service plus downstream peer-service + * names. Microservice meshes typically reference 10-50 distinct services. + */ + static final int SERVICE = 32; + + /** + * Distinct {@code operation.name} values per cycle. Names like {@code http.request}, {@code + * db.query}, etc. Typical service: 10-30 across integrations. + */ + static final int OPERATION = 64; + + /** + * Distinct {@code _dd.base_service} override values per cycle. Used rarely; usually empty or one + * of a handful per service. + */ + static final int SERVICE_SOURCE = 16; + + /** + * Distinct {@code span.type} values per cycle. {@code DDSpanTypes} catalog is ~30; a single + * service usually spans 5-10 integration types. + */ + static final int TYPE = 16; + + /** + * Distinct {@code span.kind} values per cycle. OTel defines exactly 5 (server/client/producer/ + * consumer/internal); 8 still leaves 60% headroom in case a producer invents new kinds. + */ + static final int SPAN_KIND = 8; + + /** + * Distinct HTTP method values per cycle. Standard verbs are 7-9; WebDAV/custom adds a few more. + */ + static final int HTTP_METHOD = 16; + + /** + * Distinct {@code http.endpoint} values per cycle. Path templates -- same shape as {@code + * RESOURCE} for HTTP-heavy services. Only used when {@code includeEndpointInMetrics} is enabled. + */ + static final int HTTP_ENDPOINT = 64; + + /** + * Distinct gRPC status code values per cycle. gRPC spec defines exactly 17 codes (0-16); 24 + * leaves headroom for unknown-code edge cases without wasting space. + */ + static final int GRPC_STATUS_CODE = 24; + + /** + * Distinct values per peer-tag name (e.g. distinct {@code peer.hostname} values). Each configured + * peer tag gets its own handler at this limit. + */ + static final int PEER_TAG_VALUE = 512; +} diff --git a/dd-trace-core/src/main/java/datadog/trace/common/metrics/MetricsAggregatorFactory.java b/dd-trace-core/src/main/java/datadog/trace/common/metrics/MetricsAggregatorFactory.java index 09464310113..b9530871763 100644 --- a/dd-trace-core/src/main/java/datadog/trace/common/metrics/MetricsAggregatorFactory.java +++ b/dd-trace-core/src/main/java/datadog/trace/common/metrics/MetricsAggregatorFactory.java @@ -15,7 +15,7 @@ public static MetricsAggregator createMetricsAggregator( HealthMetrics healthMetrics) { if (config.isTracerMetricsEnabled()) { log.debug("tracer metrics enabled"); - return new ConflatingMetricsAggregator(config, sharedCommunicationObjects, healthMetrics); + return new ClientStatsAggregator(config, sharedCommunicationObjects, healthMetrics); } log.debug("tracer metrics disabled"); return NoOpMetricsAggregator.INSTANCE; diff --git a/dd-trace-core/src/main/java/datadog/trace/common/metrics/PeerTagSchema.java b/dd-trace-core/src/main/java/datadog/trace/common/metrics/PeerTagSchema.java index d3a3d47d65a..eca5c6c6a1a 100644 --- a/dd-trace-core/src/main/java/datadog/trace/common/metrics/PeerTagSchema.java +++ b/dd-trace-core/src/main/java/datadog/trace/common/metrics/PeerTagSchema.java @@ -3,17 +3,17 @@ import static datadog.trace.api.DDTags.BASE_SERVICE; import datadog.communication.ddagent.DDAgentFeaturesDiscovery; +import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString; import java.util.Set; /** - * Names of the peer-tags eligible for client-stats aggregation, packed into a flat {@code String[]} - * for parallel-array access by producers and the aggregator thread. + * Parallel arrays of peer-tag names and their {@link TagCardinalityHandler}s, using matching + * indexes. * - *

This is the minimal carrier shape used by {@link SpanSnapshot}: the producer captures per-span - * values into a {@code String[]} parallel to {@link #names}, and the aggregator reconstructs the - * encoded {@code tag:value} pairs from the same name index. It replaces the prior "flat pairs" - * {@code [name0, value0, name1, value1, ...]} layout, which forced a worst-case allocation + - * trim-and-copy on every span. + *

Each schema stores peer-tag names and their cardinality handlers by index. Producers capture + * span tag values into a {@code String[]} with the same ordering as {@link #names}. Consumers pass + * the index and captured value to {@link #register(int, String)} to canonicalize it through the + * per-tag cardinality handler. * *

Two schemas exist: * @@ -21,35 +21,37 @@ *

  • {@link #INTERNAL} -- a singleton with one entry for {@code base.service}, used for * internal-kind spans where only the base service is aggregated. *
  • A peer-aggregation schema built via {@link #of(Set, String)} for {@code client}/{@code - * producer}/{@code consumer} spans. {@link ConflatingMetricsAggregator} caches the most - * recently built schema and reconciles it on the aggregator thread once per reporting cycle - * by comparing {@link #state} against {@link DDAgentFeaturesDiscovery#state()}. + * producer}/{@code consumer} spans. {@link ClientStatsAggregator} caches the most recently + * built schema and reconciles it on the aggregator thread once per reporting cycle by + * comparing {@link #state} against {@link DDAgentFeaturesDiscovery#state()}. * * - *

    This class deliberately has no cardinality limiters -- callers that need those layer them on - * top. + *

    Cardinality blocks are counted inside each {@link TagCardinalityHandler} and flushed once per + * cycle (with a warn log) via {@code ClientStatsAggregator#resetCardinalityHandlers}. * - *

    Thread-safety: {@link #names} is final and safe to read from any thread. {@link #state} - * is exercised only on the aggregator thread (read and updated in reconciliation); producer threads - * access the schema only through the volatile {@code cachedPeerTagSchema} reference in {@link - * ConflatingMetricsAggregator}. + *

    Each {@link SpanSnapshot} captures its own schema reference so producer and consumer agree on + * the indexing even if the current schema is replaced between capture and consumption. + * + *

    Thread-safety: the aggregator thread is the only thread that mutates this schema, + * including its {@link TagCardinalityHandler}s and {@link #state}. Producer threads may read {@link + * #names} and {@link #handlers} because they are final and published through the volatile {@code + * cachedPeerTagSchema} reference in {@link ClientStatsAggregator}. */ final class PeerTagSchema { + /** + * Sentinel {@link #state} for schemas that are never reconciled against feature discovery: the + * {@link #INTERNAL} singleton and test-built schemas. A {@code null} state always mismatches a + * real discovery hash, so a schema built with it would rebuild on first reconcile -- but neither + * of these schemas takes that path. + */ + static final String NO_STATE = null; + /** Singleton schema for internal-kind spans -- only {@code base.service}. */ - static final PeerTagSchema INTERNAL = - // INTERNAL is never reconciled, so the state value is irrelevant. - new PeerTagSchema(new String[] {BASE_SERVICE}, null); + static final PeerTagSchema INTERNAL = new PeerTagSchema(new String[] {BASE_SERVICE}, NO_STATE); final String[] names; - - /** - * Precomputed {@code Arrays.hashCode(names)}. The schema is shared across many publishes so - * recomputing it on the aggregator hot path (per-publish call to {@code AggregateEntry.hashOf}) - * was waste -- it showed up as a top aggregator-thread sample. Cached here, computed once at - * construction. - */ - final int namesHash; + final TagCardinalityHandler[] handlers; /** * The {@code DDAgentFeaturesDiscovery.state()} hash this schema was built from. The aggregator @@ -60,30 +62,27 @@ final class PeerTagSchema { */ String state; - private PeerTagSchema(String[] names, String state) { - this.names = names; - this.namesHash = java.util.Arrays.hashCode(names); - this.state = state; - } - /** Builds a schema for the given peer-tag names. Order is determined by the {@link Set}. */ - static PeerTagSchema of(Set tags, String state) { - return new PeerTagSchema(tags.toArray(new String[0]), state); + static PeerTagSchema of(Set names, String state) { + return new PeerTagSchema(names.toArray(new String[0]), state); } - /** - * Test-only factory that takes the names array directly so tests can build a schema in a specific - * order without going through a {@link Set}. - */ - static PeerTagSchema testSchema(String[] names) { - return new PeerTagSchema(names, null); + PeerTagSchema(String[] names, String state) { + this.names = names; + this.state = state; + this.handlers = new TagCardinalityHandler[names.length]; + for (int i = 0; i < names.length; i++) { + this.handlers[i] = + new TagCardinalityHandler( + names[i], MetricCardinalityLimits.PEER_TAG_VALUE, AggregateEntry.LIMITS_ENABLED); + } } /** - * Whether this schema's tag names exactly match {@code other}. Used by the aggregator's reconcile - * path: when a feature discovery refresh changes {@link DDAgentFeaturesDiscovery#state()} but the - * resulting set is unchanged, the aggregator can keep this schema and just update {@link #state} - * instead of rebuilding. + * Whether this schema contains exactly the same tag names as {@code other}. Used during + * reconciliation: if feature discovery has a new {@link DDAgentFeaturesDiscovery#state()} but the + * peer-tag set is unchanged, the aggregator can reuse this schema and update {@link #state} + * instead of rebuilding the handlers. */ boolean hasSameTagsAs(Set other) { if (this.names.length != other.size()) { @@ -97,7 +96,20 @@ boolean hasSameTagsAs(Set other) { return true; } + /** + * Canonicalizes the peer-tag value at slot {@code i}. Returns {@link UTF8BytesString#EMPTY} for + * null inputs and the handler's {@code ":tracer_blocked_value"} sentinel when the per-tag + * cardinality budget is exhausted. + */ + UTF8BytesString register(int i, String value) { + return handlers[i].register(value); + } + int size() { return names.length; } + + String name(int i) { + return names[i]; + } } diff --git a/dd-trace-core/src/main/java/datadog/trace/common/metrics/PropertyCardinalityHandler.java b/dd-trace-core/src/main/java/datadog/trace/common/metrics/PropertyCardinalityHandler.java new file mode 100644 index 00000000000..ca86f0be8f6 --- /dev/null +++ b/dd-trace-core/src/main/java/datadog/trace/common/metrics/PropertyCardinalityHandler.java @@ -0,0 +1,181 @@ +package datadog.trace.common.metrics; + +import datadog.trace.api.internal.VisibleForTesting; +import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString; +import java.util.Arrays; + +/** + * Cardinality-capped UTF8 encoder and cache for one aggregate-key field ({@code value} → + * {@code UTF8(value)}). + * + *

    Each reporting cycle (interval between client-stats flushes) has its own cardinality budget. + * Once the budget is exhausted, new values get the {@code tracer_blocked_value} sentinel (or a + * fresh allocation when sentinel mode is disabled). A prior-cycle table preserves {@link + * UTF8BytesString} instances across the reset, so stable workloads pay zero allocations after the + * first cycle. + * + *

    Dual role -- limiter and cache. Prior versions ran a per-field {@code DDCache} for UTF8 + * reuse with a separate global cardinality cap on top. Under high load that wasn't enough to stave + * off long GC cycles: every miss still concatenated / UTF8-encoded the value before the cache could + * store it. A cardinality limiter and a recent-value cache are both sets of recently used + * values, so this class collapses them into one structure. Cardinality limiting happens first, + * which lets the blocked path skip the concatenation and encoding entirely. + * + *

    A pure limiter would fully reset each reporting cycle and destroy the cache. To preserve UTF8 + * reuse across resets, the handler keeps the previous cycle's entries verbatim in a parallel table + * and reuses any matching {@link UTF8BytesString} when a value first appears in the new cycle. + */ +final class PropertyCardinalityHandler { + // Upper bound prevents int overflow in the (cardinalityLimit * 2 - 1) capacity calculation. + // Practical limits are 8..512; this cap is well beyond any realistic configuration. + private static final int MAX_CARDINALITY_LIMIT = 1 << 29; + + final String name; + private final int cardinalityLimit; + private final int capacityMask; + + /** + * Whether to substitute the {@code tracer_blocked_value} sentinel when the per-cycle budget is + * exhausted. With limits enabled (sentinel mode), overflow values collapse to one bucket; with + * limits disabled, the cache size is still bounded by {@link #cardinalityLimit} but over-budget + * values get freshly-allocated {@link UTF8BytesString}s instead, so the wire format carries the + * real value and entries don't collapse. Prior-cycle reuse runs in either mode. + */ + private final boolean useBlockedSentinel; + + // Single open-addressed table per cycle. The stored UTF8BytesString IS the slot identity -- + // equality is checked by comparing its underlying String against the incoming CharSequence. + private UTF8BytesString[] curValues; + // Values from the previous reporting cycle, kept so values that persist across cycles can reuse + // their UTF8BytesString instance without re-allocating. + private UTF8BytesString[] priorValues; + private int curSize; + + private UTF8BytesString cacheBlocked = null; + private String[] statsDTag = null; + + /** Accumulated block count for the current cycle. Returned and zeroed by {@link #reset()}. */ + private long blockedCount; + + /** + * Test convenience: limits-enabled mode (blocked sentinel substitution active). Production uses + * the three-argument constructor with the flag from {@code Config}. + */ + @VisibleForTesting + PropertyCardinalityHandler(String name, int cardinalityLimit) { + this(name, cardinalityLimit, true); + } + + PropertyCardinalityHandler(String name, int cardinalityLimit, boolean useBlockedSentinel) { + this.name = name; + if (cardinalityLimit <= 0) { + throw new IllegalArgumentException("cardinalityLimit must be positive: " + cardinalityLimit); + } + if (cardinalityLimit > MAX_CARDINALITY_LIMIT) { + throw new IllegalArgumentException( + "cardinalityLimit must be at most " + MAX_CARDINALITY_LIMIT + ": " + cardinalityLimit); + } + this.cardinalityLimit = cardinalityLimit; + this.useBlockedSentinel = useBlockedSentinel; + // Capacity = next power of two >= 2 * cardinalityLimit. Linear-probing load factor stays + // <= 0.5 even when the budget is full, which keeps probe chains short. + final int capacity = Integer.highestOneBit(cardinalityLimit * 2 - 1) << 1; + this.capacityMask = capacity - 1; + this.curValues = new UTF8BytesString[capacity]; + this.priorValues = new UTF8BytesString[capacity]; + } + + /** + * Canonicalizes {@code value} through the cardinality budget and per-cycle reuse cache. Null + * inputs map to {@link UTF8BytesString#EMPTY} -- {@link AggregateEntry} doesn't need to + * pre-check. + * + *

    The value hash is computed once and used as the initial probe slot in both tables. {@code h + * ^ (h >>> 16)} folds high hash bits into the low bits to reduce collisions for inputs that share + * a common low-bit pattern. {@link UTF8BytesString#hashCode} is content-stable with the + * underlying String, so a String input and a UTF8BytesString of the same content map to the same + * slot. + */ + UTF8BytesString register(CharSequence value) { + if (value == null) { + return UTF8BytesString.EMPTY; + } + // Initial table slot, used to probe current and prior tables. + int h = value.hashCode(); + int start = (h ^ (h >>> 16)) & this.capacityMask; + + // First, look in the current-cycle table. + // If found, this value already consumed cardinality budget in this cycle. + int slot = start; + UTF8BytesString existing; + while ((existing = this.curValues[slot]) != null + && existing != value + && !existing.toString().contentEquals(value)) { + slot = (slot + 1) & this.capacityMask; + } + if (existing != null) { + return existing; + } + // This value is new for the current cycle. + boolean capExhausted = this.curSize >= this.cardinalityLimit; + // If sentinel mode is enabled and the field is over budget, collapse this + // value to tracer_blocked_value and count it as blocked. + if (capExhausted && this.useBlockedSentinel) { + this.blockedCount++; + return this.tracerBlockedValue(); + } + // Otherwise, try to reuse from the prior cycle if possible to avoid re-allocation. + // Runs whether or not the current budget is exhausted, so persistent values keep their + // UTF8BytesString instance across cycles. + int priorSlot = start; + UTF8BytesString priorMatch; + while ((priorMatch = this.priorValues[priorSlot]) != null + && priorMatch != value + && !priorMatch.toString().contentEquals(value)) { + priorSlot = (priorSlot + 1) & this.capacityMask; + } + UTF8BytesString utf8 = priorMatch != null ? priorMatch : UTF8BytesString.create(value); + // If there is still budget, remember this value in the current-cycle table. + if (!capExhausted) { + this.curValues[slot] = utf8; + this.curSize += 1; + } + // If capExhausted && !useBlockedSentinel, this returns the real value but + // does not cache it in the current cycle. + return utf8; + } + + private UTF8BytesString tracerBlockedValue() { + UTF8BytesString cacheBlocked = this.cacheBlocked; + if (cacheBlocked != null) return cacheBlocked; + + this.cacheBlocked = cacheBlocked = UTF8BytesString.create("tracer_blocked_value"); + return cacheBlocked; + } + + /** + * Resets the per-cycle working set and returns the accumulated block count for this cycle. The + * caller is responsible for reporting the count to health metrics if non-zero. + */ + String[] statsDTag() { + if (statsDTag == null) { + statsDTag = new String[] {"collapsed:" + name}; + } + return statsDTag; + } + + long reset() { + long count = this.blockedCount; + this.blockedCount = 0; + // Flip pointers: the just-completed cycle becomes prior; what was prior (2 cycles ago) is + // recycled into the new (empty) current. + final UTF8BytesString[] tmp = this.priorValues; + this.priorValues = this.curValues; + this.curValues = tmp; + // Null the new current. The values pulled out of prior are still reachable through any + // AggregateEntry rows they ended up populating; this just drops the handler's references. + Arrays.fill(this.curValues, null); + this.curSize = 0; + return count; + } +} diff --git a/dd-trace-core/src/main/java/datadog/trace/common/metrics/SerializingMetricWriter.java b/dd-trace-core/src/main/java/datadog/trace/common/metrics/SerializingMetricWriter.java index 972bd1e86ed..622a4a14cb0 100644 --- a/dd-trace-core/src/main/java/datadog/trace/common/metrics/SerializingMetricWriter.java +++ b/dd-trace-core/src/main/java/datadog/trace/common/metrics/SerializingMetricWriter.java @@ -91,7 +91,7 @@ public SerializingMetricWriter( this.buffer = new GrowableBuffer(initialCapacity); this.writer = new MsgPackWriter(buffer); this.sink = sink; - this.gitInfoProvider = new GitInfoProvider(); + this.gitInfoProvider = gitInfoProvider; } @Override @@ -151,11 +151,12 @@ public void startBucket(int metricCount, long start, long duration) { @Override public void add(AggregateEntry entry) { - // Calculate dynamic map size based on optional fields - final boolean hasHttpMethod = entry.getHttpMethod() != null; - final boolean hasHttpEndpoint = entry.getHttpEndpoint() != null; - final boolean hasServiceSource = entry.getServiceSource() != null; - final boolean hasGrpcStatusCode = entry.getGrpcStatusCode() != null; + // Dynamic map size based on optional fields; AggregateEntry encapsulates the EMPTY-as-absent + // sentinel via its hasFoo() predicates so the serializer doesn't depend on the storage choice. + final boolean hasHttpMethod = entry.hasHttpMethod(); + final boolean hasHttpEndpoint = entry.hasHttpEndpoint(); + final boolean hasServiceSource = entry.hasServiceSource(); + final boolean hasGrpcStatusCode = entry.hasGrpcStatusCode(); final int mapSize = 15 + (hasServiceSource ? 1 : 0) diff --git a/dd-trace-core/src/main/java/datadog/trace/common/metrics/SpanSnapshot.java b/dd-trace-core/src/main/java/datadog/trace/common/metrics/SpanSnapshot.java index 152ac42bb55..8bbc6a29edb 100644 --- a/dd-trace-core/src/main/java/datadog/trace/common/metrics/SpanSnapshot.java +++ b/dd-trace-core/src/main/java/datadog/trace/common/metrics/SpanSnapshot.java @@ -1,5 +1,7 @@ package datadog.trace.common.metrics; +import javax.annotation.Nullable; + /** * Immutable per-span value posted from the producer to the aggregator thread. Carries the raw * inputs the aggregator needs to look up or build an {@link AggregateEntry} and update its @@ -22,21 +24,21 @@ final class SpanSnapshot implements InboxItem { /** * Schema for {@link #peerTagValues}. {@code null} when the span has no peer tags. The schema - * carries the names in parallel-array form; {@code peerTagValues} holds the per-span tag values - * at the same indices. + * carries the names + {@link TagCardinalityHandler}s in parallel array form; {@code + * peerTagValues} holds the per-span tag values at the same indices. */ - final PeerTagSchema peerTagSchema; + @Nullable final PeerTagSchema peerTagSchema; /** * Peer tag values captured from the span, parallel to {@code peerTagSchema.names}. A {@code null} * entry means the span didn't have that peer tag set. {@code null} (the whole array) when {@link * #peerTagSchema} is {@code null}. */ - final String[] peerTagValues; + @Nullable final String[] peerTagValues; - final String httpMethod; - final String httpEndpoint; - final String grpcStatusCode; + @Nullable final String httpMethod; + @Nullable final String httpEndpoint; + @Nullable final String grpcStatusCode; /** Duration in nanoseconds, OR-ed with {@code ERROR_TAG} / {@code TOP_LEVEL_TAG} as needed. */ final long tagAndDuration; @@ -51,11 +53,11 @@ final class SpanSnapshot implements InboxItem { boolean synthetic, boolean traceRoot, String spanKind, - PeerTagSchema peerTagSchema, - String[] peerTagValues, - String httpMethod, - String httpEndpoint, - String grpcStatusCode, + @Nullable PeerTagSchema peerTagSchema, + @Nullable String[] peerTagValues, + @Nullable String httpMethod, + @Nullable String httpEndpoint, + @Nullable String grpcStatusCode, long tagAndDuration) { this.resourceName = resourceName; this.serviceName = serviceName; diff --git a/dd-trace-core/src/main/java/datadog/trace/common/metrics/TagCardinalityHandler.java b/dd-trace-core/src/main/java/datadog/trace/common/metrics/TagCardinalityHandler.java new file mode 100644 index 00000000000..3c3d151142c --- /dev/null +++ b/dd-trace-core/src/main/java/datadog/trace/common/metrics/TagCardinalityHandler.java @@ -0,0 +1,170 @@ +package datadog.trace.common.metrics; + +import datadog.trace.api.internal.VisibleForTesting; +import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import java.util.Arrays; + +/** + * Cardinality-capped UTF8 encoder and cache for one peer-tag name ({@code value} → {@code + * UTF8("tag:value")}). + * + *

    Same per-cycle budget and prior-cycle reuse as {@link PropertyCardinalityHandler}. The + * difference is that the cached output is the pre-encoded {@code "tag:value"} string, so a parallel + * raw-value keys table is needed alongside the UTF8 values table. + */ +final class TagCardinalityHandler { + // Upper bound prevents int overflow in the (cardinalityLimit * 2 - 1) capacity calculation. + // Practical limits are 8..512; this cap is well beyond any realistic configuration. + private static final int MAX_CARDINALITY_LIMIT = 1 << 29; + + private final String tag; + private String[] statsDTag = null; + private final int cardinalityLimit; + private final int capacityMask; + + /** See {@link PropertyCardinalityHandler}'s field of the same name. */ + private final boolean useBlockedSentinel; + + private String[] curKeys; + private UTF8BytesString[] curValues; + private String[] priorKeys; + private UTF8BytesString[] priorValues; + private int curSize; + + private UTF8BytesString cacheBlocked = null; + + /** Accumulated block count for the current cycle. Returned and zeroed by {@link #reset()}. */ + private long blockedCount; + + /** + * Test convenience: limits-enabled mode. Production uses the three-argument constructor with the + * flag from {@code Config}. + */ + @VisibleForTesting + TagCardinalityHandler(String tag, int cardinalityLimit) { + this(tag, cardinalityLimit, true); + } + + TagCardinalityHandler(String tag, int cardinalityLimit, boolean useBlockedSentinel) { + if (cardinalityLimit <= 0) { + throw new IllegalArgumentException("cardinalityLimit must be positive: " + cardinalityLimit); + } + if (cardinalityLimit > MAX_CARDINALITY_LIMIT) { + throw new IllegalArgumentException( + "cardinalityLimit must be at most " + MAX_CARDINALITY_LIMIT + ": " + cardinalityLimit); + } + this.tag = tag; + this.cardinalityLimit = cardinalityLimit; + this.useBlockedSentinel = useBlockedSentinel; + final int capacity = Integer.highestOneBit(cardinalityLimit * 2 - 1) << 1; + this.capacityMask = capacity - 1; + this.curKeys = new String[capacity]; + this.curValues = new UTF8BytesString[capacity]; + this.priorKeys = new String[capacity]; + this.priorValues = new UTF8BytesString[capacity]; + } + + /** + * Returns the UTF8 value to use for {@code value} in the current reporting cycle. Null inputs are + * returned as {@link UTF8BytesString#EMPTY}. + * + *

    The value hash is computed once and used as the initial probe slot in both tables. The + * {@code h ^ (h >>> 16)} calculation folds high hash bits into the low bits, which reduces + * clustering when values share similar low-bit hash patterns. + */ + @SuppressFBWarnings( + value = "ES_COMPARING_PARAMETER_STRING_WITH_EQ", + justification = + "Intentional identity fast-path: the reference check short-circuits the .equals() call" + + " when the stored key and probe value are the same instance.") + UTF8BytesString register(String value) { + if (value == null) { + return UTF8BytesString.EMPTY; + } + // Compute the initial probe slot once. The same start slot is used for the + // current-cycle table and, on miss, for the prior-cycle table. + int h = value.hashCode(); + int start = (h ^ (h >>> 16)) & this.capacityMask; + + // Look for the raw value in the current-cycle table. + int slot = start; + String existing; + while ((existing = this.curKeys[slot]) != null + && existing != value + && !existing.equals(value)) { + slot = (slot + 1) & this.capacityMask; + } + // If found, return the already encoded "tag:value" UTF8 value. + if (existing != null) { + return this.curValues[slot]; + } + // This value is new for the current cycle. + boolean capExhausted = this.curSize >= this.cardinalityLimit; + // If sentinel mode is enabled and the tag has reached its value budget, + // collapse this value to "tag:tracer_blocked_value" and record the block. + if (capExhausted && this.useBlockedSentinel) { + this.blockedCount++; + return this.tracerBlockedValue(); + } + // Try to find the same raw value in the previous-cycle table so the encoded + // UTF8 object can be reused after a reset. + int priorSlot = start; + String priorKey; + while ((priorKey = this.priorKeys[priorSlot]) != null + && priorKey != value + && !priorKey.equals(value)) { + priorSlot = (priorSlot + 1) & this.capacityMask; + } + // Reuse the previous encoded "tag:value" UTF8 value if present; otherwise + // create it from the fixed tag name and the raw value. + UTF8BytesString utf8 = + priorKey != null + ? this.priorValues[priorSlot] + : UTF8BytesString.create(this.tag + ":" + value); + // If still within budget, remember the raw value and its encoded UTF8 + // output in the current-cycle table. + if (!capExhausted) { + this.curKeys[slot] = value; + this.curValues[slot] = utf8; + this.curSize += 1; + } + // If capExhausted && !useBlockedSentinel, return the real "tag:value" value + // without caching it in the current cycle. + return utf8; + } + + private UTF8BytesString tracerBlockedValue() { + UTF8BytesString cacheBlocked = this.cacheBlocked; + if (cacheBlocked != null) return cacheBlocked; + + this.cacheBlocked = cacheBlocked = UTF8BytesString.create(this.tag + ":tracer_blocked_value"); + return cacheBlocked; + } + + String[] statsDTag() { + if (statsDTag == null) { + statsDTag = new String[] {"collapsed:" + tag}; + } + return statsDTag; + } + + /** + * Resets the per-cycle working set and returns the accumulated block count for this cycle. The + * caller is responsible for reporting the count to health metrics if non-zero. + */ + long reset() { + long count = this.blockedCount; + this.blockedCount = 0; + final String[] tmpKeys = this.priorKeys; + final UTF8BytesString[] tmpValues = this.priorValues; + this.priorKeys = this.curKeys; + this.priorValues = this.curValues; + this.curKeys = tmpKeys; + this.curValues = tmpValues; + Arrays.fill(this.curKeys, null); + Arrays.fill(this.curValues, null); + this.curSize = 0; + return count; + } +} diff --git a/dd-trace-core/src/main/java/datadog/trace/core/CoreSpan.java b/dd-trace-core/src/main/java/datadog/trace/core/CoreSpan.java index 4d0d8c87f99..dd3b2bc6e06 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/CoreSpan.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/CoreSpan.java @@ -1,6 +1,7 @@ package datadog.trace.core; import datadog.trace.api.DDTraceId; +import datadog.trace.bootstrap.instrumentation.api.Tags; import java.util.Map; public interface CoreSpan> { @@ -76,6 +77,16 @@ public interface CoreSpan> { boolean isKind(SpanKindFilter filter); + /** + * Returns the {@code span.kind} tag value as a String, or {@code null} if not set. Default + * implementation reads the tag map; {@link DDSpan} overrides to use a cached ordinal that + * resolves via a small lookup array, skipping the tag-map lookup on the hot path. + */ + default String getSpanKindString() { + Object v = unsafeGetTag(Tags.SPAN_KIND); + return v == null ? null : v.toString(); + } + CharSequence getType(); /** diff --git a/dd-trace-core/src/main/java/datadog/trace/core/DDSpan.java b/dd-trace-core/src/main/java/datadog/trace/core/DDSpan.java index 33206b491b8..c9a15901c03 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/DDSpan.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/DDSpan.java @@ -966,6 +966,11 @@ public boolean isKind(SpanKindFilter filter) { return filter.matches(context.getSpanKindOrdinal()); } + @Override + public String getSpanKindString() { + return context.getSpanKindString(); + } + @Override public void copyPropagationAndBaggage(final AgentSpan source) { if (source instanceof DDSpan) { diff --git a/dd-trace-core/src/main/java/datadog/trace/core/monitor/HealthMetrics.java b/dd-trace-core/src/main/java/datadog/trace/core/monitor/HealthMetrics.java index 33e26267eaa..e506732777f 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/monitor/HealthMetrics.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/monitor/HealthMetrics.java @@ -105,6 +105,15 @@ public void onStatsAggregateDropped() {} */ public void onStatsInboxFull() {} + /** + * Reports a batch of {@code count} tag values collapsed into the {@code blocked_by_tracer} + * sentinel for {@code tag} during the just-completed reporting cycle (per-tag cardinality budget + * exhausted, or per-value length cap exceeded). Called from the aggregator thread once per + * affected tag at cycle reset, so the implementation can do a single counter update rather than + * one per blocked value. + */ + public void onTagCardinalityBlocked(String[] statsDTag, long count) {} + /** * @return Human-readable summary of the current health metrics. */ diff --git a/dd-trace-core/src/main/java/datadog/trace/core/monitor/TracerHealthMetrics.java b/dd-trace-core/src/main/java/datadog/trace/core/monitor/TracerHealthMetrics.java index 2716d19e967..f9c76ff0766 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/monitor/TracerHealthMetrics.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/monitor/TracerHealthMetrics.java @@ -31,6 +31,7 @@ public class TracerHealthMetrics extends HealthMetrics implements AutoCloseable httpStatus -> new String[] {"status:" + httpStatus}; private static final String[] NO_TAGS = new String[0]; + private static final String[] COLLAPSED_WHOLE_KEY_TAGS = new String[] {"collapsed:whole_key"}; private static final String[] STATUS_OK_TAGS = STATUS_TAGS.apply(200); private final RadixTreeCache statusTagsCache = new RadixTreeCache<>(16, 32, STATUS_TAGS, 200, 400); @@ -372,6 +373,7 @@ public void onClientStatErrorReceived() { @Override public void onStatsAggregateDropped() { statsAggregateDropped.increment(); + statsd.count("datadog.tracer.stats.collapsed_spans", 1, COLLAPSED_WHOLE_KEY_TAGS); } @Override @@ -379,6 +381,11 @@ public void onStatsInboxFull() { statsInboxFull.increment(); } + @Override + public void onTagCardinalityBlocked(String[] statsDTag, long count) { + statsd.count("datadog.tracer.stats.collapsed_spans", count, statsDTag); + } + @Override public void close() { if (null != cancellation) { diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/metrics/ConflatingMetricAggregatorTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/metrics/ClientStatsAggregatorTest.groovy similarity index 92% rename from dd-trace-core/src/test/groovy/datadog/trace/common/metrics/ConflatingMetricAggregatorTest.groovy rename to dd-trace-core/src/test/groovy/datadog/trace/common/metrics/ClientStatsAggregatorTest.groovy index 00bd706b8fb..2f409d7baa5 100644 --- a/dd-trace-core/src/test/groovy/datadog/trace/common/metrics/ConflatingMetricAggregatorTest.groovy +++ b/dd-trace-core/src/test/groovy/datadog/trace/common/metrics/ClientStatsAggregatorTest.groovy @@ -18,7 +18,11 @@ import java.util.concurrent.TimeoutException import java.util.function.Supplier import spock.lang.Shared -class ConflatingMetricAggregatorTest extends DDSpecification { +class ClientStatsAggregatorTest extends DDSpecification { + + def setup() { + AggregateEntry.resetCardinalityHandlers() + } static Set empty = new HashSet<>() @@ -35,7 +39,7 @@ class ConflatingMetricAggregatorTest extends DDSpecification { DDAgentFeaturesDiscovery features = Mock(DDAgentFeaturesDiscovery) features.supportsMetrics() >> true WellKnownTags wellKnownTags = new WellKnownTags("runtimeid", "hostname", "env", "service", "version", "language") - ConflatingMetricsAggregator aggregator = new ConflatingMetricsAggregator( + ClientStatsAggregator aggregator = new ClientStatsAggregator( wellKnownTags, empty, features, @@ -65,7 +69,7 @@ class ConflatingMetricAggregatorTest extends DDSpecification { DDAgentFeaturesDiscovery features = Mock(DDAgentFeaturesDiscovery) features.supportsMetrics() >> true WellKnownTags wellKnownTags = new WellKnownTags("runtimeid", "hostname", "env", "service", "version", "language") - ConflatingMetricsAggregator aggregator = new ConflatingMetricsAggregator( + ClientStatsAggregator aggregator = new ClientStatsAggregator( wellKnownTags, [ignoredResourceName].toSet(), features, @@ -103,7 +107,7 @@ class ConflatingMetricAggregatorTest extends DDSpecification { DDAgentFeaturesDiscovery features = Mock(DDAgentFeaturesDiscovery) features.supportsMetrics() >> true features.peerTags() >> [] - ConflatingMetricsAggregator aggregator = new ConflatingMetricsAggregator(empty, + ClientStatsAggregator aggregator = new ClientStatsAggregator(empty, features, HealthMetrics.NO_OP, sink, writer, 10, queueSize, reportingInterval, SECONDS, false) aggregator.start() @@ -151,7 +155,7 @@ class ConflatingMetricAggregatorTest extends DDSpecification { DDAgentFeaturesDiscovery features = Mock(DDAgentFeaturesDiscovery) features.supportsMetrics() >> true features.peerTags() >> [] - ConflatingMetricsAggregator aggregator = new ConflatingMetricsAggregator(empty, + ClientStatsAggregator aggregator = new ClientStatsAggregator(empty, features, HealthMetrics.NO_OP, sink, writer, 10, queueSize, reportingInterval, SECONDS, false) aggregator.start() @@ -199,7 +203,7 @@ class ConflatingMetricAggregatorTest extends DDSpecification { DDAgentFeaturesDiscovery features = Mock(DDAgentFeaturesDiscovery) features.supportsMetrics() >> true features.peerTags() >> [] - ConflatingMetricsAggregator aggregator = new ConflatingMetricsAggregator(empty, + ClientStatsAggregator aggregator = new ClientStatsAggregator(empty, features, HealthMetrics.NO_OP, sink, writer, 10, queueSize, reportingInterval, SECONDS, true) aggregator.start() @@ -259,46 +263,34 @@ class ConflatingMetricAggregatorTest extends DDSpecification { "client" | "GET" | "/external/api" | true } - def "should create bucket for each set of peer tags"() { + def "should create separate buckets for distinct peer tag values"() { + // Peer-tag NAMES are configured per-tracer and stable for the duration of a trace publish; + // peer-tag VALUES vary per-span. Two spans with the same names but different values should + // produce two distinct aggregate buckets. setup: - // Peer-tag schema is reconciled with feature discovery once per reporting cycle (on the - // aggregator thread, in the post-report hook), not per-span on the producer. Drive two - // reporting cycles with different peerTags() configurations to verify the aggregator buckets - // each cycle by the schema that was current at publish time. MetricWriter writer = Mock(MetricWriter) Sink sink = Stub(Sink) DDAgentFeaturesDiscovery features = Mock(DDAgentFeaturesDiscovery) features.supportsMetrics() >> true - features.peerTags() >>> [["country"], ["country", "georegion"]] - // Bump the discovered state hash so reconcile during report cycle 1 sees a mismatch and - // rebuilds the schema for span 2. Three calls: bootstrap (span1's publish), reconcile-during- - // report-1 (mismatch -> rebuild + 2nd peerTags() call), reconcile-during-report-2 (no change). - features.state() >>> ["state-1", "state-2", "state-2"] - ConflatingMetricsAggregator aggregator = new ConflatingMetricsAggregator(empty, + features.peerTags() >> ["country", "georegion"] + ClientStatsAggregator aggregator = new ClientStatsAggregator(empty, features, HealthMetrics.NO_OP, sink, writer, 10, queueSize, reportingInterval, SECONDS, false) aggregator.start() - when: "cycle 1 -- peerTags=[country]" - CountDownLatch latch1 = new CountDownLatch(1) + when: + CountDownLatch latch = new CountDownLatch(1) aggregator.publish([ new SimpleSpan("service", "operation", "resource", "type", true, false, false, 0, 100, HTTP_OK) - .setTag(SPAN_KIND, "client").setTag("country", "france").setTag("georegion", "europe") - ]) - aggregator.report() - def cycle1Triggered = latch1.await(2, SECONDS) - - and: "cycle 2 -- reconcile picks up peerTags=[country, georegion]" - CountDownLatch latch2 = new CountDownLatch(1) - aggregator.publish([ + .setTag(SPAN_KIND, "client").setTag("country", "france").setTag("georegion", "europe"), new SimpleSpan("service", "operation", "resource", "type", true, false, false, 0, 100, HTTP_OK) - .setTag(SPAN_KIND, "client").setTag("country", "france").setTag("georegion", "europe") + .setTag(SPAN_KIND, "client").setTag("country", "germany").setTag("georegion", "europe") ]) aggregator.report() - def cycle2Triggered = latch2.await(2, SECONDS) + def latchTriggered = latch.await(2, SECONDS) then: - cycle1Triggered - cycle2Triggered + latchTriggered + 1 * writer.startBucket(2, _, _) 1 * writer.add({ AggregateEntryTestUtils.equals(it, AggregateEntryTestUtils.of( @@ -311,7 +303,7 @@ class ConflatingMetricAggregatorTest extends DDSpecification { false, false, "client", - [UTF8BytesString.create("country:france")], + [UTF8BytesString.create("country:france"), UTF8BytesString.create("georegion:europe")], null, null, null @@ -331,7 +323,7 @@ class ConflatingMetricAggregatorTest extends DDSpecification { false, false, "client", - [UTF8BytesString.create("country:france"), UTF8BytesString.create("georegion:europe")], + [UTF8BytesString.create("country:germany"), UTF8BytesString.create("georegion:europe")], null, null, null @@ -339,7 +331,7 @@ class ConflatingMetricAggregatorTest extends DDSpecification { }) >> { AggregateEntry e -> assert e.getHitCount() == 1 && e.getTopLevelCount() == 0 && e.getDuration() == 100 } - 2 * writer.finishBucket() >> { latch1.countDown(); latch2.countDown() } + 1 * writer.finishBucket() >> { latch.countDown() } cleanup: aggregator.close() @@ -352,7 +344,7 @@ class ConflatingMetricAggregatorTest extends DDSpecification { DDAgentFeaturesDiscovery features = Mock(DDAgentFeaturesDiscovery) features.supportsMetrics() >> true features.peerTags() >> ["peer.hostname", "_dd.base_service"] - ConflatingMetricsAggregator aggregator = new ConflatingMetricsAggregator(empty, + ClientStatsAggregator aggregator = new ClientStatsAggregator(empty, features, HealthMetrics.NO_OP, sink, writer, 10, queueSize, reportingInterval, SECONDS, false) aggregator.start() @@ -407,7 +399,7 @@ class ConflatingMetricAggregatorTest extends DDSpecification { DDAgentFeaturesDiscovery features = Mock(DDAgentFeaturesDiscovery) features.supportsMetrics() >> true features.peerTags() >> [] - ConflatingMetricsAggregator aggregator = new ConflatingMetricsAggregator(empty, features, HealthMetrics.NO_OP, + ClientStatsAggregator aggregator = new ClientStatsAggregator(empty, features, HealthMetrics.NO_OP, sink, writer, 10, queueSize, reportingInterval, SECONDS, false) aggregator.start() @@ -461,7 +453,7 @@ class ConflatingMetricAggregatorTest extends DDSpecification { DDAgentFeaturesDiscovery features = Mock(DDAgentFeaturesDiscovery) features.supportsMetrics() >> true features.peerTags() >> [] - ConflatingMetricsAggregator aggregator = new ConflatingMetricsAggregator(empty, + ClientStatsAggregator aggregator = new ClientStatsAggregator(empty, features, HealthMetrics.NO_OP, sink, writer, 10, queueSize, reportingInterval, SECONDS, false) long duration = 100 List trace = [ @@ -537,7 +529,7 @@ class ConflatingMetricAggregatorTest extends DDSpecification { DDAgentFeaturesDiscovery features = Mock(DDAgentFeaturesDiscovery) features.supportsMetrics() >> true features.peerTags() >> [] - ConflatingMetricsAggregator aggregator = new ConflatingMetricsAggregator(empty, + ClientStatsAggregator aggregator = new ClientStatsAggregator(empty, features, HealthMetrics.NO_OP, sink, writer, 10, queueSize, reportingInterval, SECONDS, true) aggregator.start() @@ -672,7 +664,7 @@ class ConflatingMetricAggregatorTest extends DDSpecification { DDAgentFeaturesDiscovery features = Mock(DDAgentFeaturesDiscovery) features.supportsMetrics() >> true features.peerTags() >> [] - ConflatingMetricsAggregator aggregator = new ConflatingMetricsAggregator(empty, + ClientStatsAggregator aggregator = new ClientStatsAggregator(empty, features, HealthMetrics.NO_OP, sink, writer, 10, queueSize, reportingInterval, SECONDS, true) aggregator.start() @@ -795,7 +787,7 @@ class ConflatingMetricAggregatorTest extends DDSpecification { DDAgentFeaturesDiscovery features = Mock(DDAgentFeaturesDiscovery) features.supportsMetrics() >> true features.peerTags() >> [] - ConflatingMetricsAggregator aggregator = new ConflatingMetricsAggregator(empty, + ClientStatsAggregator aggregator = new ClientStatsAggregator(empty, features, HealthMetrics.NO_OP, sink, writer, 10, queueSize, reportingInterval, SECONDS, true) aggregator.start() @@ -869,7 +861,7 @@ class ConflatingMetricAggregatorTest extends DDSpecification { DDAgentFeaturesDiscovery features = Mock(DDAgentFeaturesDiscovery) features.supportsMetrics() >> true features.peerTags() >> [] - ConflatingMetricsAggregator aggregator = new ConflatingMetricsAggregator(empty, + ClientStatsAggregator aggregator = new ClientStatsAggregator(empty, features, HealthMetrics.NO_OP, sink, writer, 10, queueSize, reportingInterval, SECONDS, false) aggregator.start() @@ -945,7 +937,7 @@ class ConflatingMetricAggregatorTest extends DDSpecification { DDAgentFeaturesDiscovery features = Mock(DDAgentFeaturesDiscovery) features.supportsMetrics() >> true features.peerTags() >> [] - ConflatingMetricsAggregator aggregator = new ConflatingMetricsAggregator(empty, + ClientStatsAggregator aggregator = new ClientStatsAggregator(empty, features, HealthMetrics.NO_OP, sink, writer, maxAggregates, queueSize, reportingInterval, SECONDS, false) long duration = 100 aggregator.start() @@ -1015,7 +1007,7 @@ class ConflatingMetricAggregatorTest extends DDSpecification { features.supportsMetrics() >> true features.peerTags() >> [] HealthMetrics healthMetrics = Mock(HealthMetrics) - ConflatingMetricsAggregator aggregator = new ConflatingMetricsAggregator(empty, + ClientStatsAggregator aggregator = new ClientStatsAggregator(empty, features, healthMetrics, sink, writer, maxAggregates, queueSize, reportingInterval, SECONDS, false) long duration = 100 aggregator.start() @@ -1049,7 +1041,7 @@ class ConflatingMetricAggregatorTest extends DDSpecification { features.supportsMetrics() >> true features.peerTags() >> [] HealthMetrics healthMetrics = Mock(HealthMetrics) - ConflatingMetricsAggregator aggregator = new ConflatingMetricsAggregator(empty, + ClientStatsAggregator aggregator = new ClientStatsAggregator(empty, features, healthMetrics, sink, writer, maxAggregates, queueSize, reportingInterval, SECONDS, false) aggregator.start() @@ -1094,7 +1086,7 @@ class ConflatingMetricAggregatorTest extends DDSpecification { DDAgentFeaturesDiscovery features = Mock(DDAgentFeaturesDiscovery) features.supportsMetrics() >> true features.peerTags() >> [] - ConflatingMetricsAggregator aggregator = new ConflatingMetricsAggregator(empty, + ClientStatsAggregator aggregator = new ClientStatsAggregator(empty, features, HealthMetrics.NO_OP, sink, writer, maxAggregates, queueSize, reportingInterval, SECONDS, false) long duration = 100 aggregator.start() @@ -1198,7 +1190,7 @@ class ConflatingMetricAggregatorTest extends DDSpecification { DDAgentFeaturesDiscovery features = Mock(DDAgentFeaturesDiscovery) features.supportsMetrics() >> true features.peerTags() >> [] - ConflatingMetricsAggregator aggregator = new ConflatingMetricsAggregator(empty, + ClientStatsAggregator aggregator = new ClientStatsAggregator(empty, features, HealthMetrics.NO_OP, sink, writer, maxAggregates, queueSize, reportingInterval, SECONDS, false) long duration = 100 aggregator.start() @@ -1258,7 +1250,7 @@ class ConflatingMetricAggregatorTest extends DDSpecification { DDAgentFeaturesDiscovery features = Mock(DDAgentFeaturesDiscovery) features.supportsMetrics() >> true features.peerTags() >> [] - ConflatingMetricsAggregator aggregator = new ConflatingMetricsAggregator(empty, + ClientStatsAggregator aggregator = new ClientStatsAggregator(empty, features, HealthMetrics.NO_OP, sink, writer, maxAggregates, queueSize, 1, SECONDS, false) long duration = 100 aggregator.start() @@ -1309,7 +1301,7 @@ class ConflatingMetricAggregatorTest extends DDSpecification { DDAgentFeaturesDiscovery features = Mock(DDAgentFeaturesDiscovery) features.supportsMetrics() >> true features.peerTags() >> [] - ConflatingMetricsAggregator aggregator = new ConflatingMetricsAggregator(empty, + ClientStatsAggregator aggregator = new ClientStatsAggregator(empty, features, HealthMetrics.NO_OP, sink, writer, maxAggregates, queueSize, 1, SECONDS, false) long duration = 100 aggregator.start() @@ -1340,7 +1332,7 @@ class ConflatingMetricAggregatorTest extends DDSpecification { MetricWriter writer = Mock(MetricWriter) Sink sink = Stub(Sink) DDAgentFeaturesDiscovery features = Mock(DDAgentFeaturesDiscovery) - ConflatingMetricsAggregator aggregator = new ConflatingMetricsAggregator(empty, + ClientStatsAggregator aggregator = new ClientStatsAggregator(empty, features, HealthMetrics.NO_OP, sink, writer, maxAggregates, queueSize, 1, SECONDS, false) aggregator.start() @@ -1362,7 +1354,7 @@ class ConflatingMetricAggregatorTest extends DDSpecification { DDAgentFeaturesDiscovery features = Mock(DDAgentFeaturesDiscovery) features.supportsMetrics() >> false features.peerTags() >> [] - ConflatingMetricsAggregator aggregator = new ConflatingMetricsAggregator(empty, + ClientStatsAggregator aggregator = new ClientStatsAggregator(empty, features, HealthMetrics.NO_OP, sink, writer, 10, queueSize, 200, MILLISECONDS, false) final spans = [ new SimpleSpan("service", "operation", "resource", "type", false, true, false, 0, 10, HTTP_OK) @@ -1394,7 +1386,7 @@ class ConflatingMetricAggregatorTest extends DDSpecification { Sink sink = Stub(Sink) DDAgentFeaturesDiscovery features = Mock(DDAgentFeaturesDiscovery) features.supportsMetrics() >> true - ConflatingMetricsAggregator aggregator = new ConflatingMetricsAggregator(empty, + ClientStatsAggregator aggregator = new ClientStatsAggregator(empty, features, HealthMetrics.NO_OP, sink, writer, maxAggregates, queueSize, 1, SECONDS, false) when: @@ -1427,7 +1419,7 @@ class ConflatingMetricAggregatorTest extends DDSpecification { Sink sink = Stub(Sink) DDAgentFeaturesDiscovery features = Mock(DDAgentFeaturesDiscovery) features.supportsMetrics() >> true - ConflatingMetricsAggregator aggregator = new ConflatingMetricsAggregator(empty, + ClientStatsAggregator aggregator = new ClientStatsAggregator(empty, features, HealthMetrics.NO_OP, sink, writer, 10, queueSize, reportingInterval, SECONDS, false) aggregator.start() @@ -1476,7 +1468,7 @@ class ConflatingMetricAggregatorTest extends DDSpecification { DDAgentFeaturesDiscovery features = Mock(DDAgentFeaturesDiscovery) features.supportsMetrics() >> true features.peerTags() >> [] - ConflatingMetricsAggregator aggregator = new ConflatingMetricsAggregator(empty, + ClientStatsAggregator aggregator = new ClientStatsAggregator(empty, features, HealthMetrics.NO_OP, sink, writer, 10, queueSize, reportingInterval, SECONDS, false) aggregator.start() @@ -1533,7 +1525,7 @@ class ConflatingMetricAggregatorTest extends DDSpecification { DDAgentFeaturesDiscovery features = Mock(DDAgentFeaturesDiscovery) features.supportsMetrics() >> true features.peerTags() >> [] - ConflatingMetricsAggregator aggregator = new ConflatingMetricsAggregator(empty, + ClientStatsAggregator aggregator = new ClientStatsAggregator(empty, features, HealthMetrics.NO_OP, sink, writer, 10, queueSize, reportingInterval, SECONDS, true) aggregator.start() @@ -1630,7 +1622,7 @@ class ConflatingMetricAggregatorTest extends DDSpecification { DDAgentFeaturesDiscovery features = Mock(DDAgentFeaturesDiscovery) features.supportsMetrics() >> true features.peerTags() >> [] - ConflatingMetricsAggregator aggregator = new ConflatingMetricsAggregator(empty, + ClientStatsAggregator aggregator = new ClientStatsAggregator(empty, features, HealthMetrics.NO_OP, sink, writer, 10, queueSize, reportingInterval, SECONDS, false) aggregator.start() @@ -1709,14 +1701,14 @@ class ConflatingMetricAggregatorTest extends DDSpecification { aggregator.close() } - def reportAndWaitUntilEmpty(ConflatingMetricsAggregator aggregator) { + def reportAndWaitUntilEmpty(ClientStatsAggregator aggregator) { waitUntilEmpty(aggregator) aggregator.report() waitUntilEmpty(aggregator) } - def waitUntilEmpty(ConflatingMetricsAggregator aggregator) { + def waitUntilEmpty(ClientStatsAggregator aggregator) { int i = 0 while (!aggregator.inbox.isEmpty() && i++ < 100) { Thread.sleep(10) diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/metrics/FootprintForkedTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/metrics/FootprintForkedTest.groovy index eceedeb1935..86a91c23b3f 100644 --- a/dd-trace-core/src/test/groovy/datadog/trace/common/metrics/FootprintForkedTest.groovy +++ b/dd-trace-core/src/test/groovy/datadog/trace/common/metrics/FootprintForkedTest.groovy @@ -37,7 +37,7 @@ class FootprintForkedTest extends DDSpecification { it.supportsMetrics() >> true it.peerTags() >> [] } - ConflatingMetricsAggregator aggregator = new ConflatingMetricsAggregator( + ClientStatsAggregator aggregator = new ClientStatsAggregator( new WellKnownTags("runtimeid","hostname", "env", "service", "version","language"), [].toSet() as Set, features, diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/metrics/MetricsAggregatorFactoryTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/metrics/MetricsAggregatorFactoryTest.groovy index 07f246bf9a9..dc9eb86fde3 100644 --- a/dd-trace-core/src/test/groovy/datadog/trace/common/metrics/MetricsAggregatorFactoryTest.groovy +++ b/dd-trace-core/src/test/groovy/datadog/trace/common/metrics/MetricsAggregatorFactoryTest.groovy @@ -28,6 +28,6 @@ class MetricsAggregatorFactoryTest extends DDSpecification { expect: def aggregator = MetricsAggregatorFactory.createMetricsAggregator(config, sco, HealthMetrics.NO_OP, ) - assert aggregator instanceof ConflatingMetricsAggregator + assert aggregator instanceof ClientStatsAggregator } } diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/metrics/SerializingMetricWriterTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/metrics/SerializingMetricWriterTest.groovy index cc0880bc30a..080a77238e4 100644 --- a/dd-trace-core/src/test/groovy/datadog/trace/common/metrics/SerializingMetricWriterTest.groovy +++ b/dd-trace-core/src/test/groovy/datadog/trace/common/metrics/SerializingMetricWriterTest.groovy @@ -181,7 +181,7 @@ class SerializingMetricWriterTest extends DDSpecification { def content = [e] - ValidatingSink sink = new ValidatingSink(wellKnownTags, startTime, duration, content) + ValidatingSink sink = new ValidatingSink(wellKnownTags, startTime, duration, content, shaCommit) SerializingMetricWriter writer = new SerializingMetricWriter(wellKnownTags, sink, 128, gitInfoProvider) when: @@ -231,13 +231,15 @@ class SerializingMetricWriterTest extends DDSpecification { private final long duration private boolean validated = false private List content + private final String expectedGitCommitSha ValidatingSink(WellKnownTags wellKnownTags, long startTimeNanos, long duration, - List content) { + List content, String expectedGitCommitSha = null) { this.wellKnownTags = wellKnownTags this.startTimeNanos = startTimeNanos this.duration = duration this.content = content + this.expectedGitCommitSha = expectedGitCommitSha } @Override @@ -248,7 +250,7 @@ class SerializingMetricWriterTest extends DDSpecification { void accept(int messageCount, ByteBuffer buffer) { MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffer) int mapSize = unpacker.unpackMapHeader() - String gitCommitSha = GitInfoProvider.INSTANCE.getGitInfo()?.getCommit()?.getSha() + String gitCommitSha = expectedGitCommitSha assert mapSize == (7 + (Config.get().isExperimentalPropagateProcessTagsEnabled() ? 1 : 0) + (gitCommitSha != null ? 1 : 0)) assert unpacker.unpackString() == "RuntimeID" @@ -283,12 +285,13 @@ class SerializingMetricWriterTest extends DDSpecification { int statCount = unpacker.unpackArrayHeader() assert statCount == content.size() for (AggregateEntry entry : content) { + // counters now live on AggregateEntry int metricMapSize = unpacker.unpackMapHeader() // Calculate expected map size based on optional fields - boolean hasHttpMethod = entry.getHttpMethod() != null - boolean hasHttpEndpoint = entry.getHttpEndpoint() != null - boolean hasServiceSource = entry.getServiceSource() != null - boolean hasGrpcStatusCode = entry.getGrpcStatusCode() != null + boolean hasHttpMethod = entry.hasHttpMethod() + boolean hasHttpEndpoint = entry.hasHttpEndpoint() + boolean hasServiceSource = entry.hasServiceSource() + boolean hasGrpcStatusCode = entry.hasGrpcStatusCode() int expectedMapSize = 15 + (hasServiceSource ? 1 : 0) + (hasHttpMethod ? 1 : 0) + (hasHttpEndpoint ? 1 : 0) + (hasGrpcStatusCode ? 1 : 0) assert metricMapSize == expectedMapSize int elementCount = 0 diff --git a/dd-trace-core/src/test/java/datadog/trace/common/metrics/AggregateEntryTest.java b/dd-trace-core/src/test/java/datadog/trace/common/metrics/AggregateEntryTest.java index 7fd767533c7..dd70083d9d4 100644 --- a/dd-trace-core/src/test/java/datadog/trace/common/metrics/AggregateEntryTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/common/metrics/AggregateEntryTest.java @@ -1,10 +1,11 @@ package datadog.trace.common.metrics; +import static datadog.trace.bootstrap.instrumentation.api.UTF8BytesString.EMPTY; import static datadog.trace.common.metrics.AggregateEntry.ERROR_TAG; import static datadog.trace.common.metrics.AggregateEntry.TOP_LEVEL_TAG; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertTrue; import datadog.metrics.agent.AgentMeter; @@ -13,10 +14,16 @@ import datadog.metrics.impl.MonitoringImpl; import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; class AggregateEntryTest { + @BeforeEach + void resetCardinalityHandlers() { + AggregateEntry.resetCardinalityHandlers(); + } + @BeforeAll static void initAgentMeter() { // recordOneDuration -> Histogram.accept needs AgentMeter to be initialized. @@ -84,82 +91,46 @@ void okAndErrorLatenciesTrackedSeparately() { } @Test - void testUtilsEqualsIsConsistentWithHashCodeAcrossDifferentSchemaLayouts() { - // Contract test for AggregateEntryTestUtils (the test-side equality helper used by Spock - // mock matchers). Production AggregateEntry has no equals override. - // - // Two entries with identical encoded peerTags but different raw layouts must not be equal, - // because hashOf folds in the raw arrays. Equality on the encoded list would let them - // collapse while their hashCodes differ -- violating the contract. - // - // A: schema ["a","b"], values [null,"x"] -> encoded ["b:x"] - // B: schema ["b","c"], values ["x",null] -> encoded ["b:x"] - AggregateEntry a = - AggregateEntryTestUtils.forSnapshot( - snapshotWithPeerTags(new String[] {"a", "b"}, new String[] {null, "x"})); - AggregateEntry b = - AggregateEntryTestUtils.forSnapshot( - snapshotWithPeerTags(new String[] {"b", "c"}, new String[] {"x", null})); - - // Sanity: same encoded peer tags, despite different raw layout. - assertEquals(a.getPeerTags(), b.getPeerTags()); - - // Different raw layouts -> entries must not be equal via the test helper. - assertFalse(AggregateEntryTestUtils.equals(a, b)); - // And different hashCodes (matching the inequality). - assertNotEquals(AggregateEntryTestUtils.hashCode(a), AggregateEntryTestUtils.hashCode(b)); + void absentOptionalFieldsResolveToEmptySentinel() { + // serviceSource / httpMethod / httpEndpoint / grpcStatusCode = null on input -> EMPTY on the + // entry. EMPTY is the universal "absent" sentinel; SerializingMetricWriter and equality use + // identity comparison against it. + AggregateEntry entry = newEntry(); + assertSame(EMPTY, entry.getServiceSource()); + assertSame(EMPTY, entry.getHttpMethod()); + assertSame(EMPTY, entry.getHttpEndpoint()); + assertSame(EMPTY, entry.getGrpcStatusCode()); } @Test - void testUtilsEqualEntriesHaveEqualHashCodes() { - AggregateEntry a = - AggregateEntryTestUtils.forSnapshot( - snapshotWithPeerTags(new String[] {"a", "b"}, new String[] {null, "x"})); - AggregateEntry b = - AggregateEntryTestUtils.forSnapshot( - snapshotWithPeerTags(new String[] {"a", "b"}, new String[] {null, "x"})); - - assertTrue(AggregateEntryTestUtils.equals(a, b)); - assertEquals(AggregateEntryTestUtils.hashCode(a), AggregateEntryTestUtils.hashCode(b)); - } - - private static SpanSnapshot snapshotWithPeerTags(String[] names, String[] values) { - return new SpanSnapshot( - "resource", - "svc", - "op", - null, - "type", - (short) 200, - false, - true, - "client", - PeerTagSchema.testSchema(names), - values, - null, - null, - null, - 0L); - } - - private static AggregateEntry newEntry() { - SpanSnapshot snapshot = - new SpanSnapshot( + void presentOptionalFieldsCarryTheirValue() { + AggregateEntry entry = + AggregateEntryTestUtils.of( "resource", "svc", "op", - null, + "src", "type", - (short) 200, + 200, false, true, "client", null, - null, - null, - null, - null, - 0L); - return AggregateEntryTestUtils.forSnapshot(snapshot); + "GET", + "/api/v1/foo", + "0"); + assertNotSame(EMPTY, entry.getServiceSource()); + assertNotSame(EMPTY, entry.getHttpMethod()); + assertNotSame(EMPTY, entry.getHttpEndpoint()); + assertNotSame(EMPTY, entry.getGrpcStatusCode()); + assertEquals("src", entry.getServiceSource().toString()); + assertEquals("GET", entry.getHttpMethod().toString()); + assertEquals("/api/v1/foo", entry.getHttpEndpoint().toString()); + assertEquals("0", entry.getGrpcStatusCode().toString()); + } + + private static AggregateEntry newEntry() { + return AggregateEntryTestUtils.of( + "resource", "svc", "op", null, "type", 200, false, true, "client", null, null, null, null); } } diff --git a/dd-trace-core/src/test/java/datadog/trace/common/metrics/AggregateEntryTestUtils.java b/dd-trace-core/src/test/java/datadog/trace/common/metrics/AggregateEntryTestUtils.java index ed6fd5a3a7e..a8ced924c3e 100644 --- a/dd-trace-core/src/test/java/datadog/trace/common/metrics/AggregateEntryTestUtils.java +++ b/dd-trace-core/src/test/java/datadog/trace/common/metrics/AggregateEntryTestUtils.java @@ -1,7 +1,7 @@ package datadog.trace.common.metrics; import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString; -import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.Objects; import javax.annotation.Nullable; @@ -10,34 +10,26 @@ * Test-side helpers for {@link AggregateEntry}: a positional-args fixture factory plus a field-wise * equality contract for use with Spock mock argument matchers and JUnit assertions. Lives in {@code * src/test} so the production class stays free of test-only API; same {@code - * datadog.trace.common.metrics} package so this helper can reach package-private fields and - * constructors. + * datadog.trace.common.metrics} package so this helper can reach package-private members. * *

    Production {@code AggregateEntry} intentionally has no {@code equals}/{@code hashCode} - * override -- {@link AggregateTable} bucketing goes through {@link AggregateEntry#matches} keyed on - * {@link AggregateEntry#keyHash}, and no production code path invokes {@link Object#equals}. + * override -- {@link AggregateTable} bucketing goes through the {@code Canonical} scratch buffer + * keyed on {@link AggregateEntry#keyHash}, and no production code path invokes {@link + * Object#equals}. * - *

    The equality helper compares the raw {@code peerTagNames}/{@code peerTagValues} arrays (not - * the encoded {@code peerTags} list) so it stays consistent with {@link AggregateEntry#hashOf}, - * which folds in raw arrays via {@link PeerTagSchema#hashCode()} and {@link - * Arrays#hashCode(Object[])}. Comparing the encoded list would let two entries with different raw - * layouts (e.g. tag {@code "b"} at index 1 in schema A vs index 0 in schema B, with matching - * values) collapse to the same encoded form -- a real bug surfaced during PR #11382 review. + *

    Peer tags live as a single pre-encoded {@code List} on the entry + * (canonicalization through {@link PeerTagSchema#register} already collapsed identical values), so + * equality compares the list directly. The hash side (computed in {@link AggregateEntry#hashOf}) + * folds in the encoded list, so the contract stays consistent. */ public final class AggregateEntryTestUtils { private AggregateEntryTestUtils() {} /** - * Builds an {@link AggregateEntry} from the same positional shape the prior {@code new - * MetricKey(...)} took. Accepts a pre-encoded {@code List} of {@code - * "name:value"} peer tags and recovers the parallel-array {@code (names, values)} form by - * splitting on the {@code ':'} delimiter. - * - *

    Test-only. The split is at the first {@code ':'}, so peer-tag values - * containing a colon (URLs, IPv6 addresses, {@code service:env} patterns) will be silently - * misparsed and the recovered (name, value) pair will be wrong. Keep test data colon-free in - * peer-tag values, or wire a production-style snapshot through {@link #forSnapshot(SpanSnapshot)} - * directly instead. + * Builds an {@link AggregateEntry} from positional args. Bypasses the cardinality handlers so + * tests can create expected values without mutating shared handler state. Content-equal entries + * from {@link AggregateEntry.Canonical#createEntry} still compare equal via {@link + * #equals(AggregateEntry, AggregateEntry)}. */ public static AggregateEntry of( CharSequence resource, @@ -53,49 +45,48 @@ public static AggregateEntry of( @Nullable CharSequence httpMethod, @Nullable CharSequence httpEndpoint, @Nullable CharSequence grpcStatusCode) { - PeerTagSchema schema = null; - String[] values = null; - if (peerTags != null && !peerTags.isEmpty()) { - String[] names = new String[peerTags.size()]; - values = new String[peerTags.size()]; - int i = 0; - for (UTF8BytesString t : peerTags) { - String s = t.toString(); - int colon = s.indexOf(':'); - names[i] = colon < 0 ? s : s.substring(0, colon); - values[i] = colon < 0 ? "" : s.substring(colon + 1); - i++; - } - schema = PeerTagSchema.testSchema(names); - } - SpanSnapshot syntheticSnapshot = - new SpanSnapshot( - resource, - service == null ? null : service.toString(), - operationName, - serviceSource, - type, + UTF8BytesString resourceUtf = AggregateEntry.createUtf8(resource); + UTF8BytesString serviceUtf = AggregateEntry.createUtf8(service); + UTF8BytesString operationNameUtf = AggregateEntry.createUtf8(operationName); + UTF8BytesString serviceSourceUtf = AggregateEntry.createUtf8(serviceSource); + UTF8BytesString typeUtf = AggregateEntry.createUtf8(type); + UTF8BytesString spanKindUtf = AggregateEntry.createUtf8(spanKind); + UTF8BytesString httpMethodUtf = AggregateEntry.createUtf8(httpMethod); + UTF8BytesString httpEndpointUtf = AggregateEntry.createUtf8(httpEndpoint); + UTF8BytesString grpcUtf = AggregateEntry.createUtf8(grpcStatusCode); + List peerTagsList = peerTags == null ? Collections.emptyList() : peerTags; + UTF8BytesString[] peerTagsArr = peerTagsList.toArray(new UTF8BytesString[0]); + long keyHash = + AggregateEntry.hashOf( + resourceUtf, + serviceUtf, + operationNameUtf, + serviceSourceUtf, + typeUtf, + spanKindUtf, + httpMethodUtf, + httpEndpointUtf, + grpcUtf, (short) httpStatusCode, synthetic, traceRoot, - spanKind == null ? null : spanKind.toString(), - schema, - values, - httpMethod == null ? null : httpMethod.toString(), - httpEndpoint == null ? null : httpEndpoint.toString(), - grpcStatusCode == null ? null : grpcStatusCode.toString(), - 0L); - return forSnapshot(syntheticSnapshot); - } - - /** - * Builds an {@link AggregateEntry} from {@code s} by computing its lookup hash via {@link - * AggregateEntry#hashOf(SpanSnapshot)} and calling the package-private constructor directly. - * Production callers route through {@link AggregateTable#findOrInsert} which already has the - * {@code keyHash} on hand; tests rarely do, so this helper hides the second argument. - */ - public static AggregateEntry forSnapshot(SpanSnapshot s) { - return new AggregateEntry(s, AggregateEntry.hashOf(s)); + peerTagsArr, + peerTagsArr.length); + return new AggregateEntry( + keyHash, + resourceUtf, + serviceUtf, + operationNameUtf, + serviceSourceUtf, + typeUtf, + spanKindUtf, + httpMethodUtf, + httpEndpointUtf, + grpcUtf, + (short) httpStatusCode, + synthetic, + traceRoot, + peerTagsList); } /** @@ -114,8 +105,7 @@ public static boolean equals(AggregateEntry a, AggregateEntry b) { && Objects.equals(a.getServiceSource(), b.getServiceSource()) && Objects.equals(a.getType(), b.getType()) && Objects.equals(a.getSpanKind(), b.getSpanKind()) - && Arrays.equals(a.peerTagNames, b.peerTagNames) - && Arrays.equals(a.peerTagValues, b.peerTagValues) + && a.getPeerTags().equals(b.getPeerTags()) && Objects.equals(a.getHttpMethod(), b.getHttpMethod()) && Objects.equals(a.getHttpEndpoint(), b.getHttpEndpoint()) && Objects.equals(a.getGrpcStatusCode(), b.getGrpcStatusCode()); @@ -123,8 +113,8 @@ public static boolean equals(AggregateEntry a, AggregateEntry b) { /** * Stable hash matching {@link #equals(AggregateEntry, AggregateEntry)} -- derived from {@link - * AggregateEntry#keyHash}, which {@link AggregateEntry#hashOf} computes from the same raw fields - * the helper's {@code equals} compares. + * AggregateEntry#keyHash}, which {@link AggregateEntry#hashOf} computes from the same fields the + * helper's {@code equals} compares. */ public static int hashCode(AggregateEntry e) { return e == null ? 0 : (int) e.keyHash; diff --git a/dd-trace-core/src/test/java/datadog/trace/common/metrics/AggregateTableTest.java b/dd-trace-core/src/test/java/datadog/trace/common/metrics/AggregateTableTest.java index 618ead2ab43..05acd57985d 100644 --- a/dd-trace-core/src/test/java/datadog/trace/common/metrics/AggregateTableTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/common/metrics/AggregateTableTest.java @@ -19,6 +19,7 @@ import java.util.Map; import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; class AggregateTableTest { @@ -31,6 +32,15 @@ static void initAgentMeter() { monitoring.newTimer("test.init"); } + @BeforeEach + void resetCardinalityHandlers() { + // AggregateEntry's property handlers are static and accumulate state across tests. Some tests + // in this class (e.g. backToBackEvictionsAllSucceed) drive 40 distinct services, which exceeds + // MetricCardinalityLimits.SERVICE (32) and leaves later tests seeing a shared "blocked" + // canonical for "a"/"b"/"c"-style services -- collapsing distinct snapshots into one entry. + AggregateEntry.resetCardinalityHandlers(); + } + @Test void insertOnMissReturnsNewAggregate() { AggregateTable table = new AggregateTable(8); @@ -337,7 +347,7 @@ SnapshotBuilder peerTags(String... namesAndValues) { names[i] = namesAndValues[2 * i]; values[i] = namesAndValues[2 * i + 1]; } - this.peerTagSchema = PeerTagSchema.testSchema(names); + this.peerTagSchema = new PeerTagSchema(names, PeerTagSchema.NO_STATE); this.peerTagValues = values; return this; } diff --git a/dd-trace-core/src/test/java/datadog/trace/common/metrics/CardinalityHandlerTest.java b/dd-trace-core/src/test/java/datadog/trace/common/metrics/CardinalityHandlerTest.java new file mode 100644 index 00000000000..5a882aba11b --- /dev/null +++ b/dd-trace-core/src/test/java/datadog/trace/common/metrics/CardinalityHandlerTest.java @@ -0,0 +1,260 @@ +package datadog.trace.common.metrics; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertSame; + +import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString; +import org.junit.jupiter.api.Test; + +class CardinalityHandlerTest { + + @Test + void propertyReturnsSameInstanceForRepeatedValueUntilLimit() { + PropertyCardinalityHandler h = new PropertyCardinalityHandler("test", 3); + UTF8BytesString a1 = h.register("a"); + UTF8BytesString a2 = h.register("a"); + assertSame(a1, a2); + assertEquals("a", a1.toString()); + } + + @Test + void propertyOverLimitReturnsBlockedSentinel() { + PropertyCardinalityHandler h = new PropertyCardinalityHandler("test", 2); + UTF8BytesString a = h.register("a"); + UTF8BytesString b = h.register("b"); + UTF8BytesString blocked1 = h.register("c"); + UTF8BytesString blocked2 = h.register("d"); + + assertEquals("tracer_blocked_value", blocked1.toString()); + assertSame(blocked1, blocked2); // same sentinel for all overflow values + assertNotSame(blocked1, a); + assertNotSame(blocked1, b); + } + + @Test + void propertyResetRefreshesBudget() { + PropertyCardinalityHandler h = new PropertyCardinalityHandler("test", 2); + h.register("a"); + h.register("b"); + UTF8BytesString blocked = h.register("c"); + assertEquals("tracer_blocked_value", blocked.toString()); + + h.reset(); + + // After reset, three distinct values fit again. Prior-cycle instances are reused + // (see propertyPriorCycleInstancesAreReusedAcrossReset for the dedicated check); here + // we just confirm that the budget refreshed so values previously blocked now have + // a slot. + UTF8BytesString afterReset = h.register("a"); + assertEquals("a", afterReset.toString()); + UTF8BytesString c = h.register("c"); + assertEquals("c", c.toString()); + UTF8BytesString blockedAgain = h.register("d"); + UTF8BytesString blockedYetAgain = h.register("e"); + assertEquals("tracer_blocked_value", blockedAgain.toString()); + assertSame(blockedAgain, blockedYetAgain); + } + + @Test + void propertyPriorCycleInstancesAreReusedAcrossReset() { + // Dual role: the handler is also a UTF8 cache. Values held in the prior cycle are + // reused on the first registration in the new cycle, so aggregate entries that hold a + // reference to a UTF8BytesString still match on identity after the per-cycle reset. + // This is the cache-survives-reset property the canonical-key lookup depends on. + PropertyCardinalityHandler h = new PropertyCardinalityHandler("test", 4); + UTF8BytesString aBefore = h.register("a"); + UTF8BytesString bBefore = h.register("b"); + + h.reset(); + + assertSame(aBefore, h.register("a")); + assertSame(bBefore, h.register("b")); + // Same-cycle subsequent registration continues to return the reused instance. + assertSame(aBefore, h.register("a")); + } + + @Test + void propertyPriorCycleReuseSurvivesOneResetButNotTwo() { + // Reuse window is one cycle deep -- the handler swaps current/prior on reset, so a + // value last seen two cycles ago is no longer cached and will be re-allocated. + PropertyCardinalityHandler h = new PropertyCardinalityHandler("test", 4); + UTF8BytesString first = h.register("a"); + + h.reset(); + h.reset(); + + UTF8BytesString afterTwoResets = h.register("a"); + assertNotSame(first, afterTwoResets); + assertEquals("a", afterTwoResets.toString()); + } + + @Test + void tagPrefixesValuesAndReusesUnderLimit() { + TagCardinalityHandler h = new TagCardinalityHandler("peer.hostname", 4); + UTF8BytesString first = h.register("host-a"); + UTF8BytesString second = h.register("host-a"); + UTF8BytesString other = h.register("host-b"); + + assertSame(first, second); + assertNotSame(first, other); + assertEquals("peer.hostname:host-a", first.toString()); + assertEquals("peer.hostname:host-b", other.toString()); + } + + @Test + void tagOverLimitReturnsTaggedSentinel() { + TagCardinalityHandler h = new TagCardinalityHandler("peer.service", 1); + h.register("svc-1"); + UTF8BytesString blocked = h.register("svc-2"); + assertEquals("peer.service:tracer_blocked_value", blocked.toString()); + } + + @Test + void tagResetRefreshesBudgetAndSentinelStaysStable() { + TagCardinalityHandler h = new TagCardinalityHandler("x", 1); + h.register("v1"); + UTF8BytesString blockedBefore = h.register("v2"); + h.reset(); + h.register("v1"); + UTF8BytesString blockedAfter = h.register("v2"); + // Both are the same sentinel instance (cacheBlocked is not cleared on reset). + assertSame(blockedBefore, blockedAfter); + } + + @Test + void tagPriorCycleInstancesAreReusedAcrossReset() { + // Mirrors propertyPriorCycleInstancesAreReusedAcrossReset: the pre-built "tag:value" + // UTF8BytesString from the prior cycle is reused on the first registration in the new + // cycle -- no re-concatenation, no re-encoding. + TagCardinalityHandler h = new TagCardinalityHandler("peer.hostname", 4); + UTF8BytesString hostABefore = h.register("host-a"); + UTF8BytesString hostBBefore = h.register("host-b"); + + h.reset(); + + assertSame(hostABefore, h.register("host-a")); + assertSame(hostBBefore, h.register("host-b")); + } + + @Test + void propertyRegisterOfNullReturnsEmpty() { + PropertyCardinalityHandler h = new PropertyCardinalityHandler("test", 4); + // Null input short-circuits to UTF8BytesString.EMPTY -- the universal "absent" sentinel that + // AggregateEntry's optional UTF8 fields use in place of null. + assertSame(UTF8BytesString.EMPTY, h.register(null)); + } + + @Test + void propertyRegisterOfNullDoesNotConsumeBudget() { + PropertyCardinalityHandler h = new PropertyCardinalityHandler("test", 2); + h.register(null); + h.register(null); + h.register(null); + // Three null registrations didn't consume the budget; two real values still fit. + assertEquals("a", h.register("a").toString()); + assertEquals("b", h.register("b").toString()); + // Third real value spills to the blocked sentinel (limit = 2). + assertEquals("tracer_blocked_value", h.register("c").toString()); + } + + @Test + void tagRegisterOfNullReturnsEmpty() { + TagCardinalityHandler h = new TagCardinalityHandler("peer.hostname", 4); + // Null returns EMPTY (no "tag:" prefix applied -- the sentinel is the same EMPTY singleton + // every handler returns for null input). + assertSame(UTF8BytesString.EMPTY, h.register(null)); + } + + @Test + void tagRegisterOfNullDoesNotConsumeBudget() { + TagCardinalityHandler h = new TagCardinalityHandler("peer.hostname", 2); + h.register(null); + h.register(null); + h.register(null); + // Three null registrations didn't consume the budget; two real values still fit. + assertEquals("peer.hostname:a", h.register("a").toString()); + assertEquals("peer.hostname:b", h.register("b").toString()); + // Third real value spills to the blocked sentinel (limit = 2). + assertEquals("peer.hostname:tracer_blocked_value", h.register("c").toString()); + } + + @Test + void propertyResetReturnsBlockedCount() { + PropertyCardinalityHandler h = new PropertyCardinalityHandler("test", 1); + h.register("a"); // within limit + h.register("b"); // blocked + h.register("c"); // blocked + assertEquals(2, h.reset()); + assertEquals(0, h.reset()); // no blocks in the empty new cycle + } + + @Test + void tagResetReturnsBlockedCount() { + TagCardinalityHandler h = new TagCardinalityHandler("peer.hostname", 1); + h.register("a"); // within limit + h.register("b"); // blocked + h.register("c"); // blocked + assertEquals(2, h.reset()); + assertEquals(0, h.reset()); // no blocks in the empty new cycle + } + + // ---- limits-disabled mode (Config flag off): cache size still capped, but over-cap values + // get freshly-allocated UTF8 rather than the blocked sentinel. + + @Test + void propertyOverLimitWithSentinelDisabledReturnsFreshUtf8() { + PropertyCardinalityHandler h = new PropertyCardinalityHandler("test", 2, false); + UTF8BytesString a = h.register("a"); + UTF8BytesString b = h.register("b"); + UTF8BytesString c = h.register("c"); + UTF8BytesString d = h.register("d"); + + // Real values (not the "tracer_blocked_value" sentinel) so the wire format carries them. + assertEquals("c", c.toString()); + assertEquals("d", d.toString()); + // The first two stay cached and identity-stable. + assertSame(a, h.register("a")); + assertSame(b, h.register("b")); + // Over-cap values are NOT cached -- a second call allocates a fresh instance. + assertNotSame(c, h.register("c")); + assertEquals("c", h.register("c").toString()); + } + + @Test + void propertyOverLimitWithSentinelDisabledReusesPriorCycleInstances() { + // Prior-cycle reuse runs in disabled mode too: a value that was seen last cycle but is now + // over-budget still gets its prior-cycle UTF8BytesString back instead of an allocation. + PropertyCardinalityHandler h = new PropertyCardinalityHandler("test", 2, false); + UTF8BytesString cBeforeReset = h.register("c"); + + h.reset(); + + // Fill the budget with two different values so "c" lands over-cap. + h.register("x"); + h.register("y"); + UTF8BytesString cAfterReset = h.register("c"); + assertSame(cBeforeReset, cAfterReset); + } + + @Test + void tagOverLimitWithSentinelDisabledReturnsFreshUtf8() { + TagCardinalityHandler h = new TagCardinalityHandler("peer.hostname", 1, false); + h.register("host-a"); + UTF8BytesString hostB = h.register("host-b"); + UTF8BytesString hostC = h.register("host-c"); + + assertEquals("peer.hostname:host-b", hostB.toString()); + assertEquals("peer.hostname:host-c", hostC.toString()); + } + + @Test + void tagOverLimitWithSentinelDisabledNeverSubstitutesBlockedSentinel() { + // The sentinel should never materialize in disabled mode -- over-cap values carry their real + // "tag:value" content rather than the blocked sentinel. + TagCardinalityHandler h = new TagCardinalityHandler("peer.service", 1, false); + h.register("svc-1"); + UTF8BytesString overCap = h.register("svc-2"); + assertEquals("peer.service:svc-2", overCap.toString()); + } +} diff --git a/dd-trace-core/src/test/java/datadog/trace/common/metrics/ConflatingMetricsAggregatorBootstrapTest.java b/dd-trace-core/src/test/java/datadog/trace/common/metrics/ClientStatsAggregatorBootstrapTest.java similarity index 95% rename from dd-trace-core/src/test/java/datadog/trace/common/metrics/ConflatingMetricsAggregatorBootstrapTest.java rename to dd-trace-core/src/test/java/datadog/trace/common/metrics/ClientStatsAggregatorBootstrapTest.java index 59681d4724e..758f5db9910 100644 --- a/dd-trace-core/src/test/java/datadog/trace/common/metrics/ConflatingMetricsAggregatorBootstrapTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/common/metrics/ClientStatsAggregatorBootstrapTest.java @@ -4,7 +4,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; @@ -12,7 +11,6 @@ import static org.mockito.Mockito.when; import datadog.communication.ddagent.DDAgentFeaturesDiscovery; -import datadog.trace.bootstrap.instrumentation.api.Tags; import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString; import datadog.trace.core.CoreSpan; import datadog.trace.core.SpanKindFilter; @@ -26,8 +24,7 @@ import org.mockito.ArgumentCaptor; /** - * Coverage for the {@code ConflatingMetricsAggregator} peer-tag schema bootstrap and reconcile - * paths. + * Coverage for the {@code ClientStatsAggregator} peer-tag schema bootstrap and reconcile paths. * *

      *
    • {@link #bootstrapHappensOnceOnFirstPublish()} -- verifies the synchronized producer-side @@ -43,7 +40,7 @@ * publishes see the new tags. *
    */ -class ConflatingMetricsAggregatorBootstrapTest { +class ClientStatsAggregatorBootstrapTest { @Test void bootstrapHappensOnceOnFirstPublish() { @@ -57,8 +54,8 @@ void bootstrapHappensOnceOnFirstPublish() { when(features.peerTags()).thenReturn(Collections.singleton("peer.hostname")); when(features.state()).thenReturn("state-1"); - ConflatingMetricsAggregator aggregator = - new ConflatingMetricsAggregator( + ClientStatsAggregator aggregator = + new ClientStatsAggregator( Collections.emptySet(), features, healthMetrics, @@ -94,8 +91,8 @@ void reconcileSkipsDeepCompareWhenStateMatches() throws Exception { when(features.peerTags()).thenReturn(Collections.singleton("peer.hostname")); when(features.state()).thenReturn("state-1"); - ConflatingMetricsAggregator aggregator = - new ConflatingMetricsAggregator( + ClientStatsAggregator aggregator = + new ClientStatsAggregator( Collections.emptySet(), features, healthMetrics, @@ -163,8 +160,8 @@ void reconcileSurvivesStateChangeWhenTagsUnchanged() throws Exception { // State hash changes every reconcile -- forces reconcile into the slow path each time. when(features.state()).thenReturn("state-1", "state-2", "state-3"); - ConflatingMetricsAggregator aggregator = - new ConflatingMetricsAggregator( + ClientStatsAggregator aggregator = + new ClientStatsAggregator( Collections.emptySet(), features, healthMetrics, @@ -236,8 +233,8 @@ void reconcileSwapsSchemaWhenTagSetChanges() throws Exception { // (mismatch -> slow path), stable at "state-2" for cycle 2's reconcile (match -> fast path). when(features.state()).thenReturn("state-1", "state-2", "state-2"); - ConflatingMetricsAggregator aggregator = - new ConflatingMetricsAggregator( + ClientStatsAggregator aggregator = + new ClientStatsAggregator( Collections.emptySet(), features, healthMetrics, @@ -324,7 +321,7 @@ private static CoreSpan peerAggregationSpan() { when(span.getHttpStatusCode()).thenReturn((short) 200); when(span.getParentId()).thenReturn(0L); when(span.getOrigin()).thenReturn(null); - when(span.unsafeGetTag(eq(Tags.SPAN_KIND), any(CharSequence.class))).thenReturn("client"); + when(span.getSpanKindString()).thenReturn("client"); // peer.hostname tag is set so capturePeerTagValues fires for the bootstrapped schema. when(span.unsafeGetTag("peer.hostname")).thenReturn("localhost"); return span; diff --git a/dd-trace-core/src/test/java/datadog/trace/common/metrics/ConflatingMetricsAggregatorDisableTest.java b/dd-trace-core/src/test/java/datadog/trace/common/metrics/ClientStatsAggregatorDisableTest.java similarity index 95% rename from dd-trace-core/src/test/java/datadog/trace/common/metrics/ConflatingMetricsAggregatorDisableTest.java rename to dd-trace-core/src/test/java/datadog/trace/common/metrics/ClientStatsAggregatorDisableTest.java index d072371d25d..3239cca4e90 100644 --- a/dd-trace-core/src/test/java/datadog/trace/common/metrics/ConflatingMetricsAggregatorDisableTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/common/metrics/ClientStatsAggregatorDisableTest.java @@ -6,7 +6,6 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.after; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; @@ -15,7 +14,6 @@ import static org.mockito.Mockito.when; import datadog.communication.ddagent.DDAgentFeaturesDiscovery; -import datadog.trace.bootstrap.instrumentation.api.Tags; import datadog.trace.core.CoreSpan; import datadog.trace.core.SpanKindFilter; import datadog.trace.core.monitor.HealthMetrics; @@ -45,7 +43,7 @@ * (the pre-fix path) only via races -- not deterministically -- so the assertions here are about * the observable end-to-end shape rather than thread identity. */ -class ConflatingMetricsAggregatorDisableTest { +class ClientStatsAggregatorDisableTest { @Test void downgradeRoutesClearThroughInboxBeforeNextReport() throws Exception { @@ -57,8 +55,8 @@ void downgradeRoutesClearThroughInboxBeforeNextReport() throws Exception { when(features.peerTags()).thenReturn(Collections.emptySet()); when(features.state()).thenReturn("state-1"); - ConflatingMetricsAggregator aggregator = - new ConflatingMetricsAggregator( + ClientStatsAggregator aggregator = + new ClientStatsAggregator( Collections.emptySet(), features, healthMetrics, @@ -147,8 +145,8 @@ void clearDoesNotTrampleQueuedStopSignal() throws Exception { when(features.peerTags()).thenReturn(Collections.emptySet()); when(features.state()).thenReturn("state-1"); - ConflatingMetricsAggregator aggregator = - new ConflatingMetricsAggregator( + ClientStatsAggregator aggregator = + new ClientStatsAggregator( Collections.emptySet(), features, healthMetrics, @@ -203,7 +201,7 @@ private static CoreSpan metricsEligibleSpan() { when(span.getHttpStatusCode()).thenReturn((short) 200); when(span.getParentId()).thenReturn(0L); when(span.getOrigin()).thenReturn(null); - when(span.unsafeGetTag(eq(Tags.SPAN_KIND), any(CharSequence.class))).thenReturn("client"); + when(span.getSpanKindString()).thenReturn("client"); return span; } @@ -228,7 +226,7 @@ private static CoreSpan markerSpan() { when(span.getHttpStatusCode()).thenReturn((short) 200); when(span.getParentId()).thenReturn(0L); when(span.getOrigin()).thenReturn(null); - when(span.unsafeGetTag(eq(Tags.SPAN_KIND), any(CharSequence.class))).thenReturn("client"); + when(span.getSpanKindString()).thenReturn("client"); return span; } } diff --git a/dd-trace-core/src/test/java/datadog/trace/common/metrics/ConflatingMetricsAggregatorInboxFullTest.java b/dd-trace-core/src/test/java/datadog/trace/common/metrics/ClientStatsAggregatorInboxFullTest.java similarity index 87% rename from dd-trace-core/src/test/java/datadog/trace/common/metrics/ConflatingMetricsAggregatorInboxFullTest.java rename to dd-trace-core/src/test/java/datadog/trace/common/metrics/ClientStatsAggregatorInboxFullTest.java index f4e4c2da253..3683bef7f42 100644 --- a/dd-trace-core/src/test/java/datadog/trace/common/metrics/ConflatingMetricsAggregatorInboxFullTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/common/metrics/ClientStatsAggregatorInboxFullTest.java @@ -2,14 +2,12 @@ import static java.util.concurrent.TimeUnit.SECONDS; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import datadog.communication.ddagent.DDAgentFeaturesDiscovery; -import datadog.trace.bootstrap.instrumentation.api.Tags; import datadog.trace.core.CoreSpan; import datadog.trace.core.SpanKindFilter; import datadog.trace.core.monitor.HealthMetrics; @@ -17,12 +15,12 @@ import org.junit.jupiter.api.Test; /** - * Coverage for the inbox-full fast-path in {@code ConflatingMetricsAggregator.publish}: when the + * Coverage for the inbox-full fast-path in {@code ClientStatsAggregator.publish}: when the * producer-side inbox is at capacity, the next {@code publish} call short-circuits before any tag * extraction or {@code SpanSnapshot} allocation and reports {@code onStatsInboxFull()} to health * metrics. */ -class ConflatingMetricsAggregatorInboxFullTest { +class ClientStatsAggregatorInboxFullTest { @Test void publishFiresOnStatsInboxFullOnceInboxIsAtCapacity() { @@ -38,8 +36,8 @@ void publishFiresOnStatsInboxFullOnceInboxIsAtCapacity() { // never drains -- snapshots accumulate in the inbox until capacity, then the next publish hits // the size-vs-capacity fast path. int queueSize = 8; - ConflatingMetricsAggregator aggregator = - new ConflatingMetricsAggregator( + ClientStatsAggregator aggregator = + new ClientStatsAggregator( Collections.emptySet(), features, healthMetrics, @@ -78,7 +76,7 @@ private static CoreSpan metricsEligibleSpan() { when(span.getHttpStatusCode()).thenReturn((short) 200); when(span.getParentId()).thenReturn(0L); when(span.getOrigin()).thenReturn(null); - when(span.unsafeGetTag(eq(Tags.SPAN_KIND), any(CharSequence.class))).thenReturn("client"); + when(span.getSpanKindString()).thenReturn("client"); return span; } } diff --git a/dd-trace-core/src/test/java/datadog/trace/common/metrics/PeerTagSchemaTest.java b/dd-trace-core/src/test/java/datadog/trace/common/metrics/PeerTagSchemaTest.java index 7d818a2686b..710e78a175b 100644 --- a/dd-trace-core/src/test/java/datadog/trace/common/metrics/PeerTagSchemaTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/common/metrics/PeerTagSchemaTest.java @@ -3,7 +3,6 @@ import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; @@ -13,20 +12,15 @@ import java.util.Set; import org.junit.jupiter.api.Test; -/** - * Unit tests for {@link PeerTagSchema}. Covers the {@link PeerTagSchema#hasSameTagsAs(Set)} - * predicate that drives the aggregator's reconcile fast/slow path split, the factory shapes, and - * the {@link PeerTagSchema#INTERNAL} singleton. - */ class PeerTagSchemaTest { @Test void ofBuildsSchemaFromSetWithState() { Set tags = new LinkedHashSet<>(Arrays.asList("peer.hostname", "peer.service")); - PeerTagSchema schema = PeerTagSchema.of(tags, "abc123"); + PeerTagSchema schema = PeerTagSchema.of(tags, "state-1234"); assertArrayEquals(new String[] {"peer.hostname", "peer.service"}, schema.names); - assertEquals("abc123", schema.state); + assertEquals("state-1234", schema.state); assertEquals(2, schema.size()); } @@ -36,7 +30,6 @@ void ofHandlesEmptySet() { assertEquals(0, schema.size()); assertEquals(0, schema.names.length); - assertNull(schema.state); } @Test @@ -90,4 +83,23 @@ void hasSameTagsAsHandlesEmpty() { assertTrue(empty.hasSameTagsAs(Collections.emptySet())); assertFalse(empty.hasSameTagsAs(Collections.singleton("peer.hostname"))); } + + @Test + void handlerAccumulatesBlockedCountsAcrossRegistrations() { + // Build a schema then replace its handler with a sentinel-mode instance at a low limit. + // (Production schemas use AggregateEntry.LIMITS_ENABLED which is currently false; this test + // exercises the blocked-count path directly so it stays valid before and after the flag flips.) + PeerTagSchema schema = + new PeerTagSchema(new String[] {"peer.hostname"}, PeerTagSchema.NO_STATE); + schema.handlers[0] = new TagCardinalityHandler("peer.hostname", 1, true); + + schema.register(0, "host-a"); // within limit + schema.register(0, "host-b"); // blocked + schema.register(0, "host-c"); // blocked + + assertEquals(2, schema.handlers[0].reset()); + + // After the reset, no new values were registered so the next reset reports nothing. + assertEquals(0, schema.handlers[0].reset()); + } } diff --git a/dd-trace-core/src/test/java/datadog/trace/core/monitor/HealthMetricsTest.java b/dd-trace-core/src/test/java/datadog/trace/core/monitor/HealthMetricsTest.java index 2f9ac1ea7da..03f2384f179 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/monitor/HealthMetricsTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/monitor/HealthMetricsTest.java @@ -387,13 +387,16 @@ void testOnLongRunningUpdate() throws InterruptedException { @Test void testOnStatsAggregateDropped() throws InterruptedException { - CountDownLatch latch = new CountDownLatch(1); + // onStatsAggregateDropped emits two statsd calls: an immediate collapsed_spans count and the + // periodic stats.dropped_aggregates report — wait for both before verifying. + CountDownLatch latch = new CountDownLatch(2); try (TracerHealthMetrics healthMetrics = new TracerHealthMetrics(new Latched(statsD, latch), 100, TimeUnit.MILLISECONDS)) { healthMetrics.start(); healthMetrics.onStatsAggregateDropped(); assertTrue(latch.await(5, TimeUnit.SECONDS)); } + verify(statsD).count("datadog.tracer.stats.collapsed_spans", 1L, "collapsed:whole_key"); verify(statsD).count("stats.dropped_aggregates", 1L, "reason:lru_eviction"); verifyNoMoreInteractions(statsD); } diff --git a/dd-trace-core/src/traceAgentTest/groovy/datadog/trace/common/metrics/MetricsIntegrationTest.groovy b/dd-trace-core/src/traceAgentTest/groovy/datadog/trace/common/metrics/MetricsIntegrationTest.groovy deleted file mode 100644 index 401aaef4b7e..00000000000 --- a/dd-trace-core/src/traceAgentTest/groovy/datadog/trace/common/metrics/MetricsIntegrationTest.groovy +++ /dev/null @@ -1,75 +0,0 @@ -package datadog.trace.common.metrics - -import static datadog.communication.ddagent.DDAgentFeaturesDiscovery.V06_METRICS_ENDPOINT -import static datadog.trace.common.metrics.EventListener.EventType.OK -import static java.util.concurrent.TimeUnit.SECONDS - -import datadog.communication.http.OkHttpUtils -import datadog.metrics.api.Histograms -import datadog.metrics.impl.DDSketchHistograms -import datadog.trace.api.Config -import datadog.trace.api.WellKnownTags -import java.util.concurrent.CopyOnWriteArrayList -import java.util.concurrent.CountDownLatch -import okhttp3.HttpUrl - -class MetricsIntegrationTest extends AbstractTraceAgentTest { - - def setupSpec() { - // Initialize metrics-lib histograms to register the DDSketch implementation - Histograms.register(DDSketchHistograms.FACTORY) - } - - def "send metrics to trace agent should notify with OK event"() { - setup: - def latch = new CountDownLatch(1) - def listener = new BlockingListener(latch) - def agentUrl = Config.get().getAgentUrl() - OkHttpSink sink = new OkHttpSink(OkHttpUtils.buildHttpClient(HttpUrl.parse(agentUrl), 5000L), agentUrl, V06_METRICS_ENDPOINT, true, false, [:]) - sink.register(listener) - - when: - SerializingMetricWriter writer = new SerializingMetricWriter( - new WellKnownTags("runtimeid","hostname", "env", "service", "version","language"), - sink - ) - writer.startBucket(2, System.nanoTime(), SECONDS.toNanos(10)) - // Build entries via the production AggregateEntry.forSnapshot(snap, keyHash) path -- same - // construction as AggregateTable.findOrInsert. Both entries use one peer tag (grault:quux) - // -> schema names=["grault"], values=["quux"]. - PeerTagSchema schema = PeerTagSchema.testSchema(["grault"] as String[]) - SpanSnapshot snap1 = new SpanSnapshot( - "resource1", "service1", "operation1", null, "sql", (short) 0, - false, true, "xyzzy", schema, ["quux"] as String[], null, null, null, 0L) - def entry1 = new AggregateEntry(snap1, AggregateEntry.hashOf(snap1)) - [2, 1, 2, 250, 4].each { entry1.recordOneDuration(it as long) } - writer.add(entry1) - SpanSnapshot snap2 = new SpanSnapshot( - "resource2", "service2", "operation2", null, "web", (short) 200, - false, true, "xyzzy", schema, ["quux"] as String[], null, null, null, 0L) - def entry2 = new AggregateEntry(snap2, AggregateEntry.hashOf(snap2)) - [1, 1, 200, 2, 3, 4, 5, 6, 7, 8].each { entry2.recordOneDuration(it as long) } - writer.add(entry2) - writer.finishBucket() - - then: - latch.await(5, SECONDS) - listener.events.size() == 1 && listener.events[0] == OK - } - - static class BlockingListener implements EventListener { - - List events = new CopyOnWriteArrayList<>() - final CountDownLatch latch - - BlockingListener(CountDownLatch latch) { - this.latch = latch - } - - @Override - void onEvent(EventType eventType, String message) { - events.add(eventType) - latch.countDown() - } - } -} diff --git a/dd-trace-core/src/traceAgentTest/java/datadog/trace/common/metrics/MetricsIntegrationTest.java b/dd-trace-core/src/traceAgentTest/java/datadog/trace/common/metrics/MetricsIntegrationTest.java new file mode 100644 index 00000000000..ed28085a39a --- /dev/null +++ b/dd-trace-core/src/traceAgentTest/java/datadog/trace/common/metrics/MetricsIntegrationTest.java @@ -0,0 +1,187 @@ +package datadog.trace.common.metrics; + +import static datadog.communication.ddagent.DDAgentFeaturesDiscovery.V06_METRICS_ENDPOINT; +import static datadog.trace.junit.utils.config.WithConfigExtension.injectSysConfig; +import static java.util.concurrent.TimeUnit.SECONDS; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import datadog.communication.http.OkHttpUtils; +import datadog.metrics.agent.AgentMeter; +import datadog.metrics.api.statsd.StatsDClient; +import datadog.metrics.impl.DDSketchHistograms; +import datadog.metrics.impl.MonitoringImpl; +import datadog.trace.api.Config; +import datadog.trace.api.ConfigDefaults; +import datadog.trace.api.WellKnownTags; +import datadog.trace.api.config.TracerConfig; +import datadog.trace.junit.utils.config.WithConfigExtension; +import java.time.Duration; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; +import okhttp3.HttpUrl; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.testcontainers.containers.GenericContainer; +import org.testcontainers.containers.startupcheck.MinimumDurationRunningStartupCheckStrategy; + +@ExtendWith(WithConfigExtension.class) +class MetricsIntegrationTest { + + // CI runs an agent container alongside the build (reached via CI_AGENT_HOST); when building + // locally we start one ourselves with testcontainers. + private static final boolean RUNNING_IN_CI = "true".equals(System.getenv("CI")); + private static GenericContainer agentContainer; + + @BeforeAll + static void setupSpec() { + // recordOneDuration -> Histogram.accept needs the metrics meter / histogram factory registered. + MonitoringImpl monitoring = new MonitoringImpl(StatsDClient.NO_OP, 1, TimeUnit.SECONDS); + AgentMeter.registerIfAbsent(StatsDClient.NO_OP, monitoring, DDSketchHistograms.FACTORY); + + if (!RUNNING_IN_CI) { + Map env = new HashMap<>(); + env.put("DD_APM_ENABLED", "true"); + env.put("DD_BIND_HOST", "0.0.0.0"); + env.put("DD_API_KEY", "invalid_key_but_this_is_fine"); + env.put("DD_HOSTNAME", "doesnotexist"); + env.put("DD_LOGS_STDOUT", "yes"); + agentContainer = + new GenericContainer<>("datadog/agent:7.40.1") + .withEnv(env) + .withExposedPorts(ConfigDefaults.DEFAULT_TRACE_AGENT_PORT) + .withStartupTimeout(Duration.ofSeconds(120)) + // Sleep for a bit so the agent's rate_by_service response is populated -- mirrors the + // race-condition workaround from the original Spock base. + .withStartupCheckStrategy( + new MinimumDurationRunningStartupCheckStrategy(Duration.ofSeconds(10))); + agentContainer.start(); + } + } + + @AfterAll + static void cleanupSpec() { + if (agentContainer != null) { + agentContainer.stop(); + } + } + + @BeforeEach + void setup() { + AggregateEntry.resetCardinalityHandlers(); + injectSysConfig(TracerConfig.AGENT_HOST, agentHost()); + injectSysConfig(TracerConfig.TRACE_AGENT_PORT, agentPort()); + } + + private static String agentHost() { + return agentContainer != null ? agentContainer.getHost() : System.getenv("CI_AGENT_HOST"); + } + + private static String agentPort() { + return agentContainer != null + ? String.valueOf(agentContainer.getMappedPort(ConfigDefaults.DEFAULT_TRACE_AGENT_PORT)) + : String.valueOf(ConfigDefaults.DEFAULT_TRACE_AGENT_PORT); + } + + @Test + void sendMetricsToTraceAgentShouldNotifyWithOkEvent() throws InterruptedException { + // setup + CountDownLatch latch = new CountDownLatch(1); + BlockingListener listener = new BlockingListener(latch); + String agentUrl = Config.get().getAgentUrl(); + OkHttpSink sink = + new OkHttpSink( + OkHttpUtils.buildHttpClient(HttpUrl.parse(agentUrl), 5000L), + agentUrl, + V06_METRICS_ENDPOINT, + true, + false, + Collections.emptyMap()); + sink.register(listener); + + // when + SerializingMetricWriter writer = + new SerializingMetricWriter( + new WellKnownTags("runtimeid", "hostname", "env", "service", "version", "language"), + sink); + writer.startBucket(2, System.nanoTime(), SECONDS.toNanos(10)); + // Build entries through the production AggregateTable.findOrInsert path (canonicalizes the + // snapshot and creates/looks up the entry). Both entries use one peer tag (grault:quux) and no + // additional tags -> schema names=["grault"], values=["quux"]. + AggregateTable table = new AggregateTable(8); + PeerTagSchema schema = new PeerTagSchema(new String[] {"grault"}, PeerTagSchema.NO_STATE); + SpanSnapshot snap1 = + new SpanSnapshot( + "resource1", + "service1", + "operation1", + null, + "sql", + (short) 0, + false, + true, + "xyzzy", + schema, + new String[] {"quux"}, + null, + null, + null, + 0L); + AggregateEntry entry1 = table.findOrInsert(snap1); + for (long duration : new long[] {2, 1, 2, 250, 4}) { + entry1.recordOneDuration(duration); + } + writer.add(entry1); + SpanSnapshot snap2 = + new SpanSnapshot( + "resource2", + "service2", + "operation2", + null, + "web", + (short) 200, + false, + true, + "xyzzy", + schema, + new String[] {"quux"}, + null, + null, + null, + 0L); + AggregateEntry entry2 = table.findOrInsert(snap2); + for (long duration : new long[] {1, 1, 200, 2, 3, 4, 5, 6, 7, 8}) { + entry2.recordOneDuration(duration); + } + writer.add(entry2); + writer.finishBucket(); + + // then + assertTrue(latch.await(5, SECONDS)); + assertEquals(1, listener.events.size()); + assertEquals(EventListener.EventType.OK, listener.events.get(0)); + } + + static class BlockingListener implements EventListener { + final List events = new CopyOnWriteArrayList<>(); + final CountDownLatch latch; + + BlockingListener(CountDownLatch latch) { + this.latch = latch; + } + + @Override + public void onEvent(EventListener.EventType eventType, String message) { + events.add(eventType); + latch.countDown(); + } + } +} diff --git a/internal-api/src/main/java/datadog/trace/api/Config.java b/internal-api/src/main/java/datadog/trace/api/Config.java index d1a9ba4aada..b10bda7c683 100644 --- a/internal-api/src/main/java/datadog/trace/api/Config.java +++ b/internal-api/src/main/java/datadog/trace/api/Config.java @@ -2267,7 +2267,6 @@ && isMetricsOtelEnabled() (long) configProvider.getInteger(TRACER_METRICS_MAX_PENDING, defaultMaxPending) * LEGACY_BATCH_SIZE; tracerMetricsMaxPending = (int) Math.min(requestedMaxPending, MAX_SAFE_ARRAY_SIZE); - reportHostName = configProvider.getBoolean(TRACE_REPORT_HOSTNAME, DEFAULT_TRACE_REPORT_HOSTNAME); From 98481ff95378353df7ba77c269240a10ff2ed49b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Gonz=C3=A1lez=20Garc=C3=ADa?= Date: Wed, 1 Jul 2026 11:17:36 +0200 Subject: [PATCH 105/139] Add request_excluded tag to appsec.waf.requests metric (#11744) feat: add request_excluded tag to appsec.waf.requests metric Adds the `request_excluded` tag to the `appsec.waf.requests` telemetry metric as required by the ASM Tags RFC. The tag emits string values `full`/`partial` (per RFC) with `none` as the baseline until libddwaf exposes exclusion filter data in its result. - WafMetricCollector: WAF_REQUEST_COMBINATIONS 128->256 (2^8), new requestExcluded boolean in bitmask (bit 7), tag emits "full"/"none" - AppSecRequestContext: wafRequestExcluded field + getter/setter - GatewayBridge: passes ctx.isWafRequestExcluded() as 8th arg - WafMetricCollectorTest: 256 combinations, wafInit added to given block review: pre-PR checks - Add metric.value == 1 assertion in waf request metrics test - Add requestMetrics.size() == 1 guard assertion - Add placeholder comment on setWafRequestExcluded() (libddwaf blocker) - Apply spotless formatting review: fix GatewayBridgeSpecification mock arity for wafRequest Update wafRequest mock expectation from 7 to 8 wildcard arguments to match the new requestExcluded parameter added in APPSEC-62739. fix: update WafMetricPeriodicActionSpecification for 8-arg wafRequest Add missing requestExcluded (false) 8th argument to all wafRequest calls and add request_excluded:none to all expected tag lists. Found by Codex review of PR #11744. ci: retrigger pipeline Merge branch 'master' into alejandro.gonzalez/APPSEC-62739-request-excluded-tag Co-authored-by: devflow.devflow-routing-intake --- .../appsec/gateway/AppSecRequestContext.java | 10 ++++ .../datadog/appsec/gateway/GatewayBridge.java | 3 +- .../gateway/GatewayBridgeSpecification.groovy | 2 +- .../api/telemetry/WafMetricCollector.java | 22 +++++--- .../telemetry/WafMetricCollectorTest.groovy | 20 +++++-- ...afMetricPeriodicActionSpecification.groovy | 52 ++++++++++++------- 6 files changed, 79 insertions(+), 30 deletions(-) diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/AppSecRequestContext.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/AppSecRequestContext.java index 860f3119ae4..905024180fc 100644 --- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/AppSecRequestContext.java +++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/AppSecRequestContext.java @@ -168,6 +168,7 @@ public class AppSecRequestContext implements DataBundle, Closeable { private volatile boolean wafTruncated; private volatile boolean wafRequestBlockFailure; private volatile boolean wafRateLimited; + private volatile boolean wafRequestExcluded; private volatile int wafTimeouts; private volatile int raspTimeouts; @@ -287,6 +288,15 @@ public boolean isWafRateLimited() { return wafRateLimited; } + // placeholder: libddwaf does not yet expose exclusion filter results + public void setWafRequestExcluded() { + wafRequestExcluded = true; + } + + public boolean isWafRequestExcluded() { + return wafRequestExcluded; + } + public void increaseWafTimeouts() { WAF_TIMEOUTS_UPDATER.incrementAndGet(this); } diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/GatewayBridge.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/GatewayBridge.java index 22b1b09d1db..a7b04c017e2 100644 --- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/GatewayBridge.java +++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/GatewayBridge.java @@ -1057,7 +1057,8 @@ private NoopFlow onRequestEnded(RequestContext ctx_, IGSpanInfo spanInfo) { ctx.getWafTimeouts() > 0, // wafTimeout, ctx.isWafRequestBlockFailure(), // blockFailure, ctx.isWafRateLimited(), // rateLimited, - ctx.isWafTruncated() // inputTruncated + ctx.isWafTruncated(), // inputTruncated + ctx.isWafRequestExcluded() // requestExcluded ); } diff --git a/dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/gateway/GatewayBridgeSpecification.groovy b/dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/gateway/GatewayBridgeSpecification.groovy index 36a8ebc861d..7f519c3d76e 100644 --- a/dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/gateway/GatewayBridgeSpecification.groovy +++ b/dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/gateway/GatewayBridgeSpecification.groovy @@ -210,7 +210,7 @@ class GatewayBridgeSpecification extends DDSpecification { 1 * mockAppSecCtx.isWafRequestBlockFailure() 1 * mockAppSecCtx.isWafRateLimited() 1 * mockAppSecCtx.isWafTruncated() - 1 * wafMetricCollector.wafRequest(_, _, _, _, _, _, _) // call waf request metric + 1 * wafMetricCollector.wafRequest(_, _, _, _, _, _, _, _) // call waf request metric flow.result == null flow.action == Flow.Action.Noop.INSTANCE } diff --git a/internal-api/src/main/java/datadog/trace/api/telemetry/WafMetricCollector.java b/internal-api/src/main/java/datadog/trace/api/telemetry/WafMetricCollector.java index 96797ebae6f..d4792a5bd69 100644 --- a/internal-api/src/main/java/datadog/trace/api/telemetry/WafMetricCollector.java +++ b/internal-api/src/main/java/datadog/trace/api/telemetry/WafMetricCollector.java @@ -33,7 +33,7 @@ private WafMetricCollector() { private static final BlockingQueue rawMetricsQueue = new ArrayBlockingQueue<>(RAW_QUEUE_SIZE); - private static final int WAF_REQUEST_COMBINATIONS = 128; // 2^7 + private static final int WAF_REQUEST_COMBINATIONS = 256; // 2^8 private final AtomicLongArray wafRequestCounter = new AtomicLongArray(WAF_REQUEST_COMBINATIONS); private static final AtomicLongArray wafInputTruncatedCounter = @@ -99,7 +99,8 @@ public void wafRequest( final boolean wafTimeout, final boolean blockFailure, final boolean rateLimited, - final boolean inputTruncated) { + final boolean inputTruncated, + final boolean requestExcluded) { int index = computeWafRequestIndex( ruleTriggered, @@ -108,7 +109,8 @@ public void wafRequest( wafTimeout, blockFailure, rateLimited, - inputTruncated); + inputTruncated, + requestExcluded); wafRequestCounter.incrementAndGet(index); } @@ -125,7 +127,8 @@ static int computeWafRequestIndex( boolean wafTimeout, boolean blockFailure, boolean rateLimited, - boolean inputTruncated) { + boolean inputTruncated, + boolean requestExcluded) { int index = 0; if (ruleTriggered) index |= 1; if (requestBlocked) index |= 1 << 1; @@ -134,6 +137,7 @@ static int computeWafRequestIndex( if (blockFailure) index |= 1 << 4; if (rateLimited) index |= 1 << 5; if (inputTruncated) index |= 1 << 6; + if (requestExcluded) index |= 1 << 7; return index; } @@ -233,6 +237,7 @@ public void prepareMetrics() { boolean blockFailure = (i & (1 << 4)) != 0; boolean rateLimited = (i & (1 << 5)) != 0; boolean inputTruncated = (i & (1 << 6)) != 0; + boolean requestExcluded = (i & (1 << 7)) != 0; if (!rawMetricsQueue.offer( new WafRequestsRawMetric( @@ -245,7 +250,8 @@ public void prepareMetrics() { wafTimeout, blockFailure, rateLimited, - inputTruncated))) { + inputTruncated, + requestExcluded))) { return; } } @@ -497,7 +503,8 @@ public WafRequestsRawMetric( final boolean wafTimeout, final boolean blockFailure, final boolean rateLimited, - final boolean inputTruncated) { + final boolean inputTruncated, + final boolean requestExcluded) { super( "waf.requests", counter, @@ -509,7 +516,8 @@ public WafRequestsRawMetric( "waf_timeout:" + wafTimeout, "block_failure:" + blockFailure, "rate_limited:" + rateLimited, - "input_truncated:" + inputTruncated); + "input_truncated:" + inputTruncated, + "request_excluded:" + (requestExcluded ? "full" : "none")); } } diff --git a/internal-api/src/test/groovy/datadog/trace/api/telemetry/WafMetricCollectorTest.groovy b/internal-api/src/test/groovy/datadog/trace/api/telemetry/WafMetricCollectorTest.groovy index 5f5663d1e3b..a05887d6668 100644 --- a/internal-api/src/test/groovy/datadog/trace/api/telemetry/WafMetricCollectorTest.groovy +++ b/internal-api/src/test/groovy/datadog/trace/api/telemetry/WafMetricCollectorTest.groovy @@ -432,6 +432,7 @@ class WafMetricCollectorTest extends DDSpecification { void 'test waf request metrics'() { given: def collector = WafMetricCollector.get() + collector.wafInit('waf_ver1', 'rules.1', true) when: collector.wafRequest( @@ -441,7 +442,8 @@ class WafMetricCollectorTest extends DDSpecification { wafTimeout, blockFailure, rateLimited, - inputTruncated + inputTruncated, + requestExcluded ) then: @@ -449,10 +451,12 @@ class WafMetricCollectorTest extends DDSpecification { def metrics = collector.drain() def requestMetrics = metrics.findAll { it.metricName == 'waf.requests' } + requestMetrics.size() == 1 final metric = requestMetrics[0] metric.type == 'count' metric.metricName == 'waf.requests' metric.namespace == 'appsec' + metric.value == 1 metric.tags == [ "waf_version:waf_ver1", "event_rules_version:rules.1", @@ -462,11 +466,21 @@ class WafMetricCollectorTest extends DDSpecification { "waf_timeout:${wafTimeout}", "block_failure:${blockFailure}", "rate_limited:${rateLimited}", - "input_truncated:${inputTruncated}" + "input_truncated:${inputTruncated}", + "request_excluded:${requestExcluded ? 'full' : 'none'}" ] where: - [triggered, blocked, wafError, wafTimeout, blockFailure, rateLimited, inputTruncated] << allBooleanCombinations(7) + [ + triggered, + blocked, + wafError, + wafTimeout, + blockFailure, + rateLimited, + inputTruncated, + requestExcluded + ] << allBooleanCombinations(8) } void 'test waf input truncated metrics'() { diff --git a/telemetry/src/test/groovy/datadog/telemetry/metric/WafMetricPeriodicActionSpecification.groovy b/telemetry/src/test/groovy/datadog/telemetry/metric/WafMetricPeriodicActionSpecification.groovy index b14a10e431f..9486fc432aa 100644 --- a/telemetry/src/test/groovy/datadog/telemetry/metric/WafMetricPeriodicActionSpecification.groovy +++ b/telemetry/src/test/groovy/datadog/telemetry/metric/WafMetricPeriodicActionSpecification.groovy @@ -43,16 +43,16 @@ class WafMetricPeriodicActionSpecification extends DDSpecification { void 'push waf request metrics and push into the telemetry'() { when: WafMetricCollector.get().wafInit('0.0.0', 'rules_ver_1', true) - WafMetricCollector.get().wafRequest(false, false, false, false, false, false, false) - WafMetricCollector.get().wafRequest(true, false, false, false, false, false, false) - WafMetricCollector.get().wafRequest(false, false, false, false, false, false, false) - WafMetricCollector.get().wafRequest(false, true, false, false, false, false, false) - WafMetricCollector.get().wafRequest(false, false, false, false, false, false, false) - WafMetricCollector.get().wafRequest(false, false, false, true, false, false, false) - WafMetricCollector.get().wafRequest(false, false, true, false, false, false, false) - WafMetricCollector.get().wafRequest(false, false, false, false, false, true, false) - WafMetricCollector.get().wafRequest(false, false, false, false, true, false, false) - WafMetricCollector.get().wafRequest(false, false, false, false, false, false, true) + WafMetricCollector.get().wafRequest(false, false, false, false, false, false, false, false) + WafMetricCollector.get().wafRequest(true, false, false, false, false, false, false, false) + WafMetricCollector.get().wafRequest(false, false, false, false, false, false, false, false) + WafMetricCollector.get().wafRequest(false, true, false, false, false, false, false, false) + WafMetricCollector.get().wafRequest(false, false, false, false, false, false, false, false) + WafMetricCollector.get().wafRequest(false, false, false, true, false, false, false, false) + WafMetricCollector.get().wafRequest(false, false, true, false, false, false, false, false) + WafMetricCollector.get().wafRequest(false, false, false, false, false, true, false, false) + WafMetricCollector.get().wafRequest(false, false, false, false, true, false, false, false) + WafMetricCollector.get().wafRequest(false, false, false, false, false, false, true, false) WafMetricCollector.get().prepareMetrics() periodicAction.doIteration(telemetryService) @@ -75,6 +75,7 @@ class WafMetricPeriodicActionSpecification extends DDSpecification { 'block_failure:false', 'rate_limited:false', 'input_truncated:false', + 'request_excluded:none', ] } ) 1 * telemetryService.addMetric( { Metric metric -> @@ -91,6 +92,7 @@ class WafMetricPeriodicActionSpecification extends DDSpecification { 'block_failure:false', 'rate_limited:false', 'input_truncated:false', + 'request_excluded:none', ] } ) 1 * telemetryService.addMetric( { Metric metric -> @@ -107,6 +109,7 @@ class WafMetricPeriodicActionSpecification extends DDSpecification { 'block_failure:false', 'rate_limited:false', 'input_truncated:false', + 'request_excluded:none', ] } ) 1 * telemetryService.addMetric( { Metric metric -> @@ -123,6 +126,7 @@ class WafMetricPeriodicActionSpecification extends DDSpecification { 'block_failure:false', 'rate_limited:false', 'input_truncated:false', + 'request_excluded:none', ] } ) 1 * telemetryService.addMetric( { Metric metric -> @@ -139,6 +143,7 @@ class WafMetricPeriodicActionSpecification extends DDSpecification { 'block_failure:false', 'rate_limited:false', 'input_truncated:false', + 'request_excluded:none', ] } ) 1 * telemetryService.addMetric( { Metric metric -> @@ -155,6 +160,7 @@ class WafMetricPeriodicActionSpecification extends DDSpecification { 'block_failure:true', 'rate_limited:false', 'input_truncated:false', + 'request_excluded:none', ] } ) 1 * telemetryService.addMetric( { Metric metric -> @@ -171,6 +177,7 @@ class WafMetricPeriodicActionSpecification extends DDSpecification { 'block_failure:false', 'rate_limited:true', 'input_truncated:false', + 'request_excluded:none', ] } ) 1 * telemetryService.addMetric( { Metric metric -> @@ -187,20 +194,21 @@ class WafMetricPeriodicActionSpecification extends DDSpecification { 'block_failure:false', 'rate_limited:false', 'input_truncated:true', + 'request_excluded:none', ] } ) 0 * _._ when: 'waf.updates happens' WafMetricCollector.get().wafUpdates('rules_ver_2', true) - WafMetricCollector.get().wafRequest(false, false, false, false, false, false, false) - WafMetricCollector.get().wafRequest(true, false, false, false, false, false, false) - WafMetricCollector.get().wafRequest(false, true, false, false, false, false, false) - WafMetricCollector.get().wafRequest(false, false, false, true, false, false, false) - WafMetricCollector.get().wafRequest(false, false, true, false, false, false, false) - WafMetricCollector.get().wafRequest(false, false, false, false, false, true, false) - WafMetricCollector.get().wafRequest(false, false, false, false, true, false, false) - WafMetricCollector.get().wafRequest(false, false, false, false, false, false, true) + WafMetricCollector.get().wafRequest(false, false, false, false, false, false, false, false) + WafMetricCollector.get().wafRequest(true, false, false, false, false, false, false, false) + WafMetricCollector.get().wafRequest(false, true, false, false, false, false, false, false) + WafMetricCollector.get().wafRequest(false, false, false, true, false, false, false, false) + WafMetricCollector.get().wafRequest(false, false, true, false, false, false, false, false) + WafMetricCollector.get().wafRequest(false, false, false, false, false, true, false, false) + WafMetricCollector.get().wafRequest(false, false, false, false, true, false, false, false) + WafMetricCollector.get().wafRequest(false, false, false, false, false, false, true, false) WafMetricCollector.get().prepareMetrics() periodicAction.doIteration(telemetryService) @@ -223,6 +231,7 @@ class WafMetricPeriodicActionSpecification extends DDSpecification { 'block_failure:false', 'rate_limited:false', 'input_truncated:false', + 'request_excluded:none', ] } ) 1 * telemetryService.addMetric( { Metric metric -> @@ -239,6 +248,7 @@ class WafMetricPeriodicActionSpecification extends DDSpecification { 'block_failure:false', 'rate_limited:false', 'input_truncated:false', + 'request_excluded:none', ] } ) 1 * telemetryService.addMetric( { Metric metric -> @@ -255,6 +265,7 @@ class WafMetricPeriodicActionSpecification extends DDSpecification { 'block_failure:false', 'rate_limited:false', 'input_truncated:false', + 'request_excluded:none', ] } ) 1 * telemetryService.addMetric( { Metric metric -> @@ -271,6 +282,7 @@ class WafMetricPeriodicActionSpecification extends DDSpecification { 'block_failure:false', 'rate_limited:false', 'input_truncated:false', + 'request_excluded:none', ] } ) 1 * telemetryService.addMetric( { Metric metric -> @@ -287,6 +299,7 @@ class WafMetricPeriodicActionSpecification extends DDSpecification { 'block_failure:false', 'rate_limited:false', 'input_truncated:false', + 'request_excluded:none', ] } ) 1 * telemetryService.addMetric( { Metric metric -> @@ -303,6 +316,7 @@ class WafMetricPeriodicActionSpecification extends DDSpecification { 'block_failure:true', 'rate_limited:false', 'input_truncated:false', + 'request_excluded:none', ] } ) 1 * telemetryService.addMetric( { Metric metric -> @@ -319,6 +333,7 @@ class WafMetricPeriodicActionSpecification extends DDSpecification { 'block_failure:false', 'rate_limited:true', 'input_truncated:false', + 'request_excluded:none', ] } ) 1 * telemetryService.addMetric( { Metric metric -> @@ -335,6 +350,7 @@ class WafMetricPeriodicActionSpecification extends DDSpecification { 'block_failure:false', 'rate_limited:false', 'input_truncated:true', + 'request_excluded:none', ] } ) 0 * _._ From ee7f3cc0c35f5b6b3b359226757a99f8d90bd6d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Vandon?= Date: Wed, 1 Jul 2026 11:18:59 +0100 Subject: [PATCH 106/139] security fix for private headers that might be copied to a different origin on redirect in Apache (#11671) fix for APMSP-3274 add empty marker header to prevent future blind copy catch potential exception Merge branch 'master' into vandonr/fix2 Co-authored-by: raphael.vandon --- .../ApacheHttpAsyncClientModule.java | 3 +- ...acheHttpClientRedirectInstrumentation.java | 34 +++--- .../apachehttpasyncclient/RedirectHelper.java | 76 +++++++++++++ ...HttpClientRedirectInstrumentationTest.java | 101 ++++++++++++++++++ 4 files changed, 196 insertions(+), 18 deletions(-) create mode 100644 dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/RedirectHelper.java create mode 100644 dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/test/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpClientRedirectInstrumentationTest.java diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientModule.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientModule.java index 15a0a582b40..8dcec31c16f 100644 --- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientModule.java +++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientModule.java @@ -22,7 +22,8 @@ public String[] helperClassNames() { packageName + ".DelegatingRequestProducer", packageName + ".TraceContinuedFutureCallback", packageName + ".ApacheHttpAsyncClientDecorator", - packageName + ".HostAndRequestAsHttpUriRequest" + packageName + ".HostAndRequestAsHttpUriRequest", + packageName + ".RedirectHelper" }; } diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpClientRedirectInstrumentation.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpClientRedirectInstrumentation.java index 15890fb4571..cd6473b1285 100644 --- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpClientRedirectInstrumentation.java +++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpClientRedirectInstrumentation.java @@ -46,7 +46,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class ClientRedirectAdvice { @Advice.OnMethodExit(suppress = Throwable.class) - private static void onAfterExecute( + static void onAfterExecute( @Advice.Argument(value = 2) final HttpContext context, @Advice.Return(typing = Assigner.Typing.DYNAMIC) final HttpRequest redirect) { if (redirect == null) { @@ -58,31 +58,31 @@ private static void onAfterExecute( } HttpRequest original = (HttpRequest) originalRequest; - // Apache HttpClient 4.0.1+ copies headers from original to redirect only - // if redirect headers are empty. Because we add headers - // "x-datadog-" and "x-b3-" to redirect: it means redirect headers never - // will be empty. So in case if not-instrumented redirect had no headers, - // we just copy all not set headers from original to redirect (doing same - // thing as apache httpclient does). - if (!redirect.headerIterator().hasNext()) { - // redirect didn't have other headers besides tracing, so we need to do copy - // (same work as Apache HttpClient 4.0.1+ does w/o instrumentation) - if (original instanceof HttpRequestWrapper) { - // We should use the initial request because the wrapped one might contain more headers - // (i.e. Host) we do not want to copy - // if we cannot access the original request we cannot safely copy. - // At this point we break the propagation not to corrupt the customer request - redirect.setHeaders(((HttpRequestWrapper) original).getOriginal().getAllHeaders()); - } + // Apache HttpClient 4.0.1+ copies headers from the original request to the redirect only when + // the redirect request has no headers. Because tracing injects propagation headers before + // redirect handling completes, an otherwise empty redirect request may no longer look empty + // to HttpClient. Preserve that header-copy behavior only for same-origin redirects; + // cross-origin redirects must not receive application headers such as Authorization or + // Cookie. + boolean emptyRedirect = !redirect.headerIterator().hasNext(); + if (emptyRedirect && RedirectHelper.isSameOrigin(context, original, redirect)) { + redirect.setHeaders(((HttpRequestWrapper) original).getOriginal().getAllHeaders()); } else { + boolean copiedPropagationHeader = false; for (final Header header : original.getAllHeaders()) { if (PropagationUtils.KNOWN_PROPAGATION_HEADERS.contains( header.getName().toLowerCase(Locale.ROOT))) { if (!redirect.containsHeader(header.getName())) { redirect.setHeader(header.getName(), header.getValue()); + copiedPropagationHeader = true; } } } + if (emptyRedirect && !copiedPropagationHeader) { + // When there are no propagation headers to copy, add a harmless header to keep HttpClient + // from treating the redirect as empty and copying application headers later. + redirect.setHeader("x-datadog-redirect", "true"); + } } } } diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/RedirectHelper.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/RedirectHelper.java new file mode 100644 index 00000000000..017f93c185a --- /dev/null +++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/RedirectHelper.java @@ -0,0 +1,76 @@ +package datadog.trace.instrumentation.apachehttpasyncclient; + +import java.net.URI; +import org.apache.http.HttpHost; +import org.apache.http.HttpRequest; +import org.apache.http.client.methods.HttpRequestWrapper; +import org.apache.http.client.methods.HttpUriRequest; +import org.apache.http.protocol.HttpContext; + +public final class RedirectHelper { + private RedirectHelper() {} + + public static boolean isSameOrigin( + final HttpContext context, final HttpRequest original, final HttpRequest redirect) { + if (!(original instanceof HttpRequestWrapper) || !(redirect instanceof HttpUriRequest)) { + return false; + } + HttpRequest unwrappedOriginal = ((HttpRequestWrapper) original).getOriginal(); + if (!(unwrappedOriginal instanceof HttpUriRequest)) { + return false; + } + URI originalUri = ((HttpUriRequest) unwrappedOriginal).getURI(); + URI redirectUri = ((HttpUriRequest) redirect).getURI(); + if (originalUri == null || redirectUri == null) { + return false; + } + + originalUri = resolveOriginalUri(context, originalUri); + if (!redirectUri.isAbsolute()) { + redirectUri = originalUri.resolve(redirectUri); + } + if (originalUri.getScheme() == null || redirectUri.getScheme() == null) { + return false; + } + + String originalHost = originalUri.getHost(); + String redirectHost = redirectUri.getHost(); + if (originalHost == null || redirectHost == null) { + return false; + } + + return originalUri.getScheme().equalsIgnoreCase(redirectUri.getScheme()) + && originalHost.equalsIgnoreCase(redirectHost) + && effectivePort(originalUri) == effectivePort(redirectUri); + } + + private static URI resolveOriginalUri(final HttpContext context, final URI originalUri) { + if (originalUri.isAbsolute()) { + return originalUri; + } + Object targetHost = context.getAttribute("http.target_host"); + if (!(targetHost instanceof HttpHost)) { + return originalUri; + } + HttpHost host = (HttpHost) targetHost; + try { + return URI.create(host.toURI()).resolve(originalUri); + } catch (IllegalArgumentException e) { + return originalUri; + } + } + + private static int effectivePort(final URI uri) { + if (uri.getPort() != -1) { + return uri.getPort(); + } + String scheme = uri.getScheme(); + if ("http".equalsIgnoreCase(scheme)) { + return 80; + } + if ("https".equalsIgnoreCase(scheme)) { + return 443; + } + return -1; + } +} diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/test/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpClientRedirectInstrumentationTest.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/test/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpClientRedirectInstrumentationTest.java new file mode 100644 index 00000000000..83892ef07a5 --- /dev/null +++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/test/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpClientRedirectInstrumentationTest.java @@ -0,0 +1,101 @@ +package datadog.trace.instrumentation.apachehttpasyncclient; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; + +import org.apache.http.HttpHost; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.methods.HttpRequestWrapper; +import org.apache.http.protocol.BasicHttpContext; +import org.apache.http.protocol.HttpContext; +import org.junit.jupiter.api.Test; + +class ApacheHttpClientRedirectInstrumentationTest { + + @Test + void doesNotCopyApplicationHeadersToCrossOriginRedirects() throws Exception { + HttpGet original = originalRequest("http://example.com/request"); + original.addHeader("Authorization", "Bearer secret"); + original.addHeader("Cookie", "session=secret"); + original.addHeader("X-Api-Key", "secret"); + original.addHeader("x-datadog-trace-id", "123"); + + HttpGet redirect = new HttpGet("http://attacker.example/redirect"); + + ApacheHttpClientRedirectInstrumentation.ClientRedirectAdvice.onAfterExecute( + contextWith(original), redirect); + + assertFalse(redirect.containsHeader("Authorization")); + assertFalse(redirect.containsHeader("Cookie")); + assertFalse(redirect.containsHeader("X-Api-Key")); + assertEquals("123", redirect.getFirstHeader("x-datadog-trace-id").getValue()); + } + + @Test + void preventsApacheHeaderCopyWhenCrossOriginRedirectHasNoPropagationHeaders() throws Exception { + HttpGet original = originalRequest("http://example.com/request"); + original.addHeader("Authorization", "Bearer secret"); + original.addHeader("Cookie", "session=secret"); + + HttpGet redirect = new HttpGet("http://attacker.example/redirect"); + + ApacheHttpClientRedirectInstrumentation.ClientRedirectAdvice.onAfterExecute( + contextWith(original), redirect); + + assertFalse(redirect.containsHeader("Authorization")); + assertFalse(redirect.containsHeader("Cookie")); + assertEquals("true", redirect.getFirstHeader("x-datadog-redirect").getValue()); + } + + @Test + void copiesApplicationHeadersToSameOriginRedirects() throws Exception { + HttpGet original = originalRequest("https://example.com/request"); + original.addHeader("Authorization", "Bearer secret"); + original.addHeader("x-datadog-trace-id", "123"); + + HttpGet redirect = new HttpGet("https://example.com/redirect"); + + ApacheHttpClientRedirectInstrumentation.ClientRedirectAdvice.onAfterExecute( + contextWith(original), redirect); + + assertEquals("Bearer secret", redirect.getFirstHeader("Authorization").getValue()); + assertEquals("123", redirect.getFirstHeader("x-datadog-trace-id").getValue()); + } + + @Test + void treatsDefaultPortsAsSameOrigin() throws Exception { + HttpGet original = originalRequest("https://example.com:443/request"); + original.addHeader("Authorization", "Bearer secret"); + + HttpGet redirect = new HttpGet("https://example.com/redirect"); + + ApacheHttpClientRedirectInstrumentation.ClientRedirectAdvice.onAfterExecute( + contextWith(original), redirect); + + assertEquals("Bearer secret", redirect.getFirstHeader("Authorization").getValue()); + } + + @Test + void resolvesHostRequestOriginFromContext() throws Exception { + HttpGet original = originalRequest("/request"); + original.addHeader("Authorization", "Bearer secret"); + + HttpGet redirect = new HttpGet("http://example.com/redirect"); + HttpContext context = contextWith(original); + context.setAttribute("http.target_host", new HttpHost("example.com", 80, "http")); + + ApacheHttpClientRedirectInstrumentation.ClientRedirectAdvice.onAfterExecute(context, redirect); + + assertEquals("Bearer secret", redirect.getFirstHeader("Authorization").getValue()); + } + + private static HttpGet originalRequest(final String uri) { + return new HttpGet(uri); + } + + private static HttpContext contextWith(final HttpGet request) throws Exception { + HttpContext context = new BasicHttpContext(); + context.setAttribute("http.request", HttpRequestWrapper.wrap(request)); + return context; + } +} From 466cc7ce8500f9815d30120c8ee838ca170fa6b6 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Wed, 1 Jul 2026 09:49:46 -0400 Subject: [PATCH 107/139] Unify usage of OperatingSystem.architecture() (#11816) Unify usage of OperatingSystem.architecture() Co-Authored-By: Claude Opus 4.8 (1M context) Co-authored-by: alexey.kuznetsov --- .../com/datadog/profiling/controller/EnvironmentChecker.java | 5 ++--- .../groovy/executor/NettyExecutorInstrumentationTest.groovy | 3 +-- .../src/test/groovy/RemoteJDBCInstrumentationTest.groovy | 3 +-- .../restlet-2.2/src/latestDepTest/groovy/RestletTest.groovy | 4 +--- .../test/java/datadog/smoketest/ProcessBuilderHelper.java | 4 +--- .../groovy/datadog/smoketest/Java9ModulesSmokeTest.groovy | 3 +-- .../main/groovy/datadog/smoketest/AbstractSmokeTest.groovy | 3 +-- .../groovy/datadog/smoketest/WebSphereJmxSmokeTest.groovy | 4 +--- 8 files changed, 9 insertions(+), 20 deletions(-) diff --git a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/EnvironmentChecker.java b/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/EnvironmentChecker.java index be2553acade..666aa0029f5 100644 --- a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/EnvironmentChecker.java +++ b/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/EnvironmentChecker.java @@ -1,7 +1,5 @@ package com.datadog.profiling.controller; -import static datadog.environment.OperatingSystem.architecture; - import datadog.environment.JavaVirtualMachine; import datadog.environment.OperatingSystem; import datadog.environment.SystemProperties; @@ -238,7 +236,8 @@ private static boolean checkLoadLibrary(Path target, StringBuilder sb) { @SuppressForbidden private static boolean extractSoFromJar(Path target, StringBuilder sb) throws Exception { URL jarUrl = EnvironmentChecker.class.getProtectionDomain().getCodeSource().getLocation(); - String linuxArchFolder = architecture().isArm64() ? "/linux-arm64/" : "/linux-x64/"; + String linuxArchFolder = + OperatingSystem.architecture().isArm64() ? "/linux-arm64/" : "/linux-x64/"; try (JarFile jarFile = new JarFile(new File(jarUrl.toURI()))) { return jarFile.stream() .filter(e -> e.getName().contains("libjavaProfiler.so")) diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/executor/NettyExecutorInstrumentationTest.groovy b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/executor/NettyExecutorInstrumentationTest.groovy index 727d8060c32..0fd96e40d29 100644 --- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/executor/NettyExecutorInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/executor/NettyExecutorInstrumentationTest.groovy @@ -1,6 +1,5 @@ package executor -import static datadog.environment.OperatingSystem.architecture import static org.junit.jupiter.api.Assumptions.assumeTrue import datadog.environment.OperatingSystem @@ -23,7 +22,7 @@ import spock.lang.Shared // TODO: netty-all 4.1.9 only ships linux-x86_64 epoll native libraries. @IgnoreIf({ - OperatingSystem.isLinux() && architecture().isArm64() + OperatingSystem.isLinux() && OperatingSystem.architecture().isArm64() }) class NettyExecutorInstrumentationTest extends InstrumentationSpecification { diff --git a/dd-java-agent/instrumentation/jdbc/src/test/groovy/RemoteJDBCInstrumentationTest.groovy b/dd-java-agent/instrumentation/jdbc/src/test/groovy/RemoteJDBCInstrumentationTest.groovy index 5c3c676ea37..0637f56d9ef 100644 --- a/dd-java-agent/instrumentation/jdbc/src/test/groovy/RemoteJDBCInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/jdbc/src/test/groovy/RemoteJDBCInstrumentationTest.groovy @@ -2,7 +2,6 @@ import static DbType.MYSQL import static DbType.ORACLE import static DbType.POSTGRESQL import static DbType.SQLSERVER -import static datadog.environment.OperatingSystem.architecture import static datadog.trace.agent.test.utils.TraceUtils.basicSpan import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace import static datadog.trace.api.config.TraceInstrumentationConfig.DB_CLIENT_HOST_SPLIT_BY_INSTANCE @@ -117,7 +116,7 @@ abstract class RemoteJDBCInstrumentationTest extends VersionedNamingTestBase { // MS SQL Server has no arm64 images. return !(db == SQLSERVER && OperatingSystem.isLinux() - && architecture().isArm64()) + && OperatingSystem.architecture().isArm64()) } def peerConnectionProps(DbType db){ diff --git a/dd-java-agent/instrumentation/restlet-2.2/src/latestDepTest/groovy/RestletTest.groovy b/dd-java-agent/instrumentation/restlet-2.2/src/latestDepTest/groovy/RestletTest.groovy index fe504f1a030..5b3d1a75d73 100644 --- a/dd-java-agent/instrumentation/restlet-2.2/src/latestDepTest/groovy/RestletTest.groovy +++ b/dd-java-agent/instrumentation/restlet-2.2/src/latestDepTest/groovy/RestletTest.groovy @@ -1,5 +1,3 @@ -import static datadog.environment.OperatingSystem.architecture - import datadog.environment.OperatingSystem import org.restlet.Request import org.restlet.Response @@ -12,7 +10,7 @@ class RestletTest extends RestletTestBase { @Override boolean testParallelRequest() { // TODO: Parallel processing is failing on Linux arm64. - return !(OperatingSystem.isLinux() && architecture().isArm64()) + return !(OperatingSystem.isLinux() && OperatingSystem.architecture().isArm64()) } @Override diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ProcessBuilderHelper.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ProcessBuilderHelper.java index 7bdc5ddfa24..e0ee9150109 100644 --- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ProcessBuilderHelper.java +++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ProcessBuilderHelper.java @@ -1,7 +1,5 @@ package datadog.smoketest; -import static datadog.environment.OperatingSystem.architecture; - import datadog.environment.OperatingSystem; import java.io.File; import java.nio.file.Path; @@ -59,7 +57,7 @@ public static ProcessBuilder createProcessBuilder( List command = new ArrayList<>(); command.addAll(baseCommand); - if (OperatingSystem.isLinux() && architecture().isArm64()) { + if (OperatingSystem.isLinux() && OperatingSystem.architecture().isArm64()) { // Disable CDS to avoid SIGSEGVs on Linux arm64. command.add(1, "-Xshare:off"); } diff --git a/dd-smoke-tests/java9-modules/src/test/groovy/datadog/smoketest/Java9ModulesSmokeTest.groovy b/dd-smoke-tests/java9-modules/src/test/groovy/datadog/smoketest/Java9ModulesSmokeTest.groovy index 8272215b3fb..57865e57bca 100644 --- a/dd-smoke-tests/java9-modules/src/test/groovy/datadog/smoketest/Java9ModulesSmokeTest.groovy +++ b/dd-smoke-tests/java9-modules/src/test/groovy/datadog/smoketest/Java9ModulesSmokeTest.groovy @@ -1,6 +1,5 @@ package datadog.smoketest -import static datadog.environment.OperatingSystem.architecture import static java.util.concurrent.TimeUnit.SECONDS import datadog.environment.JavaVirtualMachine @@ -9,7 +8,7 @@ import spock.lang.IgnoreIf // TODO: OpenJ9 (Semeru) on Linux arm64 fails on this test. @IgnoreIf({ - OperatingSystem.isLinux() && architecture().isArm64() && JavaVirtualMachine.isJ9() + OperatingSystem.isLinux() && OperatingSystem.architecture().isArm64() && JavaVirtualMachine.isJ9() }) class Java9ModulesSmokeTest extends AbstractSmokeTest { // Estimate for the amount of time instrumentation plus some extra diff --git a/dd-smoke-tests/src/main/groovy/datadog/smoketest/AbstractSmokeTest.groovy b/dd-smoke-tests/src/main/groovy/datadog/smoketest/AbstractSmokeTest.groovy index ae1d2f6b6ef..28b71306349 100644 --- a/dd-smoke-tests/src/main/groovy/datadog/smoketest/AbstractSmokeTest.groovy +++ b/dd-smoke-tests/src/main/groovy/datadog/smoketest/AbstractSmokeTest.groovy @@ -1,6 +1,5 @@ package datadog.smoketest -import static datadog.environment.OperatingSystem.architecture import static datadog.trace.agent.test.server.http.TestHttpServer.httpServer import static datadog.trace.api.ProtocolVersion.V0_4 import static datadog.trace.api.ProtocolVersion.V0_5 @@ -255,7 +254,7 @@ abstract class AbstractSmokeTest extends ProcessManager { } // Disable CDS to avoid SIGSEGVs on Linux arm64. - if (OperatingSystem.isLinux() && architecture().isArm64()) { + if (OperatingSystem.isLinux() && OperatingSystem.architecture().isArm64()) { ret += "-Xshare:off" } ret as String[] diff --git a/dd-smoke-tests/websphere-jmx/src/test/groovy/datadog/smoketest/WebSphereJmxSmokeTest.groovy b/dd-smoke-tests/websphere-jmx/src/test/groovy/datadog/smoketest/WebSphereJmxSmokeTest.groovy index dc3dfdd6efe..81dde64229d 100644 --- a/dd-smoke-tests/websphere-jmx/src/test/groovy/datadog/smoketest/WebSphereJmxSmokeTest.groovy +++ b/dd-smoke-tests/websphere-jmx/src/test/groovy/datadog/smoketest/WebSphereJmxSmokeTest.groovy @@ -1,7 +1,5 @@ package datadog.smoketest -import static datadog.environment.OperatingSystem.architecture - import datadog.environment.OperatingSystem import java.time.Duration import java.util.concurrent.ArrayBlockingQueue @@ -27,7 +25,7 @@ import spock.lang.Shared */ // There is no arm64 docker image for IBM icr.io/appcafe/websphere-traditional. @IgnoreIf({ - OperatingSystem.isLinux() && architecture().isArm64() + OperatingSystem.isLinux() && OperatingSystem.architecture().isArm64() }) class WebSphereJmxSmokeTest extends AbstractSmokeTest { From 4c8105190242ffea95e35519048659dff14aab7e Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Wed, 1 Jul 2026 10:10:18 -0400 Subject: [PATCH 108/139] Clean outdated JFrog reference (#11813) Clean outdated JFrog reference Co-authored-by: sarah.chen --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a56fe676388..58fb26607a2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1251,7 +1251,7 @@ deploy_to_maven_central: - export MAVEN_CENTRAL_PASSWORD=$(aws ssm get-parameter --region us-east-1 --name ci.dd-trace-java.central_password --with-decryption --query "Parameter.Value" --out text) - export GPG_PRIVATE_KEY=$(aws ssm get-parameter --region us-east-1 --name ci.dd-trace-java.signing.gpg_private_key --with-decryption --query "Parameter.Value" --out text) - export GPG_PASSWORD=$(aws ssm get-parameter --region us-east-1 --name ci.dd-trace-java.signing.gpg_passphrase --with-decryption --query "Parameter.Value" --out text) - - ./gradlew -PbuildInfo.build.number=$CI_JOB_ID publishToSonatype closeSonatypeStagingRepository -PskipTests $GRADLE_ARGS + - ./gradlew publishToSonatype closeSonatypeStagingRepository -PskipTests $GRADLE_ARGS artifacts: paths: - 'workspace/dd-java-agent/build/libs/*.jar' From 602a81dfc1dfe81976b42e80059c8fa3156f7389 Mon Sep 17 00:00:00 2001 From: Jaroslav Bachorik Date: Wed, 1 Jul 2026 17:09:31 +0200 Subject: [PATCH 109/139] Restore app context attributes wiped by ddprof setContext on span activation (#11646) Restore app context attributes wiped by ddprof setContext on span activation Co-authored-by: jaroslav.bachorik --- .../profiling-ddprof/build.gradle | 14 + .../ddprof/AppContextSnapshotBenchmark.java | 87 +++++ .../profiling/ddprof/DatadogProfiler.java | 315 +++++++++++++++++- .../ddprof/DatadogProfilerContextSetter.java | 2 +- .../ddprof/DatadogProfilingIntegration.java | 6 +- .../ddprof/DatadogProfilingScope.java | 19 +- .../profiling/ddprof/DatadogProfilerTest.java | 240 +++++++++++++ dd-java-agent/ddprof-lib/gradle.lockfile | 2 +- gradle/libs.versions.toml | 2 +- 9 files changed, 674 insertions(+), 13 deletions(-) create mode 100644 dd-java-agent/agent-profiling/profiling-ddprof/src/jmh/java/com/datadog/profiling/ddprof/AppContextSnapshotBenchmark.java diff --git a/dd-java-agent/agent-profiling/profiling-ddprof/build.gradle b/dd-java-agent/agent-profiling/profiling-ddprof/build.gradle index 2fa61e6d34b..fe99122c3fc 100644 --- a/dd-java-agent/agent-profiling/profiling-ddprof/build.gradle +++ b/dd-java-agent/agent-profiling/profiling-ddprof/build.gradle @@ -1,5 +1,6 @@ plugins { id 'com.gradleup.shadow' + id 'me.champeau.jmh' } ext { @@ -41,6 +42,19 @@ dependencies { } +jmh { + jmhVersion = libs.versions.jmh.get() + duplicateClassesStrategy = DuplicatesStrategy.EXCLUDE + failOnError = false + forceGC = true + if (project.hasProperty('jmhIncludes')) { + includes = [project.jmhIncludes] + } + if (project.hasProperty('jmhProf')) { + profilers = [project.jmhProf] + } +} + configurations.configureEach { resolutionStrategy.cacheChangingModulesFor 0, 'seconds' } diff --git a/dd-java-agent/agent-profiling/profiling-ddprof/src/jmh/java/com/datadog/profiling/ddprof/AppContextSnapshotBenchmark.java b/dd-java-agent/agent-profiling/profiling-ddprof/src/jmh/java/com/datadog/profiling/ddprof/AppContextSnapshotBenchmark.java new file mode 100644 index 00000000000..53dd2ed9932 --- /dev/null +++ b/dd-java-agent/agent-profiling/profiling-ddprof/src/jmh/java/com/datadog/profiling/ddprof/AppContextSnapshotBenchmark.java @@ -0,0 +1,87 @@ +package com.datadog.profiling.ddprof; + +import java.nio.charset.StandardCharsets; +import java.util.concurrent.TimeUnit; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.BenchmarkMode; +import org.openjdk.jmh.annotations.Fork; +import org.openjdk.jmh.annotations.Measurement; +import org.openjdk.jmh.annotations.Mode; +import org.openjdk.jmh.annotations.OutputTimeUnit; +import org.openjdk.jmh.annotations.Param; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.Warmup; + +/** + * Verifies that the ScopeStack pool approach (AppContextSnapshot.copyFrom into a pre-allocated + * slot) is allocation-free on the save/restore hot path. + * + *

    The {@code deepStack} benchmark uses {@code stackDepth=16} to trigger a one-time resize + * (default pool size is 8) and confirm that subsequent iterations at that depth are still + * allocation-free once the pool has grown. + * + *

    Run with: ./gradlew :dd-java-agent:agent-profiling:profiling-ddprof:jmh + * -PjmhIncludes=AppContextSnapshotBenchmark -PjmhProf=gc + * + *

    Expected: gc.alloc.rate.norm ≈ 0 B/op for save, restore, and deepStack (steady state). + */ +@BenchmarkMode(Mode.AverageTime) +@OutputTimeUnit(TimeUnit.NANOSECONDS) +@Warmup(iterations = 3, time = 1) +@Measurement(iterations = 5, time = 1) +@Fork(1) +@State(Scope.Thread) +public class AppContextSnapshotBenchmark { + + @Param({"2", "8"}) + int attrCount; + + /** + * Stack depth for the deepStack benchmark — 16 forces one resize past the default 8-slot pool. + */ + @Param({"8", "16"}) + int stackDepth; + + private DatadogProfiler.AppContextSnapshot source; + private DatadogProfiler.AppContextSnapshot slot; + private DatadogProfiler.ScopeStack stack; + + @Setup + public void setup() { + source = new DatadogProfiler.AppContextSnapshot(attrCount); + for (int i = 0; i < attrCount; i++) { + byte[] utf8 = ("value-" + i).getBytes(StandardCharsets.UTF_8); + source.record(i, i + 1, utf8, "value-" + i); + } + slot = new DatadogProfiler.AppContextSnapshot(attrCount); + stack = new DatadogProfiler.ScopeStack(attrCount); + } + + /** ScopeStack save: copies current snapshot into a pre-allocated pool slot (zero alloc). */ + @Benchmark + public void save() { + slot.copyFrom(source); + } + + /** ScopeStack restore: copies pool slot back into the live snapshot (zero alloc). */ + @Benchmark + public void restore() { + source.copyFrom(slot); + } + + /** + * Borrow {@code stackDepth} slots then release them all. At {@code stackDepth=16} the pool + * resizes during warmup; steady-state measurement confirms zero allocation after growth. + */ + @Benchmark + public void deepStack() { + for (int i = 0; i < stackDepth; i++) { + stack.borrow().copyFrom(source); + } + for (int i = 0; i < stackDepth; i++) { + stack.release(); + } + } +} diff --git a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfiler.java b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfiler.java index 9aedde9e49f..0005e8ea659 100644 --- a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfiler.java +++ b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfiler.java @@ -44,10 +44,12 @@ import datadog.trace.bootstrap.instrumentation.api.TaskWrapper; import datadog.trace.util.TempLocationManager; import java.io.IOException; +import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.attribute.PosixFilePermissions; import java.util.ArrayList; +import java.util.Arrays; import java.util.EnumSet; import java.util.List; import java.util.Set; @@ -108,6 +110,133 @@ public static DatadogProfiler newInstance(ConfigProvider configProvider) { private final List orderedContextAttributes; + // True for each attribute slot that was configured by the application (e.g. foo, bar). + // ddprof wipes all custom slots on setContext; these slots are re-applied via + // reapplyAppContext() on span activation. + private final boolean[] isAppOffset; + + private final boolean hasAppContext; + + /** + * Per-thread snapshot of application attribute values. Lazily allocated; only threads that call + * setContextValue for an app attribute ever allocate. Holds the ddprof constant ID and + * pre-encoded UTF-8 bytes for each slot, ready for a zero-allocation reapply via + * setContextValuesByIdAndBytes. + */ + private final ThreadLocal appContextValues = new ThreadLocal<>(); + + private final ThreadLocal scopeStack = new ThreadLocal<>(); + // Scratch buffer for snapshotTags in recordAppContextValue; per-thread, sized to context slots. + // Lives here rather than on AppContextSnapshot so save-slots in ScopeStack don't carry it. + private final ThreadLocal contextScratch = + new ThreadLocal() { + @Override + protected int[] initialValue() { + return new int[isAppOffset.length]; + } + }; + + /** Per-thread stack of pre-allocated save slots for {@link DatadogProfilingScope}. */ + static final class ScopeStack { + private final int attrCount; + AppContextSnapshot[] slots; + int depth; + + ScopeStack(int attrCount) { + this.attrCount = attrCount; + slots = new AppContextSnapshot[8]; + for (int i = 0; i < slots.length; i++) { + slots[i] = new AppContextSnapshot(attrCount); + } + } + + AppContextSnapshot borrow() { + if (depth >= slots.length) { + AppContextSnapshot[] grown = new AppContextSnapshot[slots.length * 2]; + System.arraycopy(slots, 0, grown, 0, slots.length); + // Eagerly fill the newly added slots so every index is non-null. + for (int i = slots.length; i < grown.length; i++) { + grown[i] = new AppContextSnapshot(attrCount); + } + slots = grown; + } + return slots[depth++]; + } + + void release() { + if (depth > 0) slots[--depth].reset(); + } + } + + // Package-private so DatadogProfilingScope can hold a typed reference for save/restore. + static final class AppContextSnapshot { + private final int[] ids; + private final byte[][] utf8; + // Cached string values for change detection — avoids re-encoding and re-snapshotting + // the constant ID when the same value is set again on the same thread. + private final String[] strings; + // Count of slots with a non-zero constant ID; allows O(1) isEmpty(). + private int nonZeroCount; + + AppContextSnapshot(int size) { + ids = new int[size]; + utf8 = new byte[size][]; + strings = new String[size]; + } + + void record(int offset, int constantId, byte[] utf8Bytes, String value) { + if (ids[offset] == 0 && constantId != 0) { + nonZeroCount++; + } else if (ids[offset] != 0 && constantId == 0) { + nonZeroCount--; + } + ids[offset] = constantId; + utf8[offset] = utf8Bytes; + strings[offset] = value; + } + + void clear(int offset) { + if (ids[offset] != 0) nonZeroCount--; + ids[offset] = 0; + utf8[offset] = null; + strings[offset] = null; + } + + boolean isEmpty() { + return nonZeroCount == 0; + } + + int nonZeroCount() { + return nonZeroCount; + } + + String stringAt(int offset) { + return strings[offset]; + } + + int[] ids() { + return ids; + } + + byte[][] utf8() { + return utf8; + } + + void copyFrom(AppContextSnapshot src) { + System.arraycopy(src.ids, 0, ids, 0, ids.length); + System.arraycopy(src.utf8, 0, utf8, 0, utf8.length); + System.arraycopy(src.strings, 0, strings, 0, strings.length); + nonZeroCount = src.nonZeroCount; + } + + void reset() { + Arrays.fill(ids, 0); + Arrays.fill(utf8, null); + Arrays.fill(strings, null); + nonZeroCount = 0; + } + } + private final long queueTimeThresholdMillis; private final Path recordingsPath; @@ -151,6 +280,19 @@ private DatadogProfiler(ConfigProvider configProvider) { orderedContextAttributes.add(RESOURCE); } this.contextSetter = new ContextSetter(profiler, orderedContextAttributes); + // ContextSetter deduplicates and truncates to 10 internally; size arrays to its actual size. + int contextSize = contextSetter.snapshotTags().length; + boolean[] appOffsets = new boolean[contextSize]; + boolean anyApp = false; + for (String attribute : contextAttributes) { + int idx = contextSetter.offsetOf(attribute); + if (idx >= 0) { + appOffsets[idx] = true; + anyApp = true; + } + } + this.isAppOffset = appOffsets; + this.hasAppContext = anyApp; this.queueTimeThresholdMillis = configProvider.getLong( PROFILING_QUEUEING_TIME_THRESHOLD_MILLIS, @@ -361,6 +503,7 @@ public void setSpanContext(long rootSpanId, long spanId, long traceIdHigh, long } catch (Throwable e) { log.debug("Failed to clear context", e); } + reapplyAppContext(); } public void clearSpanContext() { @@ -370,20 +513,26 @@ public void clearSpanContext() { } catch (Throwable e) { log.debug("Failed to set context", e); } + reapplyAppContext(); } - public boolean setContextValue(int offset, CharSequence value) { + public boolean setContextValue(int offset, String value) { if (contextSetter != null && offset >= 0 && value != null) { try { - return contextSetter.setContextValue(offset, value.toString()); + // Native call first; snapshot updated only on success so Java and ddprof state stay in + // sync. + if (contextSetter.setContextValue(offset, value)) { + recordAppContextValue(offset, value); + return true; + } } catch (Throwable e) { - log.debug("Failed to set context", e); + log.debug("Failed to set context value", e); } } return false; } - public boolean setContextValue(String attribute, CharSequence value) { + public boolean setContextValue(String attribute, String value) { if (contextSetter != null) { return setContextValue(contextSetter.offsetOf(attribute), value); } @@ -400,14 +549,168 @@ public boolean clearContextValue(String attribute) { public boolean clearContextValue(int offset) { if (contextSetter != null && offset >= 0) { try { - return contextSetter.clearContextValue(offset); + // Native call first; snapshot updated only after it returns so a throw leaves both sides + // consistent. + boolean cleared = contextSetter.clearContextValue(offset); + recordAppContextValue(offset, null); + return cleared; } catch (Throwable t) { - log.debug("Failed to clear context", t); + log.debug("Failed to clear context value", t); } } return false; } + /** + * Re-applies this thread's application-managed context attributes after a span activation or + * deactivation. ddprof's {@code setContext} clears all custom attribute slots; this restores only + * the app-owned ones so they remain visible during the new span's lifetime (or after the last + * span closes). No-op when no application attributes are configured or none have been set on this + * thread. + * + *

    Fast path (span activation): uses the pre-computed constant IDs and UTF-8 bytes from {@link + * #recordAppContextValue} in a single {@code setContextValuesByIdAndBytes} call — no String + * allocation, no hash lookup. + * + *

    Fallback (span deactivation via {@code setContext(0,0,0,0)}): {@code clearContextDirect} + * calls {@code detach()} but not {@code attach()}, leaving the thread's {@code validOffset=0}. + * {@code setContextValuesByIdAndBytes} returns {@code false} in that state, so we fall back to + * individual {@code setContextValue} calls which go through the proper detach/attach cycle. + */ + public void reapplyAppContext() { + if (!hasAppContext) { + return; + } + AppContextSnapshot snapshot = appContextValues.get(); + if (snapshot == null) { + return; + } + try { + if (!contextSetter.setContextValuesByIdAndBytes(snapshot.ids(), snapshot.utf8())) { + // validOffset=0 after clearContextDirect (setContext(0,0,0,0) path) — fall back to + // individual writes which go through the proper detach/attach cycle. + int remaining = snapshot.nonZeroCount(); + for (int i = 0; i < isAppOffset.length && remaining > 0; i++) { + String s = snapshot.stringAt(i); + if (s != null) { + contextSetter.setContextValue(i, s); + remaining--; + } + } + } + } catch (Throwable e) { + log.debug("Failed to reapply context", e); + } + } + + /** Clears the per-thread app-context snapshot. Used in tests and internally. */ + void clearAppContextSnapshot() { + appContextValues.remove(); + scopeStack.remove(); + contextScratch.remove(); + } + + /** + * Immediately writes {@code snapshot} into the ddprof native slots for every app-context offset, + * clearing any offset not present in the snapshot. Reads the restored state from the per-thread + * {@code appContextValues} TL (already updated by {@link #restoreAppContext}) rather than from + * the saved slot directly, because {@link ScopeStack#release()} resets the slot before this + * method is called. Called by {@link DatadogProfilingScope#close} so that native state matches + * the restored Java-side snapshot right away, without waiting for the next span activation. + */ + void syncNativeAppContext() { + if (!hasAppContext || contextSetter == null) { + return; + } + AppContextSnapshot snapshot = appContextValues.get(); + try { + for (int i = 0; i < isAppOffset.length; i++) { + if (!isAppOffset[i]) { + continue; + } + String value = snapshot != null ? snapshot.stringAt(i) : null; + if (value != null) { + contextSetter.setContextValue(i, value); + } else { + contextSetter.clearContextValue(i); + } + } + } catch (Throwable e) { + log.debug("Failed to sync native app context on scope close", e); + } + } + + /** + * Returns a copy of the current app-context snapshot for later restoration, or {@code null} if + * nothing is set. Called by {@link DatadogProfilingScope} on construction to implement + * save/restore across scope boundaries. + */ + AppContextSnapshot saveAppContext() { + AppContextSnapshot current = appContextValues.get(); + if (current == null || current.isEmpty()) { + return null; + } + ScopeStack stack = scopeStack.get(); + if (stack == null) { + stack = new ScopeStack(isAppOffset.length); + scopeStack.set(stack); + } + AppContextSnapshot slot = stack.borrow(); + slot.copyFrom(current); + return slot; + } + + /** + * Restores a previously saved app-context snapshot. If {@code saved} is {@code null} the + * ThreadLocal is removed, otherwise the current snapshot is overwritten with {@code saved}. + * Called by {@link DatadogProfilingScope#close()}. + */ + void restoreAppContext(AppContextSnapshot saved) { + if (saved == null) { + appContextValues.remove(); + } else { + AppContextSnapshot current = appContextValues.get(); + if (current == null) { + current = new AppContextSnapshot(isAppOffset.length); + appContextValues.set(current); + } + current.copyFrom(saved); + ScopeStack stack = scopeStack.get(); + if (stack != null) { + stack.release(); + } + } + } + + private void recordAppContextValue(int offset, String value) { + if (!hasAppContext || offset < 0 || offset >= isAppOffset.length || !isAppOffset[offset]) { + return; + } + AppContextSnapshot snapshot = appContextValues.get(); + if (value == null) { + if (snapshot == null) { + return; + } + snapshot.clear(offset); + if (snapshot.isEmpty()) { + appContextValues.remove(); + } + return; + } + if (snapshot == null) { + snapshot = new AppContextSnapshot(isAppOffset.length); + appContextValues.set(snapshot); + } + if (!value.equals(snapshot.stringAt(offset))) { + byte[] utf8Bytes = value.getBytes(StandardCharsets.UTF_8); + // ContextSetter has no single-slot readback API; snapshotTags fills all slots at once. + // The scratch array is per-thread and reused across calls, so this is allocation-free. + int[] scratch = contextScratch.get(); + contextSetter.snapshotTags(scratch); + snapshot.record(offset, scratch[offset], utf8Bytes, value); + } + } + private void debugLogging(long localRootSpanId) { if (detailedDebugLogging && log.isDebugEnabled()) { log.debug("localRootSpanId={}", localRootSpanId, new Throwable()); diff --git a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilerContextSetter.java b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilerContextSetter.java index 58c9fbfd9cb..4bde713bcb6 100644 --- a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilerContextSetter.java +++ b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilerContextSetter.java @@ -11,7 +11,7 @@ public DatadogProfilerContextSetter(String attribute, DatadogProfiler profiler) this.profiler = profiler; } - public void set(CharSequence value) { + public void set(String value) { profiler.setContextValue(offset, value); } diff --git a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilingIntegration.java b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilingIntegration.java index 00a0358d346..65462a46bce 100644 --- a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilingIntegration.java +++ b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilingIntegration.java @@ -41,13 +41,15 @@ public void close() { public void activate(Object context) { if (context instanceof ProfilerContext) { ProfilerContext profilerContext = (ProfilerContext) context; + // setSpanContext() calls reapplyAppContext() internally, so no explicit call is needed. DDPROF.setSpanContext( profilerContext.getRootSpanId(), profilerContext.getSpanId(), profilerContext.getTraceIdHigh(), profilerContext.getTraceIdLow()); - DDPROF.setContextValue(SPAN_NAME_INDEX, profilerContext.getOperationName()); - DDPROF.setContextValue(RESOURCE_NAME_INDEX, profilerContext.getResourceName()); + DDPROF.setContextValue(SPAN_NAME_INDEX, profilerContext.getOperationName().toString()); + DDPROF.setContextValue( + RESOURCE_NAME_INDEX, profilerContext.getResourceName().toString()); } } }; diff --git a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilingScope.java b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilingScope.java index 848769cb091..27454cdc851 100644 --- a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilingScope.java +++ b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilingScope.java @@ -5,9 +5,16 @@ public class DatadogProfilingScope implements ProfilingScope { private final DatadogProfiler profiler; + // Snapshot of the app-managed context slots at scope creation (those registered via + // ProfilingContextAttribute). Restored on close() so ambient values set before this + // scope are not lost when the scope exits. + // Span context slots (managed by DatadogProfilingIntegration) are not snapshotted + // here; their lifecycle is controlled by the tracer's activate/deactivate path. + private final DatadogProfiler.AppContextSnapshot savedAppContext; public DatadogProfilingScope(DatadogProfiler profiler) { this.profiler = profiler; + this.savedAppContext = profiler.saveAppContext(); } @Override @@ -36,7 +43,15 @@ public void clearContextValue(ProfilingContextAttribute attribute) { @Override public void close() { - // ddprof 1.41.0 removed the int-encoding setter; snapshot/restore of tag - // context across nested scopes is no longer supported by the library. + // Restores the app-managed context slots that were active when this scope opened. + // Span context slots are NOT touched here; they are managed independently by the + // tracer via DatadogProfilingIntegration.activate()/close(). + // + // Prior to ddprof 1.45.0 this method was a no-op: ddprof 1.41.0 removed the + // int-encoding setter that the previous snapshot/restore relied on, leaving no + // supported API for restoring context. The new setContextValuesByIdAndBytes API + // (1.45.0) makes targeted per-slot restore possible again — for app slots only. + profiler.restoreAppContext(savedAppContext); + profiler.syncNativeAppContext(); } } diff --git a/dd-java-agent/agent-profiling/profiling-ddprof/src/test/java/com/datadog/profiling/ddprof/DatadogProfilerTest.java b/dd-java-agent/agent-profiling/profiling-ddprof/src/test/java/com/datadog/profiling/ddprof/DatadogProfilerTest.java index 55d39ba52a0..2be7d129e68 100644 --- a/dd-java-agent/agent-profiling/profiling-ddprof/src/test/java/com/datadog/profiling/ddprof/DatadogProfilerTest.java +++ b/dd-java-agent/agent-profiling/profiling-ddprof/src/test/java/com/datadog/profiling/ddprof/DatadogProfilerTest.java @@ -1,7 +1,9 @@ package com.datadog.profiling.ddprof; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -193,6 +195,244 @@ public void testContextRegistration() { assertFalse(Arrays.equals(snapshot2, profiler.snapshot())); } } + + // setSpanContext wipes all custom slots and automatically calls reapplyAppContext() to restore + // them. + int fooOffset = profiler.offsetOf("foo"); + fooSetter.set("reapply-me"); + assertNotEquals(0, profiler.snapshot()[fooOffset]); + + profiler.setSpanContext(1L, 1L, 0L, 1L); + assertNotEquals(0, profiler.snapshot()[fooOffset]); + + profiler.reapplyAppContext(); + assertNotEquals(0, profiler.snapshot()[fooOffset]); + + // Scenario A: clearContextValue must clear the snapshot so reapply has nothing to restore + profiler.clearContextValue("foo"); + assertEquals(0, profiler.snapshot()[fooOffset], "clearContextValue must clear ddprof slot"); + profiler.reapplyAppContext(); + assertEquals( + 0, + profiler.snapshot()[fooOffset], + "after clearContextValue, reapplyAppContext must not restore foo"); + + // Scenario B: scope opened when snapshot is null — close() restores null (pre-scope state) + { + DatadogProfilingScope scope = new DatadogProfilingScope(profiler); + scope.setContextValue("foo", "scope-val"); + assertNotEquals(0, profiler.snapshot()[fooOffset], "foo must be live inside scope"); + scope.close(); + } + profiler.setSpanContext(1L, 1L, 0L, 1L); + profiler.reapplyAppContext(); + assertEquals( + 0, + profiler.snapshot()[fooOffset], + "scope.close() restores pre-scope snapshot (null here), so reapply has nothing to restore"); + + // Scenario B2: scope.close() immediately clears native slot — no span re-activation needed + { + DatadogProfilingScope scope = new DatadogProfilingScope(profiler); + scope.setContextValue("foo", "immediate-clear-val"); + assertNotEquals(0, profiler.snapshot()[fooOffset], "foo must be live inside scope"); + scope.close(); + assertEquals( + 0, + profiler.snapshot()[fooOffset], + "scope.close() must immediately clear native slot without waiting for reapplyAppContext"); + } + + // Scenario B3: scope.close() immediately restores prior context to native slot + fooSetter.set("outer-val"); + int outerEncoding = profiler.snapshot()[fooOffset]; + assertNotEquals(0, outerEncoding, "outer foo must be live before inner scope"); + { + DatadogProfilingScope scope = new DatadogProfilingScope(profiler); + scope.setContextValue("foo", "inner-val"); + int innerEncoding = profiler.snapshot()[fooOffset]; + assertNotEquals(outerEncoding, innerEncoding, "inner scope must change native slot"); + scope.close(); + assertEquals( + outerEncoding, + profiler.snapshot()[fooOffset], + "scope.close() must immediately restore prior native slot value"); + } + profiler.clearContextValue("foo"); + + // Scenario C: reapplyAppContext is idempotent + fooSetter.set("idempotent-value"); + profiler.setSpanContext(1L, 1L, 0L, 1L); + profiler.reapplyAppContext(); + int afterFirst = profiler.snapshot()[fooOffset]; + assertNotEquals(0, afterFirst, "reapplyAppContext must restore foo"); + profiler.reapplyAppContext(); + assertEquals( + afterFirst, + profiler.snapshot()[fooOffset], + "calling reapplyAppContext twice must produce the same result"); + + // Scenario D: re-activation after child activation restores app attr + int parentEncoding = profiler.snapshot()[fooOffset]; + assertNotEquals(0, parentEncoding, "foo must be set before child activation"); + profiler.setSpanContext(2L, 2L, 0L, 2L); + assertEquals( + parentEncoding, + profiler.snapshot()[fooOffset], + "setSpanContext auto-reapplies app context on child activation"); + profiler.setSpanContext(1L, 1L, 0L, 1L); + profiler.reapplyAppContext(); + assertEquals( + parentEncoding, + profiler.snapshot()[fooOffset], + "re-activation + reapply must restore parent app attr"); + + // Scenario E: app attr set in child survives into next activation + profiler.setSpanContext(2L, 2L, 0L, 2L); + fooSetter.set("child-val"); + int childEncoding = profiler.snapshot()[fooOffset]; + assertNotEquals(0, childEncoding, "foo must be set in child context"); + profiler.setSpanContext(1L, 1L, 0L, 1L); + assertEquals( + childEncoding, + profiler.snapshot()[fooOffset], + "setSpanContext auto-reapplies app context (child-val) on re-activation"); + profiler.reapplyAppContext(); + assertEquals( + childEncoding, + profiler.snapshot()[fooOffset], + "ThreadLocal ambient value must survive into the next activation"); + + // Scenario F: app attributes are visible after the last span scope closes. + // clearSpanContext() wipes all custom slots and automatically calls reapplyAppContext(), + // restoring app attrs immediately. + fooSetter.set("pre-close-val"); + assertNotEquals(0, profiler.snapshot()[fooOffset], "foo must be live before clearSpanContext"); + profiler.clearSpanContext(); + assertNotEquals( + 0, profiler.snapshot()[fooOffset], "clearSpanContext must auto-reapply app context"); + profiler.reapplyAppContext(); + assertNotEquals( + 0, + profiler.snapshot()[fooOffset], + "reapplyAppContext after clearSpanContext must restore foo"); + + // Scenario G: no app value set — clearSpanContext + reapplyAppContext leaves slot empty + profiler.clearContextValue("foo"); + profiler.clearAppContextSnapshot(); + profiler.clearSpanContext(); + profiler.reapplyAppContext(); + assertEquals( + 0, + profiler.snapshot()[fooOffset], + "reapplyAppContext with no snapshot must leave foo at 0"); + + // Scenario H: scope.close() restores ambient context set before scope was opened + fooSetter.set("ambient-val"); + // Activate a span so reapplyAppContext can write the value (validOffset=1 after + // setSpanContext). + profiler.setSpanContext(1L, 1L, 0L, 1L); + profiler.reapplyAppContext(); + int ambientEncoding = profiler.snapshot()[fooOffset]; + assertNotEquals(0, ambientEncoding, "ambient foo must be live"); + { + DatadogProfilingScope scope = new DatadogProfilingScope(profiler); + scope.setContextValue("foo", "scope-override"); + assertNotEquals( + ambientEncoding, profiler.snapshot()[fooOffset], "scope must override ambient"); + scope.close(); // must restore ambient snapshot, not nuke it + } + profiler.setSpanContext(1L, 1L, 0L, 1L); + profiler.reapplyAppContext(); + assertEquals( + ambientEncoding, + profiler.snapshot()[fooOffset], + "scope.close() must restore ambient context, not clear it"); + + // Clean up after Scenario H so Acceptance tests start from a neutral state. + profiler.clearContextValue("foo"); + profiler.clearSpanContext(); + + // Acceptance 1: reapply happens automatically inside setSpanContext — no manual call needed. + fooSetter.set("auto-reapply-val"); + assertNotEquals(0, profiler.snapshot()[fooOffset], "foo must be live before setSpanContext"); + profiler.setSpanContext(1L, 1L, 0L, 1L); + // Deliberately NO profiler.reapplyAppContext() here. + assertNotEquals( + 0, + profiler.snapshot()[fooOffset], + "Acceptance 1: setSpanContext must auto-restore app slot without explicit reapplyAppContext"); + profiler.clearContextValue("foo"); + + // Acceptance 2: reapply happens automatically inside clearSpanContext — no manual call needed. + fooSetter.set("clear-reapply-val"); + assertNotEquals(0, profiler.snapshot()[fooOffset], "foo must be live before clearSpanContext"); + profiler.clearSpanContext(); + // Deliberately NO profiler.reapplyAppContext() here. + assertNotEquals( + 0, + profiler.snapshot()[fooOffset], + "Acceptance 2: clearSpanContext must auto-restore app slot without explicit reapplyAppContext"); + profiler.clearContextValue("foo"); + + // Acceptance 3: no app value set — clearSpanContext leaves slot empty. + profiler.clearContextValue("foo"); + profiler.clearAppContextSnapshot(); + profiler.clearSpanContext(); + // Deliberately NO profiler.reapplyAppContext() here. + assertEquals( + 0, + profiler.snapshot()[fooOffset], + "Acceptance 3: clearSpanContext with no app value must leave foo at 0"); + + // Acceptance 4: nonZeroCount accuracy — cleared snapshot is considered empty so a new + // scope's save/restore does not leak a stale entry. + fooSetter.set("v1"); + assertNotEquals(0, profiler.snapshot()[fooOffset], "foo must be live after set"); + profiler.clearContextValue("foo"); + assertEquals(0, profiler.snapshot()[fooOffset], "foo must be 0 after clearContextValue"); + { + DatadogProfilingScope scope4 = new DatadogProfilingScope(profiler); + scope4.setContextValue("foo", "v2"); + assertNotEquals(0, profiler.snapshot()[fooOffset], "foo must be live inside scope4"); + scope4.close(); + } + assertEquals( + 0, + profiler.snapshot()[fooOffset], + "Acceptance 4: scope.close() must restore pre-scope empty state; nonZeroCount must not drift"); + + // Acceptance 5: clearAppContextSnapshot() fully resets per-thread state so no stale value + // leaks through. + fooSetter.set("leak-check"); + assertNotEquals(0, profiler.snapshot()[fooOffset], "foo must be live before reset"); + profiler.clearContextValue("foo"); + profiler.clearAppContextSnapshot(); + { + DatadogProfilingScope scope5 = new DatadogProfilingScope(profiler); + scope5.setContextValue("foo", "after-reset"); + assertNotEquals(0, profiler.snapshot()[fooOffset], "foo must be live inside scope5"); + scope5.close(); + } + profiler.setSpanContext(1L, 1L, 0L, 1L); + // Deliberately NO profiler.reapplyAppContext() here — fold-in suffices. + assertEquals( + 0, + profiler.snapshot()[fooOffset], + "Acceptance 5: after clearAppContextSnapshot, scope.close() restores empty state; no stale value leaks"); + + // Acceptance 6: restoreAppContext does not throw when scope stack is absent on the restoring + // thread. The guard is verified by the absence of an exception on the normal close path. + profiler.clearSpanContext(); + profiler.clearContextValue("foo"); + profiler.clearAppContextSnapshot(); + assertDoesNotThrow( + () -> { + DatadogProfilingScope scope6 = new DatadogProfilingScope(profiler); + scope6.setContextValue("foo", "guard-val"); + scope6.close(); + }, + "Acceptance 6: DatadogProfilingScope.close() must not throw even when scopeStack is absent"); } private static ConfigProvider configProvider( diff --git a/dd-java-agent/ddprof-lib/gradle.lockfile b/dd-java-agent/ddprof-lib/gradle.lockfile index 145897cbafb..916c5f949dc 100644 --- a/dd-java-agent/ddprof-lib/gradle.lockfile +++ b/dd-java-agent/ddprof-lib/gradle.lockfile @@ -5,7 +5,7 @@ ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:ddprof:1.44.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:ddprof:1.45.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs com.github.spotbugs:spotbugs:4.9.8=spotbugs diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6ed047edda2..dc40da9c734 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,7 @@ jsr305 = "3.0.2" spotbugs_annotations = "4.9.8" # DataDog libs and forks -ddprof = "1.44.0" +ddprof = "1.45.0" dogstatsd = "4.4.5" okhttp = "3.12.15" # Datadog fork to support Java 7 From 31fd0ca6d2268ec49eb232b7f24a332f8c668e38 Mon Sep 17 00:00:00 2001 From: James Eastham Date: Wed, 1 Jul 2026 17:18:12 +0100 Subject: [PATCH 110/139] Update EventBridge DSM topic naming (#11603) Update EventBridge DSM topic naming Align EventBridge DSM tags with exchange/topic format Merge branch 'master' into james.eastham/dsm-event-bridge Merge branch 'master' into james.eastham/dsm-event-bridge Merge branch 'master' into james.eastham/dsm-event-bridge Fix EventBridge test formatting Merge branch 'master' into james.eastham/dsm-event-bridge Co-authored-by: devflow.devflow-routing-intake --- .../eventbridge/EventBridgeInterceptor.java | 54 +++++++++++++++++-- .../EventBridgeInterceptorTest.java | 51 ++++++++++++++++++ 2 files changed, 101 insertions(+), 4 deletions(-) create mode 100644 dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/src/test/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeInterceptorTest.java diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeInterceptor.java b/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeInterceptor.java index 6b566886938..7cb54b62230 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeInterceptor.java +++ b/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeInterceptor.java @@ -25,6 +25,8 @@ public class EventBridgeInterceptor implements ExecutionInterceptor { private static final Logger log = LoggerFactory.getLogger(EventBridgeInterceptor.class); + private static final String DEFAULT_EVENT_BUS_NAME = "default"; + private static final String EVENT_BUS_ARN_PREFIX = "event-bus/"; public static final ExecutionAttribute CONTEXT_ATTRIBUTE = InstanceStore.of(ExecutionAttribute.class) @@ -57,7 +59,8 @@ public SdkRequest modifyRequest(ModifyRequest context, ExecutionAttributes execu } String traceContext = - getTraceContextToInject(executionAttributes, entry.eventBusName(), startTime); + getTraceContextToInject( + executionAttributes, entry.eventBusName(), entry.detailType(), startTime); detailBuilder.setLength(detailBuilder.length() - 1); // Remove the last bracket if (detailBuilder.length() > 1) { detailBuilder.append(", "); // Only add a comma if detail is not empty. @@ -79,14 +82,19 @@ public SdkRequest modifyRequest(ModifyRequest context, ExecutionAttributes execu } private String getTraceContextToInject( - ExecutionAttributes executionAttributes, String eventBusName, long startTime) { + ExecutionAttributes executionAttributes, + String eventBusName, + String detailType, + long startTime) { Context context = executionAttributes.getAttribute(CONTEXT_ATTRIBUTE); + String resourceName = + eventBusName == null || eventBusName.isEmpty() ? DEFAULT_EVENT_BUS_NAME : eventBusName; StringBuilder jsonBuilder = new StringBuilder(); jsonBuilder.append('{'); // Inject context if (traceConfig().isDataStreamsEnabled()) { - DataStreamsTags tags = DataStreamsTags.createWithBus(OUTBOUND, eventBusName); + DataStreamsTags tags = buildDataStreamsTags(eventBusName, detailType); DataStreamsContext dsmContext = DataStreamsContext.fromTags(tags); context = context.with(dsmContext); } @@ -103,10 +111,48 @@ private String getTraceContextToInject( .append(" \"") .append(RESOURCE_NAME_KEY) .append("\": \"") - .append(eventBusName) + .append(resourceName) .append('\"'); jsonBuilder.append('}'); return jsonBuilder.toString(); } + + static DataStreamsTags buildDataStreamsTags(String eventBusName, String detailType) { + return new DataStreamsTags( + null, + OUTBOUND, + normalizeEventBusName(eventBusName), + normalizeDetailType(detailType), + "eventbridge", + null, + null, + null, + null, + null, + null, + null, + null, + null); + } + + static String normalizeEventBusName(String eventBusName) { + if (eventBusName == null || eventBusName.isEmpty()) { + return DEFAULT_EVENT_BUS_NAME; + } + + // EventBridge ARNs embed the full bus name after "event-bus/", including partner bus paths. + int arnBusNameStart = eventBusName.indexOf(EVENT_BUS_ARN_PREFIX); + if (arnBusNameStart >= 0) { + return eventBusName.substring(arnBusNameStart + EVENT_BUS_ARN_PREFIX.length()); + } + return eventBusName; + } + + static String normalizeDetailType(String detailType) { + if (detailType == null || detailType.isEmpty()) { + return null; + } + return detailType; + } } diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/src/test/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeInterceptorTest.java b/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/src/test/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeInterceptorTest.java new file mode 100644 index 00000000000..b30ccec011a --- /dev/null +++ b/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/src/test/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeInterceptorTest.java @@ -0,0 +1,51 @@ +package datadog.trace.instrumentation.aws.v2.eventbridge; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + +import datadog.trace.api.datastreams.DataStreamsTags; +import org.junit.jupiter.api.Test; + +class EventBridgeInterceptorTest { + + @Test + void buildsDataStreamsTagsFromArnAndDetailType() { + DataStreamsTags tags = + EventBridgeInterceptor.buildDataStreamsTags( + "arn:aws:events:us-east-1:123456789012:event-bus/test-bus", "order.created"); + + assertEquals(DataStreamsTags.DIRECTION_TAG + ":out", tags.getDirection()); + assertEquals(DataStreamsTags.EXCHANGE_TAG + ":test-bus", tags.getExchange()); + assertEquals(DataStreamsTags.TOPIC_TAG + ":order.created", tags.getTopic()); + assertEquals(DataStreamsTags.TYPE_TAG + ":eventbridge", tags.getType()); + } + + @Test + void keepsPartnerBusPathWhenNormalizingArn() { + DataStreamsTags tags = + EventBridgeInterceptor.buildDataStreamsTags( + "arn:aws:events:us-east-1:123456789012:event-bus/aws.partner/example.com/acct/bus-name", + "detail-type"); + + assertEquals( + DataStreamsTags.EXCHANGE_TAG + ":aws.partner/example.com/acct/bus-name", + tags.getExchange()); + assertEquals(DataStreamsTags.TOPIC_TAG + ":detail-type", tags.getTopic()); + } + + @Test + void defaultsToTheDefaultEventBusNameWhenMissing() { + DataStreamsTags tags = EventBridgeInterceptor.buildDataStreamsTags(null, "detail-type"); + + assertEquals(DataStreamsTags.EXCHANGE_TAG + ":default", tags.getExchange()); + assertEquals(DataStreamsTags.TOPIC_TAG + ":detail-type", tags.getTopic()); + } + + @Test + void omitsTheTopicTagWhenDetailTypeIsMissing() { + DataStreamsTags tags = EventBridgeInterceptor.buildDataStreamsTags("test-bus", null); + + assertEquals(DataStreamsTags.EXCHANGE_TAG + ":test-bus", tags.getExchange()); + assertNull(tags.getTopic()); + } +} From dc67b24069ddec5c176723c88b0b619085a1c6e4 Mon Sep 17 00:00:00 2001 From: Stuart McCulloch Date: Wed, 1 Jul 2026 17:45:22 +0100 Subject: [PATCH 111/139] Migrate simple try-with-resources use of AgentScope to ContextScope (#11763) Migrate simple try-with-resources use of AgentScope to ContextScope Co-authored-by: devflow.devflow-routing-intake --- .../com/datadog/aiguard/AIGuardInternal.java | 4 +-- .../httpurlconnection/HttpUrlState.java | 8 ++--- .../java/concurrent/Wrapper.java | 3 +- .../datadog/debugger/probe/LogProbeTest.java | 6 ++-- .../datadog/debugger/CapturedSnapshot20.java | 4 +-- .../datadog/debugger/CapturedSnapshot21.java | 10 +++---- .../datadog/debugger/CapturedSnapshot28.java | 4 +-- .../main/java/com/datadog/iast/Reporter.java | 3 +- .../aerospike4/TracingListener.java | 20 ++++++------- .../src/test/java/LinearTask.java | 4 +-- .../TraceContinuedFutureCallback.java | 7 +++-- .../TraceContinuedFutureCallback.java | 7 +++-- .../grpc/server/TracingServerInterceptor.java | 16 +++++----- .../aws/v0/AwsSdkClientDecorator.java | 10 +++---- .../aws/v2/TracingExecutionInterceptor.java | 4 +-- .../datastax/cassandra4/TracingSession.java | 6 ++-- .../gax/GaxRetryContinuationTest.java | 10 +++---- ...MessageReceiverWithAckResponseWrapper.java | 4 +-- .../googlepubsub/MessageReceiverWrapper.java | 4 +-- .../graphqljava/InstrumentedDataFetcher.java | 6 ++-- .../grizzly/client/AsyncHandlerAdapter.java | 10 +++---- .../grpc/server/TracingServerInterceptor.java | 16 +++++----- .../RecursiveThreadPoolExecution.java | 4 +-- ...ThreadPoolMixedSubmissionAndExecution.java | 4 +-- .../RecursiveThreadPoolSubmission.java | 4 +-- .../src/test/java/forkjoin/LinearTask.java | 4 +-- .../src/test/java/runnable/Descendant.java | 4 +-- .../java/net/UrlInstrumentation.java | 4 +-- .../httpclient/BodyHandlerWrapper.java | 7 +++-- .../httpclient/CompletableFutureWrapper.java | 3 +- .../instrumentation/jdbc/JDBCDecorator.java | 4 +-- .../jetty_client12/CallbackWrapper.java | 23 ++++++++------- .../jetty_client/CallbackWrapper.java | 29 ++++++++++--------- .../jetty12/JettyRunnableWrapper.java | 3 +- .../jms/DatadogMessageListener.java | 4 +-- .../org/example/TestFailedThenSucceed.java | 6 ++-- .../org/example/TestFailedThenSucceed.java | 6 ++-- .../junit5/BeforeAfterOperationsTracer.java | 4 +-- .../kafka_clients/KafkaProducerCallback.java | 4 +-- .../KafkaProducerCallback.java | 4 +-- .../v4_0/EncodeHttpResponseAdvice.java | 4 +-- .../v4_0/EncodeHttpResponseAdvice2.java | 4 +-- .../v4_0/EncodeHttpResponseAdvice3.java | 4 +-- .../mongo/MongoCommandListener.java | 4 +-- .../HttpClientRequestTracingHandler.java | 5 ++-- .../HttpClientResponseTracingHandler.java | 10 +++---- .../WebSocketServerRequestTracingHandler.java | 10 +++---- ...WebSocketServerResponseTracingHandler.java | 10 +++---- .../HttpClientRequestTracingHandler.java | 5 ++-- .../HttpClientResponseTracingHandler.java | 14 ++++----- .../WebSocketServerRequestTracingHandler.java | 10 +++---- ...WebSocketServerResponseTracingHandler.java | 10 +++---- .../HttpClientRequestTracingHandler.java | 5 ++-- .../HttpClientResponseTracingHandler.java | 14 ++++----- .../WebSocketServerInboundTracingHandler.java | 10 +++---- ...WebSocketServerOutboundTracingHandler.java | 10 +++---- .../netty4/promise/ListenerWrapper.java | 5 ++-- .../okhttp2/TracingInterceptor.java | 4 +-- .../okhttp3/TracingInterceptor.java | 4 +-- .../SessionIdPropagationForkedTest.java | 3 +- .../playws1/AsyncHandlerWrapper.java | 5 ++-- .../playws2/AsyncHandlerWrapper.java | 5 ++-- .../playws21/AsyncHandlerWrapper.java | 5 ++-- .../ratpack/ActionWrapper.java | 4 +-- .../instrumentation/ratpack/BlockWrapper.java | 4 +-- .../ratpack/TracingHandler.java | 6 ++-- .../resilience4j/WrapperWithContext.java | 23 ++++++++------- .../resilience4j/ReactorHelper.java | 4 +-- .../jaxrs/ClientTracingFilter.java | 4 +-- .../rxjava/TracedOnSubscribe.java | 4 +-- .../rxjava/TracedSubscriber.java | 10 +++---- .../src/test/java/LinearTask.java | 4 +-- .../SpannedMethodInvocation.java | 5 ++-- .../SpringSchedulingRunnableWrapper.java | 4 +-- .../client/TraceWebClientSubscriber.java | 10 +++---- .../client/WebClientTracingFilter.java | 4 +-- .../spymemcached/CompletionListener.java | 8 ++--- .../tibcobw5/TaskInstrumentation.java | 3 +- .../tibcobw6/ProcessInstrumentation.java | 4 +-- .../undertow/UndertowRunnableWrapper.java | 3 +- .../RedisAPIImplSendAdvice.java | 4 +-- .../vertx_3_4/server/RouteHandlerWrapper.java | 4 +-- .../vertx_4_0/server/RouteHandlerWrapper.java | 4 +-- .../websocket/jsr256/TracingOutputStream.java | 8 ++--- .../websocket/jsr256/TracingSendHandler.java | 4 +-- .../websocket/jsr256/TracingWriter.java | 6 ++-- .../jetty10/MethodHandleWrappers.java | 6 ++-- .../ProcessImplInstrumentationHelpers.java | 3 +- 88 files changed, 305 insertions(+), 285 deletions(-) diff --git a/dd-java-agent/agent-aiguard/src/main/java/com/datadog/aiguard/AIGuardInternal.java b/dd-java-agent/agent-aiguard/src/main/java/com/datadog/aiguard/AIGuardInternal.java index 55514ba0a52..11ede90b51c 100644 --- a/dd-java-agent/agent-aiguard/src/main/java/com/datadog/aiguard/AIGuardInternal.java +++ b/dd-java-agent/agent-aiguard/src/main/java/com/datadog/aiguard/AIGuardInternal.java @@ -11,6 +11,7 @@ import com.squareup.moshi.Moshi; import com.squareup.moshi.Types; import datadog.communication.http.OkHttpUtils; +import datadog.context.ContextScope; import datadog.trace.api.Config; import datadog.trace.api.aiguard.AIGuard; import datadog.trace.api.aiguard.AIGuard.AIGuardAbortError; @@ -26,7 +27,6 @@ import datadog.trace.api.aiguard.noop.NoOpEvaluator; import datadog.trace.api.gateway.RequestContext; import datadog.trace.api.telemetry.WafMetricCollector; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import datadog.trace.bootstrap.instrumentation.api.ClientIpAddressData; @@ -281,7 +281,7 @@ public Evaluation evaluate(final List messages, final Options options) // sure client IP tags were populated. copyAnomalyDetectionTags(span, localRootSpan); } - try (final AgentScope scope = tracer.activateSpan(span)) { + try (final ContextScope scope = tracer.activateSpan(span)) { final Message last = messages.get(messages.size() - 1); if (isToolCall(last)) { span.setTag(TARGET_TAG, "tool"); diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/httpurlconnection/HttpUrlState.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/httpurlconnection/HttpUrlState.java index c0871f847b0..71e4f076a62 100644 --- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/httpurlconnection/HttpUrlState.java +++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/httpurlconnection/HttpUrlState.java @@ -5,8 +5,8 @@ import static datadog.trace.bootstrap.instrumentation.httpurlconnection.HttpUrlConnectionDecorator.DECORATE; import static datadog.trace.bootstrap.instrumentation.httpurlconnection.HttpUrlConnectionDecorator.HTTP_URL_CONNECTION; +import datadog.context.ContextScope; import datadog.trace.bootstrap.ContextStore; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.net.HttpURLConnection; @@ -18,7 +18,7 @@ public class HttpUrlState { public AgentSpan start(final HttpURLConnection connection) { span = startSpan(HTTP_URL_CONNECTION.toString(), DECORATE.operationName()); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { DECORATE.afterStart(span); DECORATE.onRequest(span, connection); return span; @@ -39,7 +39,7 @@ public void finish() { public void finishSpan( final HttpURLConnection connection, final int responseCode, final Throwable throwable) { - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { if (responseCode > 0) { // safe to access response data as 'responseCode' is set DECORATE.onResponse(span, connection); @@ -62,7 +62,7 @@ public void finishSpan(final HttpURLConnection connection, final int responseCod * (e.g. breaks getOutputStream). */ if (responseCode > 0) { - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { // safe to access response data as 'responseCode' is set DECORATE.onResponse(span, connection); DECORATE.beforeFinish(span); diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/Wrapper.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/Wrapper.java index 5945ac4742f..6fc68a77975 100644 --- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/Wrapper.java +++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/Wrapper.java @@ -5,6 +5,7 @@ import static datadog.trace.bootstrap.instrumentation.java.concurrent.ExcludeFilter.ExcludeType.RUNNABLE; import static datadog.trace.bootstrap.instrumentation.java.concurrent.ExcludeFilter.exclude; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import java.util.concurrent.RunnableFuture; @@ -43,7 +44,7 @@ public Wrapper(T delegate, AgentScope.Continuation continuation) { @Override public void run() { - try (AgentScope scope = activate()) { + try (ContextScope scope = activate()) { delegate.run(); } } diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/probe/LogProbeTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/probe/LogProbeTest.java index 07b7ae05185..a3c25c48021 100644 --- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/probe/LogProbeTest.java +++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/probe/LogProbeTest.java @@ -16,6 +16,7 @@ import com.datadog.debugger.sink.DebuggerSink; import com.datadog.debugger.sink.ProbeStatusSink; import com.datadog.debugger.sink.Snapshot; +import datadog.context.ContextScope; import datadog.trace.api.Config; import datadog.trace.api.IdGenerationStrategy; import datadog.trace.bootstrap.debugger.CapturedContext; @@ -23,7 +24,6 @@ import datadog.trace.bootstrap.debugger.MethodLocation; import datadog.trace.bootstrap.debugger.ProbeId; import datadog.trace.bootstrap.debugger.ProbeRateLimiter; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import datadog.trace.bootstrap.instrumentation.api.AgentTracer.TracerAPI; @@ -136,7 +136,7 @@ private int runTrace(TracerAPI tracer, boolean captureSnapshot, Integer line, St if (sessionId != null) { span.setTag(Tags.PROPAGATED_DEBUG, sessionId + ":1"); } - try (AgentScope scope = tracer.activateManualSpan(span)) { + try (ContextScope scope = tracer.activateManualSpan(span)) { Builder builder = createLog("Budget testing").probeId(ProbeId.newId()).captureSnapshot(captureSnapshot); if (sessionId != null) { @@ -177,7 +177,7 @@ private boolean fillSnapshot(DebugSessionStatus status) { CoreTracer.builder().idGenerationStrategy(IdGenerationStrategy.fromName("random")).build(); AgentTracer.registerIfAbsent(tracer); AgentSpan span = tracer.startSpan("log probe debug session testing", "test span"); - try (AgentScope scope = tracer.activateManualSpan(span)) { + try (ContextScope scope = tracer.activateManualSpan(span)) { if (status == DebugSessionStatus.ACTIVE) { span.setTag(Tags.PROPAGATED_DEBUG, DEBUG_SESSION_ID + ":1"); } else if (status == DebugSessionStatus.DISABLED) { diff --git a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CapturedSnapshot20.java b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CapturedSnapshot20.java index 85061184202..d133f975073 100644 --- a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CapturedSnapshot20.java +++ b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CapturedSnapshot20.java @@ -1,7 +1,7 @@ package com.datadog.debugger; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.TracerInstaller; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import datadog.trace.core.CoreTracer; @@ -25,7 +25,7 @@ public class CapturedSnapshot20 { public static int main(String arg) { AgentTracer.TracerAPI tracerAPI = AgentTracer.get(); AgentSpan span = tracerAPI.buildSpan("dynamic-instrumentation", "process").start(); - try (AgentScope scope = tracerAPI.activateManualSpan(span)) { + try (ContextScope scope = tracerAPI.activateManualSpan(span)) { if (arg.equals("exception") || arg.equals("illegal")) { return new CapturedSnapshot20().processWithException(arg); } diff --git a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CapturedSnapshot21.java b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CapturedSnapshot21.java index eb097c0b7a7..3f79b2e81f5 100644 --- a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CapturedSnapshot21.java +++ b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CapturedSnapshot21.java @@ -1,7 +1,7 @@ package com.datadog.debugger; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.TracerInstaller; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import datadog.trace.core.CoreTracer; @@ -25,7 +25,7 @@ public class CapturedSnapshot21 { public static int main(String arg) { AgentTracer.TracerAPI tracerAPI = AgentTracer.get(); AgentSpan span = tracerAPI.buildSpan("dynamic-instrumentation", "rootProcess").start(); - try (AgentScope scope = tracerAPI.activateManualSpan(span)) { + try (ContextScope scope = tracerAPI.activateManualSpan(span)) { return new CapturedSnapshot21().rootProcess(arg); } finally { span.finish(); @@ -35,7 +35,7 @@ public static int main(String arg) { private int rootProcess(String arg) { AgentTracer.TracerAPI tracerAPI = AgentTracer.get(); AgentSpan span = tracerAPI.buildSpan("dynamic-instrumentation", "process1").start(); - try (AgentScope scope = tracerAPI.activateManualSpan(span)) { + try (ContextScope scope = tracerAPI.activateManualSpan(span)) { return process1(arg) + 1; } finally { span.finish(); @@ -45,7 +45,7 @@ private int rootProcess(String arg) { private int process1(String arg) { AgentTracer.TracerAPI tracerAPI = AgentTracer.get(); AgentSpan span = tracerAPI.buildSpan("dynamic-instrumentation", "process2").start(); - try (AgentScope scope = tracerAPI.activateManualSpan(span)) { + try (ContextScope scope = tracerAPI.activateManualSpan(span)) { return process2(arg) + 1; } finally { span.finish(); @@ -55,7 +55,7 @@ private int process1(String arg) { private int process2(String arg) { AgentTracer.TracerAPI tracerAPI = AgentTracer.get(); AgentSpan span = tracerAPI.buildSpan("dynamic-instrumentation", "process3").start(); - try (AgentScope scope = tracerAPI.activateManualSpan(span)) { + try (ContextScope scope = tracerAPI.activateManualSpan(span)) { return process3(arg) + 1; } finally { span.finish(); diff --git a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CapturedSnapshot28.java b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CapturedSnapshot28.java index 5060b569597..a756ffd10c1 100644 --- a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CapturedSnapshot28.java +++ b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CapturedSnapshot28.java @@ -1,7 +1,7 @@ package com.datadog.debugger; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.TracerInstaller; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import datadog.trace.core.CoreTracer; @@ -26,7 +26,7 @@ public class CapturedSnapshot28 { public static int main(String arg) { AgentTracer.TracerAPI tracerAPI = AgentTracer.get(); AgentSpan span = tracerAPI.buildSpan("dynamic-instrumentation", "process").start(); - try (AgentScope scope = tracerAPI.activateManualSpan(span)) { + try (ContextScope scope = tracerAPI.activateManualSpan(span)) { return new CapturedSnapshot28().process(arg); } finally { span.finish(); diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/Reporter.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/Reporter.java index f5b9a16ff00..2a8ecd671b2 100644 --- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/Reporter.java +++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/Reporter.java @@ -7,6 +7,7 @@ import com.datadog.iast.model.Vulnerability; import com.datadog.iast.model.VulnerabilityBatch; import com.datadog.iast.taint.TaintedObjects; +import datadog.context.ContextScope; import datadog.trace.api.Config; import datadog.trace.api.ProductTraceSource; import datadog.trace.api.gateway.RequestContext; @@ -61,7 +62,7 @@ public void report(@Nullable final AgentSpan span, @Nonnull final Vulnerability } if (span == null) { final AgentSpan newSpan = startNewSpan(); - try (final AgentScope autoClosed = tracer().activateManualSpan(newSpan)) { + try (final ContextScope autoClosed = tracer().activateManualSpan(newSpan)) { vulnerability.updateSpan(newSpan); reportVulnerability(newSpan, vulnerability); } finally { diff --git a/dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/TracingListener.java b/dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/TracingListener.java index b51b7b67398..e645c2e4660 100644 --- a/dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/TracingListener.java +++ b/dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/TracingListener.java @@ -17,7 +17,7 @@ import com.aerospike.client.listener.RecordListener; import com.aerospike.client.listener.RecordSequenceListener; import com.aerospike.client.listener.WriteListener; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope.Continuation; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.util.List; @@ -73,7 +73,7 @@ public void onSuccess(final Key key, final boolean exists) { clientSpan.finish(); if (listener != null) { - try (final AgentScope scope = continuation.activate()) { + try (final ContextScope scope = continuation.activate()) { if (listener instanceof ExistsListener) { ((ExistsListener) listener).onSuccess(key, exists); } else if (listener instanceof DeleteListener) { @@ -91,7 +91,7 @@ public void onSuccess(final Key[] keys, final boolean[] exists) { clientSpan.finish(); if (listener != null) { - try (final AgentScope scope = continuation.activate()) { + try (final ContextScope scope = continuation.activate()) { ((ExistsArrayListener) listener).onSuccess(keys, exists); } } else { @@ -105,7 +105,7 @@ public void onSuccess(final Key key, final Record record) { clientSpan.finish(); if (listener != null) { - try (final AgentScope scope = continuation.activate()) { + try (final ContextScope scope = continuation.activate()) { ((RecordListener) listener).onSuccess(key, record); } } else { @@ -119,7 +119,7 @@ public void onSuccess(final Key[] keys, final Record[] records) { clientSpan.finish(); if (listener != null) { - try (final AgentScope scope = continuation.activate()) { + try (final ContextScope scope = continuation.activate()) { ((RecordArrayListener) listener).onSuccess(keys, records); } } else { @@ -133,7 +133,7 @@ public void onSuccess(final List records) { clientSpan.finish(); if (listener != null) { - try (final AgentScope scope = continuation.activate()) { + try (final ContextScope scope = continuation.activate()) { ((BatchListListener) listener).onSuccess(records); } } else { @@ -147,7 +147,7 @@ public void onSuccess(final Key key) { clientSpan.finish(); if (listener != null) { - try (final AgentScope scope = continuation.activate()) { + try (final ContextScope scope = continuation.activate()) { ((WriteListener) listener).onSuccess(key); } } else { @@ -161,7 +161,7 @@ public void onSuccess(final Key key, final Object obj) { clientSpan.finish(); if (listener != null) { - try (final AgentScope scope = continuation.activate()) { + try (final ContextScope scope = continuation.activate()) { ((ExecuteListener) listener).onSuccess(key, obj); } } else { @@ -175,7 +175,7 @@ public void onSuccess() { clientSpan.finish(); if (listener != null) { - try (final AgentScope scope = continuation.activate()) { + try (final ContextScope scope = continuation.activate()) { if (listener instanceof ExistsSequenceListener) { ((ExistsSequenceListener) listener).onSuccess(); } else if (listener instanceof RecordSequenceListener) { @@ -196,7 +196,7 @@ public void onFailure(final AerospikeException error) { clientSpan.finish(); if (listener != null) { - try (final AgentScope scope = continuation.activate()) { + try (final ContextScope scope = continuation.activate()) { if (listener instanceof ExistsListener) { ((ExistsListener) listener).onFailure(error); } else if (listener instanceof ExistsSequenceListener) { diff --git a/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/test/java/LinearTask.java b/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/test/java/LinearTask.java index caffe6096f5..14be3d3601b 100644 --- a/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/test/java/LinearTask.java +++ b/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/test/java/LinearTask.java @@ -2,7 +2,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; import akka.dispatch.forkjoin.RecursiveTask; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; public class LinearTask extends RecursiveTask { @@ -32,7 +32,7 @@ protected Integer compute() { } else { int next = parent + 1; AgentSpan span = startSpan("test", Integer.toString(next)); - try (AgentScope scope = activateSpan(span)) { + try (ContextScope scope = activateSpan(span)) { LinearTask child = new LinearTask(next, depth); return child.fork().join(); } finally { diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/TraceContinuedFutureCallback.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/TraceContinuedFutureCallback.java index 5217f109822..28714b150c3 100644 --- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/TraceContinuedFutureCallback.java +++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/TraceContinuedFutureCallback.java @@ -3,6 +3,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopContinuation; import static datadog.trace.instrumentation.apachehttpasyncclient.ApacheHttpAsyncClientDecorator.DECORATE; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import org.apache.http.concurrent.FutureCallback; @@ -35,7 +36,7 @@ public void completed(final T result) { if (parentContinuation == noopContinuation()) { completeDelegate(result); } else { - try (final AgentScope scope = parentContinuation.activate()) { + try (final ContextScope scope = parentContinuation.activate()) { completeDelegate(result); } } @@ -51,7 +52,7 @@ public void failed(final Exception ex) { if (parentContinuation == noopContinuation()) { failDelegate(ex); } else { - try (final AgentScope scope = parentContinuation.activate()) { + try (final ContextScope scope = parentContinuation.activate()) { failDelegate(ex); } } @@ -66,7 +67,7 @@ public void cancelled() { if (parentContinuation == noopContinuation()) { cancelDelegate(); } else { - try (final AgentScope scope = parentContinuation.activate()) { + try (final ContextScope scope = parentContinuation.activate()) { cancelDelegate(); } } diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/TraceContinuedFutureCallback.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/TraceContinuedFutureCallback.java index d283b9c7ca5..f279651b0c4 100644 --- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/TraceContinuedFutureCallback.java +++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/TraceContinuedFutureCallback.java @@ -3,6 +3,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopContinuation; import static datadog.trace.instrumentation.apachehttpclient5.ApacheHttpClientDecorator.DECORATE; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import javax.annotation.Nullable; @@ -38,7 +39,7 @@ public void completed(final T result) { if (parentContinuation == noopContinuation()) { completeDelegate(result); } else { - try (final AgentScope scope = parentContinuation.activate()) { + try (final ContextScope scope = parentContinuation.activate()) { completeDelegate(result); } } @@ -54,7 +55,7 @@ public void failed(final Exception ex) { if (parentContinuation == noopContinuation()) { failDelegate(ex); } else { - try (final AgentScope scope = parentContinuation.activate()) { + try (final ContextScope scope = parentContinuation.activate()) { failDelegate(ex); } } @@ -69,7 +70,7 @@ public void cancelled() { if (parentContinuation == noopContinuation()) { cancelDelegate(); } else { - try (final AgentScope scope = parentContinuation.activate()) { + try (final ContextScope scope = parentContinuation.activate()) { cancelDelegate(); } } diff --git a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/TracingServerInterceptor.java b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/TracingServerInterceptor.java index 9661d73feaf..7acce3e37fe 100644 --- a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/TracingServerInterceptor.java +++ b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/TracingServerInterceptor.java @@ -11,6 +11,7 @@ import static datadog.trace.instrumentation.armeria.grpc.server.GrpcServerDecorator.GRPC_SERVER; import static datadog.trace.instrumentation.armeria.grpc.server.GrpcServerDecorator.SERVER_PATHWAY_EDGE_TAGS; +import datadog.context.ContextScope; import datadog.trace.api.Config; import datadog.trace.api.cache.DDCache; import datadog.trace.api.cache.DDCaches; @@ -21,7 +22,6 @@ import datadog.trace.api.gateway.IGSpanInfo; import datadog.trace.api.gateway.RequestContext; import datadog.trace.api.gateway.RequestContextSlot; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; @@ -91,7 +91,7 @@ public ServerCall.Listener interceptCall( DECORATE.onCall(span, call); final ServerCall.Listener result; - try (AgentScope scope = activateSpan(span)) { + try (ContextScope scope = activateSpan(span)) { // Wrap the server call so that we can decorate the span // with the resulting status final TracingServerCall tracingServerCall = new TracingServerCall<>(span, call); @@ -123,7 +123,7 @@ static final class TracingServerCall @Override public void close(final Status status, final Metadata trailers) { DECORATE.onClose(span, status); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { delegate().close(status, trailers); } catch (final Throwable e) { DECORATE.onError(span, e); @@ -153,7 +153,7 @@ public void onMessage(final ReqT message) { startSpan(DECORATE.instrumentationNames()[0], GRPC_MESSAGE, this.span.spanContext()) .setTag("message.type", message.getClass().getName()); DECORATE.afterStart(msgSpan); - try (AgentScope scope = activateSpan(msgSpan)) { + try (ContextScope scope = activateSpan(msgSpan)) { callIGCallbackGrpcMessage(msgSpan, message); delegate().onMessage(message); } catch (final Throwable e) { @@ -173,7 +173,7 @@ public void onMessage(final ReqT message) { @Override public void onHalfClose() { - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { delegate().onHalfClose(); } catch (final Throwable e) { if (span.phasedFinish()) { @@ -189,7 +189,7 @@ public void onHalfClose() { @Override public void onCancel() { // Finishes span. - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { delegate().onCancel(); span.setTag("canceled", true); } catch (CancellationException e) { @@ -210,7 +210,7 @@ public void onCancel() { @Override public void onComplete() { // Finishes span. - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { delegate().onComplete(); } catch (final Throwable e) { DECORATE.onError(span, e); @@ -230,7 +230,7 @@ public void onComplete() { @Override public void onReady() { - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { delegate().onReady(); } catch (final Throwable e) { if (span.phasedFinish()) { diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/AwsSdkClientDecorator.java b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/AwsSdkClientDecorator.java index e2a56e73500..4f3343ab674 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/AwsSdkClientDecorator.java +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/AwsSdkClientDecorator.java @@ -11,6 +11,7 @@ import com.amazonaws.Request; import com.amazonaws.Response; import com.amazonaws.http.HttpMethodName; +import datadog.context.ContextScope; import datadog.context.propagation.CarrierSetter; import datadog.trace.api.Config; import datadog.trace.api.DDTags; @@ -18,7 +19,6 @@ import datadog.trace.api.cache.DDCaches; import datadog.trace.api.datastreams.DataStreamsTags; import datadog.trace.api.naming.SpanNaming; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import datadog.trace.bootstrap.instrumentation.api.InstrumentationTags; @@ -206,14 +206,14 @@ public AgentSpan onRequest(final AgentSpan span, final Request request) { if (null != streamArn && "AmazonKinesis".equals(awsServiceName)) { switch (awsOperation.getSimpleName()) { case PUT_RECORD_OPERATION_NAME: - try (AgentScope scope = AgentTracer.activateSpan(span)) { + try (ContextScope scope = AgentTracer.activateSpan(span)) { AgentTracer.get() .getDataStreamsMonitoring() .setProduceCheckpoint("kinesis", streamArn); } break; case PUT_RECORDS_OPERATION_NAME: - try (AgentScope scope = AgentTracer.activateSpan(span)) { + try (ContextScope scope = AgentTracer.activateSpan(span)) { List records = access.getRecords(originalRequest); for (Object ignored : records) { AgentTracer.get() @@ -228,12 +228,12 @@ public AgentSpan onRequest(final AgentSpan span, final Request request) { } else if (null != topicName && "AmazonSNS".equals(awsServiceName)) { switch (awsOperation.getSimpleName()) { case PUBLISH_OPERATION_NAME: - try (AgentScope scope = AgentTracer.activateSpan(span)) { + try (ContextScope scope = AgentTracer.activateSpan(span)) { AgentTracer.get().getDataStreamsMonitoring().setProduceCheckpoint("sns", topicName); } break; case PUBLISH_BATCH_OPERATION_NAME: - try (AgentScope scope = AgentTracer.activateSpan(span)) { + try (ContextScope scope = AgentTracer.activateSpan(span)) { List entries = access.getEntries(originalRequest); for (Object ignored : entries) { AgentTracer.get().getDataStreamsMonitoring().setProduceCheckpoint("sns", topicName); diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/TracingExecutionInterceptor.java b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/TracingExecutionInterceptor.java index 8c0492406e1..980f08ca118 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/TracingExecutionInterceptor.java +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/TracingExecutionInterceptor.java @@ -11,11 +11,11 @@ import static datadog.trace.instrumentation.aws.v2.AwsSdkClientDecorator.DECORATE; import datadog.context.Context; +import datadog.context.ContextScope; import datadog.context.propagation.Propagators; import datadog.trace.api.Config; import datadog.trace.bootstrap.ContextStore; import datadog.trace.bootstrap.InstanceStore; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.util.Optional; import org.slf4j.Logger; @@ -69,7 +69,7 @@ public void afterMarshalling( final Context ddContext = executionAttributes.getAttribute(CONTEXT_ATTRIBUTE); final AgentSpan span = fromContext(ddContext); if (context != null && span != null) { - try (AgentScope ignored = activateSpan(span)) { + try (ContextScope ignored = activateSpan(span)) { DECORATE.onRequest(span, context.httpRequest()); DECORATE.onSdkRequest( ddContext, context.request(), context.httpRequest(), executionAttributes); diff --git a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/TracingSession.java b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/TracingSession.java index 9b9dc069420..23cdb14b3d2 100644 --- a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/TracingSession.java +++ b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/TracingSession.java @@ -17,7 +17,7 @@ import com.datastax.oss.driver.api.core.session.Session; import com.datastax.oss.driver.api.core.type.reflect.GenericType; import com.datastax.oss.driver.internal.core.session.SessionWrapper; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.InstrumentationTags; import datadog.trace.util.AgentThreadFactory; @@ -62,7 +62,7 @@ private ResultSet wrapSyncRequest(Statement request) { DECORATE.onStatement(span, getQuery(request)); span.setTag(InstrumentationTags.CASSANDRA_CONTACT_POINTS, contactPoints); - try (AgentScope scope = activateSpan(span)) { + try (ContextScope scope = activateSpan(span)) { ResultSet resultSet = getDelegate().execute(request, Statement.SYNC); DECORATE.onResponse(span, resultSet); DECORATE.beforeFinish(span); @@ -86,7 +86,7 @@ private CompletionStage wrapAsyncRequest(Statement request) { DECORATE.onStatement(span, getQuery(request)); span.setTag(InstrumentationTags.CASSANDRA_CONTACT_POINTS, contactPoints); - try (AgentScope scope = activateSpan(span)) { + try (ContextScope scope = activateSpan(span)) { CompletionStage completionStage = getDelegate().execute(request, Statement.ASYNC); diff --git a/dd-java-agent/instrumentation/gax-1.4/src/test/java/datadog/trace/instrumentation/gax/GaxRetryContinuationTest.java b/dd-java-agent/instrumentation/gax-1.4/src/test/java/datadog/trace/instrumentation/gax/GaxRetryContinuationTest.java index 89daf1b2b9e..f70f1b6280e 100644 --- a/dd-java-agent/instrumentation/gax-1.4/src/test/java/datadog/trace/instrumentation/gax/GaxRetryContinuationTest.java +++ b/dd-java-agent/instrumentation/gax-1.4/src/test/java/datadog/trace/instrumentation/gax/GaxRetryContinuationTest.java @@ -17,8 +17,8 @@ import com.google.api.gax.retrying.RetrySettings; import com.google.api.gax.retrying.RetryingFuture; import com.google.api.gax.retrying.ScheduledRetryingExecutor; +import datadog.context.ContextScope; import datadog.trace.agent.test.AbstractInstrumentationTest; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutionException; @@ -40,7 +40,7 @@ void supersededAttemptListenerDoesNotLeak() throws Exception { RetryingFuture retryingFuture = executor.createFuture(() -> "ok"); AgentSpan span = startSpan("gax", "publish"); - try (AgentScope scope = activateSpan(span)) { + try (ContextScope scope = activateSpan(span)) { // reserve the attempt slot with a placeholder that is never completed SettableApiFuture placeholder = SettableApiFuture.create(); retryingFuture.setAttemptFuture(placeholder); @@ -78,7 +78,7 @@ void singleAttemptSucceedsAndContextNotLeaked() throws Exception { } }); - try (AgentScope scope = activateSpan(parent)) { + try (ContextScope scope = activateSpan(parent)) { future.setAttemptFuture(executor.submit(future)); assertEquals("ok", future.get(5, TimeUnit.SECONDS)); } @@ -118,7 +118,7 @@ void retriedAttemptsSucceedAndContextNotLeaked() throws Exception { } }); - try (AgentScope scope = activateSpan(parent)) { + try (ContextScope scope = activateSpan(parent)) { future.setAttemptFuture(executor.submit(future)); assertEquals("ok", future.get(5, TimeUnit.SECONDS)); } @@ -156,7 +156,7 @@ void exhaustedRetriesContextNotLeaked() throws Exception { } }); - try (AgentScope scope = activateSpan(parent)) { + try (ContextScope scope = activateSpan(parent)) { future.setAttemptFuture(executor.submit(future)); assertThrows(ExecutionException.class, () -> future.get(5, TimeUnit.SECONDS)); } diff --git a/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/MessageReceiverWithAckResponseWrapper.java b/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/MessageReceiverWithAckResponseWrapper.java index aa6ba981dd4..724ae18d775 100644 --- a/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/MessageReceiverWithAckResponseWrapper.java +++ b/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/MessageReceiverWithAckResponseWrapper.java @@ -6,7 +6,7 @@ import com.google.cloud.pubsub.v1.AckReplyConsumerWithResponse; import com.google.cloud.pubsub.v1.MessageReceiverWithAckResponse; import com.google.pubsub.v1.PubsubMessage; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; public class MessageReceiverWithAckResponseWrapper implements MessageReceiverWithAckResponse { @@ -22,7 +22,7 @@ public MessageReceiverWithAckResponseWrapper( @Override public void receiveMessage(PubsubMessage message, AckReplyConsumerWithResponse consumer) { final AgentSpan span = CONSUMER_DECORATE.onConsume(message, subscription); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { this.delegate.receiveMessage(message, consumer); } finally { CONSUMER_DECORATE.beforeFinish(span); diff --git a/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/MessageReceiverWrapper.java b/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/MessageReceiverWrapper.java index fc87a410a08..9199d40141f 100644 --- a/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/MessageReceiverWrapper.java +++ b/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/MessageReceiverWrapper.java @@ -6,7 +6,7 @@ import com.google.cloud.pubsub.v1.AckReplyConsumer; import com.google.cloud.pubsub.v1.MessageReceiver; import com.google.pubsub.v1.PubsubMessage; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; public final class MessageReceiverWrapper implements MessageReceiver { @@ -21,7 +21,7 @@ public MessageReceiverWrapper(String subscription, MessageReceiver delegate) { @Override public void receiveMessage(PubsubMessage message, AckReplyConsumer consumer) { final AgentSpan span = CONSUMER_DECORATE.onConsume(message, subscription); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { this.delegate.receiveMessage(message, consumer); } finally { CONSUMER_DECORATE.beforeFinish(span); diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/InstrumentedDataFetcher.java b/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/InstrumentedDataFetcher.java index 3d74cb5f8a4..98bbc788e2c 100644 --- a/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/InstrumentedDataFetcher.java +++ b/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/InstrumentedDataFetcher.java @@ -5,7 +5,7 @@ import static datadog.trace.instrumentation.graphqljava.GraphQLDecorator.DECORATE; import static datadog.trace.instrumentation.graphqljava.GraphQLDecorator.GRAPHQL_JAVA; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import graphql.execution.instrumentation.parameters.InstrumentationFieldFetchParameters; import graphql.schema.DataFetcher; @@ -31,7 +31,7 @@ public InstrumentedDataFetcher( @Override public Object get(DataFetchingEnvironment environment) throws Exception { if (parameters.isTrivialDataFetcher()) { - try (AgentScope scope = activateSpan(this.requestSpan)) { + try (ContextScope scope = activateSpan(this.requestSpan)) { return dataFetcher.get(environment); } } else { @@ -46,7 +46,7 @@ public Object get(DataFetchingEnvironment environment) throws Exception { GraphQLOutputType fieldType = environment.getFieldType(); fieldSpan.setTag("graphql.type", GraphQLTypeUtil.simplePrint(fieldType)); Object dataValue; - try (AgentScope scope = activateSpan(fieldSpan)) { + try (ContextScope scope = activateSpan(fieldSpan)) { dataValue = dataFetcher.get(environment); } catch (Exception e) { DECORATE.onError(fieldSpan, e); diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/AsyncHandlerAdapter.java b/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/AsyncHandlerAdapter.java index 6dc269a81c1..2a3c84139a0 100644 --- a/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/AsyncHandlerAdapter.java +++ b/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/AsyncHandlerAdapter.java @@ -8,7 +8,7 @@ import com.ning.http.client.HttpResponseHeaders; import com.ning.http.client.HttpResponseStatus; import com.ning.http.client.Response; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; public class AsyncHandlerAdapter implements AsyncHandler { @@ -30,7 +30,7 @@ public void onThrowable(Throwable throwable) { @Override public STATE onBodyPartReceived(HttpResponseBodyPart httpResponseBodyPart) throws Exception { - try (final AgentScope ignored = activateSpan(clientSpan)) { + try (final ContextScope ignored = activateSpan(clientSpan)) { return delegate.onBodyPartReceived(httpResponseBodyPart); } } @@ -38,7 +38,7 @@ public STATE onBodyPartReceived(HttpResponseBodyPart httpResponseBodyPart) throw @Override public STATE onStatusReceived(HttpResponseStatus httpResponseStatus) throws Exception { responseBuilder = responseBuilder.accumulate(httpResponseStatus); - try (final AgentScope ignored = activateSpan(clientSpan)) { + try (final ContextScope ignored = activateSpan(clientSpan)) { return delegate.onStatusReceived(httpResponseStatus); } } @@ -46,7 +46,7 @@ public STATE onStatusReceived(HttpResponseStatus httpResponseStatus) throws Exce @Override public STATE onHeadersReceived(HttpResponseHeaders httpResponseHeaders) throws Exception { responseBuilder = responseBuilder.accumulate(httpResponseHeaders); - try (final AgentScope ignored = activateSpan(clientSpan)) { + try (final ContextScope ignored = activateSpan(clientSpan)) { return delegate.onHeadersReceived(httpResponseHeaders); } } @@ -55,7 +55,7 @@ public STATE onHeadersReceived(HttpResponseHeaders httpResponseHeaders) throws E public T onCompleted() throws Exception { try { final T response; - try (AgentScope ignored = (parentSpan != null ? activateSpan(parentSpan) : null)) { + try (ContextScope ignored = (parentSpan != null ? activateSpan(parentSpan) : null)) { response = delegate.onCompleted(); } if (response instanceof Response) { diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/TracingServerInterceptor.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/TracingServerInterceptor.java index 4726080cbe2..7b45d3b1577 100644 --- a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/TracingServerInterceptor.java +++ b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/TracingServerInterceptor.java @@ -12,6 +12,7 @@ import static datadog.trace.instrumentation.grpc.server.GrpcServerDecorator.GRPC_SERVER; import static datadog.trace.instrumentation.grpc.server.GrpcServerDecorator.SERVER_PATHWAY_EDGE_TAGS; +import datadog.context.ContextScope; import datadog.trace.api.Config; import datadog.trace.api.cache.DDCache; import datadog.trace.api.cache.DDCaches; @@ -22,7 +23,6 @@ import datadog.trace.api.gateway.IGSpanInfo; import datadog.trace.api.gateway.RequestContext; import datadog.trace.api.gateway.RequestContextSlot; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; @@ -92,7 +92,7 @@ public ServerCall.Listener interceptCall( DECORATE.onCall(span, call); final ServerCall.Listener result; - try (AgentScope scope = activateSpan(span)) { + try (ContextScope scope = activateSpan(span)) { // Wrap the server call so that we can decorate the span // with the resulting status final TracingServerCall tracingServerCall = new TracingServerCall<>(span, call); @@ -124,7 +124,7 @@ static final class TracingServerCall @Override public void close(final Status status, final Metadata trailers) { DECORATE.onClose(span, status); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { delegate().close(status, trailers); } catch (final Throwable e) { DECORATE.onError(span, e); @@ -154,7 +154,7 @@ public void onMessage(final ReqT message) { startSpan(COMPONENT_NAME.toString(), GRPC_MESSAGE, this.span.spanContext()) .setTag("message.type", message.getClass().getName()); DECORATE.afterStart(msgSpan); - try (AgentScope scope = activateSpan(msgSpan)) { + try (ContextScope scope = activateSpan(msgSpan)) { callIGCallbackGrpcMessage(msgSpan, message); delegate().onMessage(message); } catch (final Throwable e) { @@ -174,7 +174,7 @@ public void onMessage(final ReqT message) { @Override public void onHalfClose() { - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { delegate().onHalfClose(); } catch (final Throwable e) { if (span.phasedFinish()) { @@ -190,7 +190,7 @@ public void onHalfClose() { @Override public void onCancel() { // Finishes span. - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { delegate().onCancel(); span.setTag("canceled", true); } catch (CancellationException e) { @@ -211,7 +211,7 @@ public void onCancel() { @Override public void onComplete() { // Finishes span. - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { delegate().onComplete(); } catch (final Throwable e) { DECORATE.onError(span, e); @@ -231,7 +231,7 @@ public void onComplete() { @Override public void onReady() { - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { delegate().onReady(); } catch (final Throwable e) { if (span.phasedFinish()) { diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolExecution.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolExecution.java index ce572c0c698..a471986f41b 100644 --- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolExecution.java +++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolExecution.java @@ -3,7 +3,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.util.concurrent.ExecutorService; @@ -26,7 +26,7 @@ public void run() { return; } AgentSpan span = startSpan("test", String.valueOf(depth)); - try (AgentScope scope = activateSpan(span)) { + try (ContextScope scope = activateSpan(span)) { executor.execute(new RecursiveThreadPoolExecution(executor, maxDepth, depth + 1)); } finally { span.finish(); diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolMixedSubmissionAndExecution.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolMixedSubmissionAndExecution.java index ca882efd884..5887fd8a3a2 100644 --- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolMixedSubmissionAndExecution.java +++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolMixedSubmissionAndExecution.java @@ -3,7 +3,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.util.concurrent.ExecutorService; @@ -27,7 +27,7 @@ public void run() { return; } AgentSpan span = startSpan("test", String.valueOf(depth)); - try (AgentScope scope = activateSpan(span)) { + try (ContextScope scope = activateSpan(span)) { if (depth % 2 == 0) { executor.submit( new RecursiveThreadPoolMixedSubmissionAndExecution(executor, maxDepth, depth + 1)); diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolSubmission.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolSubmission.java index 331062a90ca..d5e4ba967a5 100644 --- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolSubmission.java +++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolSubmission.java @@ -3,7 +3,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.util.concurrent.ExecutorService; @@ -26,7 +26,7 @@ public void run() { return; } AgentSpan span = startSpan("test", String.valueOf(depth)); - try (AgentScope scope = activateSpan(span)) { + try (ContextScope scope = activateSpan(span)) { executor.submit(new RecursiveThreadPoolSubmission(executor, maxDepth, depth + 1)); } finally { span.finish(); diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/forkjoin/LinearTask.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/forkjoin/LinearTask.java index 35a3891bc87..5482fd97bde 100644 --- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/forkjoin/LinearTask.java +++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/forkjoin/LinearTask.java @@ -3,7 +3,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.util.concurrent.RecursiveTask; @@ -34,7 +34,7 @@ protected Integer compute() { } else { int next = parent + 1; AgentSpan span = startSpan("test", Integer.toString(next)); - try (AgentScope scope = activateSpan(span)) { + try (ContextScope scope = activateSpan(span)) { LinearTask child = new LinearTask(next, depth); return child.fork().join(); } finally { diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/runnable/Descendant.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/runnable/Descendant.java index 3cf7c6e93f2..9df56e98cff 100644 --- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/runnable/Descendant.java +++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/runnable/Descendant.java @@ -3,7 +3,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; public final class Descendant implements Runnable { @@ -17,7 +17,7 @@ public Descendant(String parent) { @Override public void run() { AgentSpan span = startSpan("test", parent + "-child"); - try (AgentScope scope = activateSpan(span)) { + try (ContextScope scope = activateSpan(span)) { } finally { span.finish(); diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/UrlInstrumentation.java b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/UrlInstrumentation.java index 990d3a4ae7c..0b349aff712 100644 --- a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/UrlInstrumentation.java +++ b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/UrlInstrumentation.java @@ -9,9 +9,9 @@ import static net.bytebuddy.matcher.ElementMatchers.isPublic; import com.google.auto.service.AutoService; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.net.URL; import java.net.URLStreamHandler; @@ -55,7 +55,7 @@ public static void errorSpan( final AgentSpan span = startSpan("UrlConnection", DECORATE.operationName(protocol)); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { DECORATE.afterStart(span); DECORATE.onURL(span, url); HTTP_RESOURCE_DECORATOR.withClientPath(span, null, url.getPath()); diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/BodyHandlerWrapper.java b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/BodyHandlerWrapper.java index 569160917e1..883332e891b 100644 --- a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/BodyHandlerWrapper.java +++ b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/BodyHandlerWrapper.java @@ -2,6 +2,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.captureSpan; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.net.http.HttpResponse.BodyHandler; @@ -56,21 +57,21 @@ public void onSubscribe(Flow.Subscription subscription) { @Override public void onNext(List item) { - try (AgentScope ignore = continuation.activate()) { + try (ContextScope ignore = continuation.activate()) { delegate.onNext(item); } } @Override public void onError(Throwable throwable) { - try (AgentScope ignore = continuation.activate()) { + try (ContextScope ignore = continuation.activate()) { delegate.onError(throwable); } } @Override public void onComplete() { - try (AgentScope ignore = continuation.activate()) { + try (ContextScope ignore = continuation.activate()) { delegate.onComplete(); } } diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/CompletableFutureWrapper.java b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/CompletableFutureWrapper.java index 68c304176cf..cc738f88884 100644 --- a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/CompletableFutureWrapper.java +++ b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/CompletableFutureWrapper.java @@ -1,5 +1,6 @@ package datadog.trace.instrumentation.httpclient; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import java.util.concurrent.CompletableFuture; @@ -12,7 +13,7 @@ public static CompletableFuture wrap( CompletableFuture result = new CompletableFuture<>(); future.whenComplete( (T value, Throwable throwable) -> { - try (AgentScope scope = continuation.activate()) { + try (ContextScope scope = continuation.activate()) { if (throwable != null) { result.completeExceptionally(throwable); } else { diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/JDBCDecorator.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/JDBCDecorator.java index 76aacf64d5f..f0d397b89ed 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/JDBCDecorator.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/JDBCDecorator.java @@ -8,6 +8,7 @@ import static datadog.trace.bootstrap.instrumentation.api.InstrumentationTags.INSTRUMENTATION_TIME_MS; import static datadog.trace.bootstrap.instrumentation.api.Tags.*; +import datadog.context.ContextScope; import datadog.trace.api.BaseHash; import datadog.trace.api.Config; import datadog.trace.api.DDTraceId; @@ -15,7 +16,6 @@ import datadog.trace.api.propagation.W3CTraceParent; import datadog.trace.api.telemetry.LogCollector; import datadog.trace.bootstrap.ContextStore; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import datadog.trace.bootstrap.instrumentation.api.InternalSpanTypes; @@ -343,7 +343,7 @@ public long setContextInfo(Connection connection, DBInfo dbInfo) { .start(); DECORATE.afterStart(instrumentationSpan); DECORATE.onConnection(instrumentationSpan, dbInfo); - try (AgentScope scope = activateSpan(instrumentationSpan)) { + try (ContextScope scope = activateSpan(instrumentationSpan)) { final byte samplingDecision = (byte) (instrumentationSpan.forceSamplingDecision() > 0 ? 1 : 0); final byte versionAndSamplingDecision = diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/CallbackWrapper.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/CallbackWrapper.java index 74e393a47c2..90aa89b4f3e 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/CallbackWrapper.java +++ b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/CallbackWrapper.java @@ -3,6 +3,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopSpan; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import org.eclipse.jetty.client.Request; @@ -24,7 +25,7 @@ public CallbackWrapper(AgentSpan parent, AgentSpan span, Object delegate) { @Override public void onBegin(Response response) { if (delegate instanceof Response.BeginListener) { - try (AgentScope scope = activate(span)) { + try (ContextScope scope = activate(span)) { ((Response.BeginListener) delegate).onBegin(response); } } @@ -33,7 +34,7 @@ public void onBegin(Response response) { @Override public void onComplete(Result result) { if (delegate instanceof Response.CompleteListener) { - try (AgentScope scope = activate(parent)) { + try (ContextScope scope = activate(parent)) { ((Response.CompleteListener) delegate).onComplete(result); } } @@ -42,7 +43,7 @@ public void onComplete(Result result) { @Override public void onFailure(Response response, Throwable failure) { if (delegate instanceof Response.FailureListener) { - try (AgentScope scope = activate(span)) { + try (ContextScope scope = activate(span)) { ((Response.FailureListener) delegate).onFailure(response, failure); } } @@ -51,7 +52,7 @@ public void onFailure(Response response, Throwable failure) { @Override public void onHeaders(Response response) { if (delegate instanceof Response.HeadersListener) { - try (AgentScope scope = activate(span)) { + try (ContextScope scope = activate(span)) { ((Response.HeadersListener) delegate).onHeaders(response); } } @@ -60,7 +61,7 @@ public void onHeaders(Response response) { @Override public void onSuccess(Response response) { if (delegate instanceof Response.SuccessListener) { - try (AgentScope scope = activate(span)) { + try (ContextScope scope = activate(span)) { ((Response.SuccessListener) delegate).onSuccess(response); } } @@ -69,7 +70,7 @@ public void onSuccess(Response response) { @Override public void onBegin(Request request) { if (delegate instanceof Request.BeginListener) { - try (AgentScope scope = activate(span)) { + try (ContextScope scope = activate(span)) { ((Request.SuccessListener) delegate).onSuccess(request); } } @@ -78,7 +79,7 @@ public void onBegin(Request request) { @Override public void onCommit(Request request) { if (delegate instanceof Request.CommitListener) { - try (AgentScope scope = activate(span)) { + try (ContextScope scope = activate(span)) { ((Request.CommitListener) delegate).onCommit(request); } } @@ -87,7 +88,7 @@ public void onCommit(Request request) { @Override public void onFailure(Request request, Throwable failure) { if (delegate instanceof Request.FailureListener) { - try (AgentScope scope = activate(span)) { + try (ContextScope scope = activate(span)) { ((Request.FailureListener) delegate).onFailure(request, failure); } } @@ -96,7 +97,7 @@ public void onFailure(Request request, Throwable failure) { @Override public void onHeaders(Request request) { if (delegate instanceof Request.HeadersListener) { - try (AgentScope scope = activate(span)) { + try (ContextScope scope = activate(span)) { ((Request.HeadersListener) delegate).onHeaders(request); } } @@ -105,7 +106,7 @@ public void onHeaders(Request request) { @Override public void onQueued(Request request) { if (delegate instanceof Request.QueuedListener) { - try (AgentScope scope = activate(span)) { + try (ContextScope scope = activate(span)) { ((Request.QueuedListener) delegate).onQueued(request); } } @@ -114,7 +115,7 @@ public void onQueued(Request request) { @Override public void onSuccess(Request request) { if (delegate instanceof Request.SuccessListener) { - try (AgentScope scope = activate(span)) { + try (ContextScope scope = activate(span)) { ((Request.SuccessListener) delegate).onSuccess(request); } } diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-common/src/main/java/datadog/trace/instrumentation/jetty_client/CallbackWrapper.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-common/src/main/java/datadog/trace/instrumentation/jetty_client/CallbackWrapper.java index a7e623eee19..8b8aa2972dc 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-common/src/main/java/datadog/trace/instrumentation/jetty_client/CallbackWrapper.java +++ b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-common/src/main/java/datadog/trace/instrumentation/jetty_client/CallbackWrapper.java @@ -2,6 +2,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.nio.ByteBuffer; @@ -25,7 +26,7 @@ public CallbackWrapper(AgentSpan parent, AgentSpan span, Object delegate) { @Override public void onBegin(Response response) { if (delegate instanceof Response.BeginListener) { - try (AgentScope scope = activate(span)) { + try (ContextScope scope = activate(span)) { ((Response.BeginListener) delegate).onBegin(response); } } @@ -36,7 +37,7 @@ public void onComplete(Result result) { if (delegate instanceof Response.CompleteListener) { // this probably does the wrong thing, but preserves old behaviour and is consistent // with other http clients with completion callback registration - try (AgentScope scope = activate(parent)) { + try (ContextScope scope = activate(parent)) { ((Response.CompleteListener) delegate).onComplete(result); } } @@ -45,7 +46,7 @@ public void onComplete(Result result) { @Override public void onContent(Response response, ByteBuffer content) { if (delegate instanceof Response.ContentListener) { - try (AgentScope scope = activate(span)) { + try (ContextScope scope = activate(span)) { ((Response.ContentListener) delegate).onContent(response, content); } } @@ -54,7 +55,7 @@ public void onContent(Response response, ByteBuffer content) { @Override public void onFailure(Response response, Throwable failure) { if (delegate instanceof Response.FailureListener) { - try (AgentScope scope = activate(span)) { + try (ContextScope scope = activate(span)) { ((Response.FailureListener) delegate).onFailure(response, failure); } } @@ -63,7 +64,7 @@ public void onFailure(Response response, Throwable failure) { @Override public boolean onHeader(Response response, HttpField field) { if (delegate instanceof Response.HeaderListener) { - try (AgentScope scope = activate(span)) { + try (ContextScope scope = activate(span)) { return ((Response.HeaderListener) delegate).onHeader(response, field); } } @@ -73,7 +74,7 @@ public boolean onHeader(Response response, HttpField field) { @Override public void onHeaders(Response response) { if (delegate instanceof Response.HeadersListener) { - try (AgentScope scope = activate(span)) { + try (ContextScope scope = activate(span)) { ((Response.HeadersListener) delegate).onHeaders(response); } } @@ -82,7 +83,7 @@ public void onHeaders(Response response) { @Override public void onSuccess(Response response) { if (delegate instanceof Response.SuccessListener) { - try (AgentScope scope = activate(span)) { + try (ContextScope scope = activate(span)) { ((Response.SuccessListener) delegate).onSuccess(response); } } @@ -91,7 +92,7 @@ public void onSuccess(Response response) { @Override public void onBegin(Request request) { if (delegate instanceof Request.BeginListener) { - try (AgentScope scope = activate(span)) { + try (ContextScope scope = activate(span)) { ((Request.SuccessListener) delegate).onSuccess(request); } } @@ -100,7 +101,7 @@ public void onBegin(Request request) { @Override public void onCommit(Request request) { if (delegate instanceof Request.CommitListener) { - try (AgentScope scope = activate(span)) { + try (ContextScope scope = activate(span)) { ((Request.CommitListener) delegate).onCommit(request); } } @@ -109,7 +110,7 @@ public void onCommit(Request request) { @Override public void onContent(Request request, ByteBuffer content) { if (delegate instanceof Request.ContentListener) { - try (AgentScope scope = activate(span)) { + try (ContextScope scope = activate(span)) { ((Request.ContentListener) delegate).onContent(request, content); } } @@ -118,7 +119,7 @@ public void onContent(Request request, ByteBuffer content) { @Override public void onFailure(Request request, Throwable failure) { if (delegate instanceof Request.FailureListener) { - try (AgentScope scope = activate(span)) { + try (ContextScope scope = activate(span)) { ((Request.FailureListener) delegate).onFailure(request, failure); } } @@ -127,7 +128,7 @@ public void onFailure(Request request, Throwable failure) { @Override public void onHeaders(Request request) { if (delegate instanceof Request.HeadersListener) { - try (AgentScope scope = activate(span)) { + try (ContextScope scope = activate(span)) { ((Request.HeadersListener) delegate).onHeaders(request); } } @@ -136,7 +137,7 @@ public void onHeaders(Request request) { @Override public void onQueued(Request request) { if (delegate instanceof Request.QueuedListener) { - try (AgentScope scope = activate(span)) { + try (ContextScope scope = activate(span)) { ((Request.QueuedListener) delegate).onQueued(request); } } @@ -145,7 +146,7 @@ public void onQueued(Request request) { @Override public void onSuccess(Request request) { if (delegate instanceof Request.SuccessListener) { - try (AgentScope scope = activate(span)) { + try (ContextScope scope = activate(span)) { ((Request.SuccessListener) delegate).onSuccess(request); } } diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/JettyRunnableWrapper.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/JettyRunnableWrapper.java index 3c14020cafe..6c9eeb3e048 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/JettyRunnableWrapper.java +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/JettyRunnableWrapper.java @@ -5,6 +5,7 @@ import static datadog.trace.bootstrap.instrumentation.java.concurrent.ExcludeFilter.ExcludeType.RUNNABLE; import static datadog.trace.bootstrap.instrumentation.java.concurrent.ExcludeFilter.exclude; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope; public class JettyRunnableWrapper implements Runnable { @@ -19,7 +20,7 @@ public JettyRunnableWrapper(Runnable runnable, AgentScope.Continuation continuat @Override public void run() { - try (AgentScope scope = continuation.activate()) { + try (ContextScope scope = continuation.activate()) { runnable.run(); } } diff --git a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/DatadogMessageListener.java b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/DatadogMessageListener.java index c597552fb27..991d4823fc6 100644 --- a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/DatadogMessageListener.java +++ b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/DatadogMessageListener.java @@ -11,8 +11,8 @@ import static datadog.trace.instrumentation.jms.MessageExtractAdapter.GETTER; import static java.util.concurrent.TimeUnit.MILLISECONDS; +import datadog.context.ContextScope; import datadog.trace.bootstrap.ContextStore; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext; import datadog.trace.bootstrap.instrumentation.jms.MessageConsumerState; @@ -71,7 +71,7 @@ public void onMessage(Message message) { // span will be finished by Session.commit/rollback/close sessionState.finishOnCommit(span); } - try (AgentScope scope = activateSpan(span)) { + try (ContextScope scope = activateSpan(span)) { messageListener.onMessage(message); } catch (RuntimeException | Error thrown) { CONSUMER_DECORATE.onError(span, thrown); diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestFailedThenSucceed.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestFailedThenSucceed.java index 7c46ae4042e..94220ba0bd5 100644 --- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestFailedThenSucceed.java +++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestFailedThenSucceed.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import org.junit.After; @@ -17,7 +17,7 @@ public class TestFailedThenSucceed { public void setUp() { AgentTracer.TracerAPI agentTracer = AgentTracer.get(); AgentSpan span = agentTracer.buildSpan("junit-manual", "set-up").start(); - try (AgentScope scope = agentTracer.activateManualSpan(span)) { + try (ContextScope scope = agentTracer.activateManualSpan(span)) { // tracing setup to verify that it is executed for every retry } span.finish(); @@ -32,7 +32,7 @@ public void test_failed_then_succeed() { public void tearDown() { AgentTracer.TracerAPI agentTracer = AgentTracer.get(); AgentSpan span = agentTracer.buildSpan("junit-manual", "tear-down").start(); - try (AgentScope scope = agentTracer.activateManualSpan(span)) { + try (ContextScope scope = agentTracer.activateManualSpan(span)) { // tracing teardown to verify that it is executed for every retry } span.finish(); diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestFailedThenSucceed.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestFailedThenSucceed.java index 38ea775d7d8..cac99b64d40 100644 --- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestFailedThenSucceed.java +++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestFailedThenSucceed.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import org.junit.jupiter.api.AfterEach; @@ -17,7 +17,7 @@ public class TestFailedThenSucceed { public void setUp() { AgentTracer.TracerAPI agentTracer = AgentTracer.get(); AgentSpan span = agentTracer.buildSpan("junit-manual", "set-up").start(); - try (AgentScope scope = agentTracer.activateManualSpan(span)) { + try (ContextScope scope = agentTracer.activateManualSpan(span)) { // tracing setup to verify that it is executed for every retry } span.finish(); @@ -32,7 +32,7 @@ public void test_failed_then_succeed() { public void tearDown() { AgentTracer.TracerAPI agentTracer = AgentTracer.get(); AgentSpan span = agentTracer.buildSpan("junit-manual", "tear-down").start(); - try (AgentScope scope = agentTracer.activateManualSpan(span)) { + try (ContextScope scope = agentTracer.activateManualSpan(span)) { // tracing teardown to verify that it is executed for every retry } span.finish(); diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/BeforeAfterOperationsTracer.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/BeforeAfterOperationsTracer.java index 19d56086a4b..b20b1a7d3f5 100644 --- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/BeforeAfterOperationsTracer.java +++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/BeforeAfterOperationsTracer.java @@ -1,6 +1,6 @@ package datadog.trace.instrumentation.junit5; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import datadog.trace.bootstrap.instrumentation.api.Tags; @@ -51,7 +51,7 @@ private static void traceInvocation( Invocation invocation, Method executable, String operationName) throws Throwable { AgentSpan agentSpan = AgentTracer.startSpan("junit", executable.getName()); agentSpan.setTag(Tags.TEST_CALLBACK, operationName); - try (AgentScope agentScope = AgentTracer.activateSpan(agentSpan)) { + try (ContextScope agentScope = AgentTracer.activateSpan(agentSpan)) { invocation.proceed(); } catch (Throwable t) { agentSpan.addThrowable(t); diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerCallback.java b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerCallback.java index d96d99916d1..c536e147e77 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerCallback.java +++ b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerCallback.java @@ -5,8 +5,8 @@ import static datadog.trace.bootstrap.instrumentation.api.InstrumentationTags.PARTITION; import static datadog.trace.instrumentation.kafka_clients.KafkaDecorator.PRODUCER_DECORATE; +import datadog.context.ContextScope; import datadog.trace.api.datastreams.DataStreamsTags; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import javax.annotation.Nullable; @@ -41,7 +41,7 @@ public void onCompletion(final RecordMetadata metadata, final Exception exceptio span.finish(); if (callback != null) { if (parent != null) { - try (final AgentScope scope = activateSpan(parent)) { + try (final ContextScope scope = activateSpan(parent)) { callback.onCompletion(metadata, exception); } } else { diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/KafkaProducerCallback.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/KafkaProducerCallback.java index 898508dc541..dd7bb52989c 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/KafkaProducerCallback.java +++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/KafkaProducerCallback.java @@ -5,8 +5,8 @@ import static datadog.trace.bootstrap.instrumentation.api.InstrumentationTags.PARTITION; import static datadog.trace.instrumentation.kafka_clients38.KafkaDecorator.PRODUCER_DECORATE; +import datadog.context.ContextScope; import datadog.trace.api.datastreams.DataStreamsTags; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import org.apache.kafka.clients.producer.Callback; @@ -40,7 +40,7 @@ public void onCompletion(final RecordMetadata metadata, final Exception exceptio span.finish(); if (callback != null) { if (parent != null) { - try (final AgentScope scope = activateSpan(parent)) { + try (final ContextScope scope = activateSpan(parent)) { callback.onCompletion(metadata, exception); } } else { diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/EncodeHttpResponseAdvice.java b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/EncodeHttpResponseAdvice.java index 84535d254b7..8cb199cb8e6 100644 --- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/EncodeHttpResponseAdvice.java +++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/EncodeHttpResponseAdvice.java @@ -4,7 +4,7 @@ import static datadog.trace.instrumentation.micronaut.v4_0.MicronautDecorator.DECORATE; import static datadog.trace.instrumentation.micronaut.v4_0.MicronautDecorator.SPAN_ATTRIBUTE; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import io.micronaut.http.HttpResponse; import io.micronaut.http.server.netty.NettyHttpRequest; @@ -21,7 +21,7 @@ public static void finishHandlerSpan( return; } - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { DECORATE.onResponse(span, message); DECORATE.beforeFinish(span); span.finish(); diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/EncodeHttpResponseAdvice2.java b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/EncodeHttpResponseAdvice2.java index 6d003a1781d..0b522672828 100644 --- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/EncodeHttpResponseAdvice2.java +++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/EncodeHttpResponseAdvice2.java @@ -4,7 +4,7 @@ import static datadog.trace.instrumentation.micronaut.v4_0.MicronautDecorator.DECORATE; import static datadog.trace.instrumentation.micronaut.v4_0.MicronautDecorator.SPAN_ATTRIBUTE; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import io.micronaut.http.HttpResponse; import io.micronaut.http.server.netty.NettyHttpRequest; @@ -20,7 +20,7 @@ public static void finishHandlerSpan( return; } - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { DECORATE.onResponse(span, message); DECORATE.beforeFinish(span); span.finish(); diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/EncodeHttpResponseAdvice3.java b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/EncodeHttpResponseAdvice3.java index a68dea11b96..cd9bfae612a 100644 --- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/EncodeHttpResponseAdvice3.java +++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/EncodeHttpResponseAdvice3.java @@ -4,7 +4,7 @@ import static datadog.trace.instrumentation.micronaut.v4_0.MicronautDecorator.DECORATE; import static datadog.trace.instrumentation.micronaut.v4_0.MicronautDecorator.SPAN_ATTRIBUTE; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import io.micronaut.http.HttpRequest; import io.micronaut.http.HttpResponse; @@ -20,7 +20,7 @@ public static void finishHandlerSpan( return; } - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { DECORATE.onResponse(span, message); DECORATE.beforeFinish(span); span.finish(); diff --git a/dd-java-agent/instrumentation/mongo/mongo-common/src/main/java/datadog/trace/instrumentation/mongo/MongoCommandListener.java b/dd-java-agent/instrumentation/mongo/mongo-common/src/main/java/datadog/trace/instrumentation/mongo/MongoCommandListener.java index d11c5b463c9..d37cdd69359 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-common/src/main/java/datadog/trace/instrumentation/mongo/MongoCommandListener.java +++ b/dd-java-agent/instrumentation/mongo/mongo-common/src/main/java/datadog/trace/instrumentation/mongo/MongoCommandListener.java @@ -12,11 +12,11 @@ import com.mongodb.event.CommandListener; import com.mongodb.event.CommandStartedEvent; import com.mongodb.event.CommandSucceededEvent; +import datadog.context.ContextScope; import datadog.trace.api.Config; import datadog.trace.api.cache.DDCache; import datadog.trace.api.cache.DDCaches; import datadog.trace.bootstrap.ContextStore; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.Tags; import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString; @@ -133,7 +133,7 @@ public void commandStarted(final CommandStartedEvent event) { shouldForceCloseSpanScope = false; } - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { decorator.afterStart(span); decorator.onConnection(span, event); // overlay Mongo application name if we have it (replaces the deprecated cluster description) diff --git a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientRequestTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientRequestTracingHandler.java index 7a5ae7d1dff..0ba5fee3b3a 100644 --- a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientRequestTracingHandler.java +++ b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientRequestTracingHandler.java @@ -10,6 +10,7 @@ import static datadog.trace.instrumentation.netty38.client.NettyHttpClientDecorator.NETTY_CLIENT_REQUEST; import static datadog.trace.instrumentation.netty38.client.NettyResponseInjectAdapter.SETTER; +import datadog.context.ContextScope; import datadog.trace.bootstrap.ContextStore; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; @@ -42,7 +43,7 @@ public void writeRequested(final ChannelHandlerContext ctx, final MessageEvent m final ChannelTraceContext channelTraceContext = contextStore.putIfAbsent(ctx.getChannel(), ChannelTraceContext.Factory.INSTANCE); - AgentScope parentScope = null; + ContextScope parentScope = null; final AgentScope.Continuation continuation = channelTraceContext.getConnectionContinuation(); if (continuation != null) { parentScope = continuation.activate(); @@ -56,7 +57,7 @@ public void writeRequested(final ChannelHandlerContext ctx, final MessageEvent m NettyHttpClientDecorator decorate = isSecure ? DECORATE_SECURE : DECORATE; final AgentSpan span = startSpan(NETTY_CLIENT.toString(), NETTY_CLIENT_REQUEST); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { decorate.afterStart(span); decorate.onRequest(span, request); diff --git a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientResponseTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientResponseTracingHandler.java index abda3d05acf..e25a261bb56 100644 --- a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientResponseTracingHandler.java +++ b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientResponseTracingHandler.java @@ -4,8 +4,8 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopSpan; import static datadog.trace.instrumentation.netty38.client.NettyHttpClientDecorator.DECORATE; +import datadog.context.ContextScope; import datadog.trace.bootstrap.ContextStore; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.instrumentation.netty38.ChannelTraceContext; import org.jboss.netty.channel.Channel; @@ -40,7 +40,7 @@ public void messageReceived(final ChannelHandlerContext ctx, final MessageEvent final boolean finishSpan = msg.getMessage() instanceof HttpResponse; if (span != null && finishSpan) { - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { DECORATE.onResponse(span, (HttpResponse) msg.getMessage()); DECORATE.beforeFinish(span); span.finish(); @@ -48,7 +48,7 @@ public void messageReceived(final ChannelHandlerContext ctx, final MessageEvent } // We want the callback in the scope of the parent, not the client span - try (final AgentScope scope = activateSpan(parent)) { + try (final ContextScope scope = activateSpan(parent)) { ctx.sendUpstream(msg); } } @@ -68,7 +68,7 @@ public void exceptionCaught(ChannelHandlerContext ctx, ExceptionEvent e) throws if (span != null) { // If an exception is passed to this point, it likely means it was unhandled and the // client span won't be finished with a proper response, so we should finish the span here. - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { DECORATE.onError(span, e.getCause()); DECORATE.beforeFinish(span); span.finish(); @@ -76,7 +76,7 @@ public void exceptionCaught(ChannelHandlerContext ctx, ExceptionEvent e) throws } // We want the callback in the scope of the parent, not the client span - try (final AgentScope scope = activateSpan(parent)) { + try (final ContextScope scope = activateSpan(parent)) { super.exceptionCaught(ctx, e); } } diff --git a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/websocket/WebSocketServerRequestTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/websocket/WebSocketServerRequestTracingHandler.java index 70c990db900..6abae5803a6 100644 --- a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/websocket/WebSocketServerRequestTracingHandler.java +++ b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/websocket/WebSocketServerRequestTracingHandler.java @@ -4,8 +4,8 @@ import static datadog.trace.bootstrap.instrumentation.decorator.WebsocketDecorator.DECORATE; import static datadog.trace.bootstrap.instrumentation.websocket.HandlersExtractor.MESSAGE_TYPE_TEXT; +import datadog.context.ContextScope; import datadog.trace.bootstrap.ContextStore; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.websocket.HandlerContext; import datadog.trace.instrumentation.netty38.ChannelTraceContext; @@ -55,7 +55,7 @@ public void messageReceived(ChannelHandlerContext ctx, MessageEvent event) throw final AgentSpan span = DECORATE.onReceiveFrameStart( receiverContext, textFrame.getText(), textFrame.isFinalFragment()); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { ctx.sendUpstream(event); // WebSocket Read Text Start } finally { @@ -75,7 +75,7 @@ public void messageReceived(ChannelHandlerContext ctx, MessageEvent event) throw receiverContext, binaryFrame.getBinaryData().array(), binaryFrame.isFinalFragment()); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { ctx.sendUpstream(event); } finally { // WebSocket Read Binary End @@ -98,7 +98,7 @@ public void messageReceived(ChannelHandlerContext ctx, MessageEvent event) throw ? continuationWebSocketFrame.getText() : continuationWebSocketFrame.getBinaryData().array(), continuationWebSocketFrame.isFinalFragment()); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { ctx.sendUpstream(event); } finally { if (continuationWebSocketFrame.isFinalFragment()) { @@ -118,7 +118,7 @@ public void messageReceived(ChannelHandlerContext ctx, MessageEvent event) throw traceContext.setReceiverHandlerContext(null); final AgentSpan span = DECORATE.onSessionCloseReceived(receiverContext, reasonText, statusCode); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { ctx.sendUpstream(event); if (closeFrame.isFinalFragment()) { DECORATE.onFrameEnd(receiverContext); diff --git a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/websocket/WebSocketServerResponseTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/websocket/WebSocketServerResponseTracingHandler.java index 637d1a4abca..e05ef0bd455 100644 --- a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/websocket/WebSocketServerResponseTracingHandler.java +++ b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/websocket/WebSocketServerResponseTracingHandler.java @@ -5,8 +5,8 @@ import static datadog.trace.bootstrap.instrumentation.websocket.HandlersExtractor.MESSAGE_TYPE_BINARY; import static datadog.trace.bootstrap.instrumentation.websocket.HandlersExtractor.MESSAGE_TYPE_TEXT; +import datadog.context.ContextScope; import datadog.trace.bootstrap.ContextStore; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.websocket.HandlerContext; import datadog.trace.instrumentation.netty38.ChannelTraceContext; @@ -46,7 +46,7 @@ public void writeRequested(ChannelHandlerContext ctx, MessageEvent event) throws final AgentSpan span = DECORATE.onSendFrameStart( handlerContext, MESSAGE_TYPE_TEXT, textFrame.getText().length()); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { ctx.sendDownstream(event); } finally { // WebSocket Write Text End @@ -65,7 +65,7 @@ public void writeRequested(ChannelHandlerContext ctx, MessageEvent event) throws handlerContext, MESSAGE_TYPE_BINARY, binaryFrame.getBinaryData().readableBytes()); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { ctx.sendDownstream(event); } finally { // WebSocket Write Binary End @@ -86,7 +86,7 @@ public void writeRequested(ChannelHandlerContext ctx, MessageEvent event) throws MESSAGE_TYPE_TEXT.equals(handlerContext.getMessageType()) ? continuationWebSocketFrame.getText().length() : continuationWebSocketFrame.getBinaryData().readableBytes()); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { ctx.sendDownstream(event); } finally { // WebSocket Write Binary End @@ -105,7 +105,7 @@ public void writeRequested(ChannelHandlerContext ctx, MessageEvent event) throws traceContext.setSenderHandlerContext(null); final AgentSpan span = DECORATE.onSessionCloseIssued(handlerContext, reasonText, statusCode); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { ctx.sendDownstream(event); } finally { if (closeFrame.isFinalFragment()) { diff --git a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientRequestTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientRequestTracingHandler.java index fc20990ffc8..3cef514fb35 100644 --- a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientRequestTracingHandler.java +++ b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientRequestTracingHandler.java @@ -15,6 +15,7 @@ import static datadog.trace.instrumentation.netty40.client.NettyResponseInjectAdapter.SETTER; import datadog.context.Context; +import datadog.context.ContextScope; import datadog.trace.api.Config; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; @@ -53,7 +54,7 @@ public void write(final ChannelHandlerContext ctx, final Object msg, final Chann return; } - AgentScope parentScope = null; + ContextScope parentScope = null; final AgentScope.Continuation continuation = ctx.channel().attr(CONNECT_PARENT_CONTINUATION_ATTRIBUTE_KEY).getAndRemove(); if (continuation != null) { @@ -80,7 +81,7 @@ public void write(final ChannelHandlerContext ctx, final Object msg, final Chann final AgentSpan span = startSpan(NETTY_CLIENT.toString(), NETTY_CLIENT_REQUEST); final Context context = getCurrentContext().with(span); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { decorate.afterStart(span); decorate.onRequest(span, request); diff --git a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientResponseTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientResponseTracingHandler.java index 75ec585739f..0983dec8529 100644 --- a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientResponseTracingHandler.java +++ b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientResponseTracingHandler.java @@ -8,7 +8,7 @@ import static datadog.trace.instrumentation.netty40.client.NettyHttpClientDecorator.DECORATE; import datadog.context.Context; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; @@ -37,7 +37,7 @@ public void channelRead(final ChannelHandlerContext ctx, final Object msg) { final boolean finishSpan = msg instanceof HttpResponse; if (span != null && finishSpan) { - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { DECORATE.onResponse(span, (HttpResponse) msg); DECORATE.beforeFinish(span); span.finish(); @@ -45,7 +45,7 @@ public void channelRead(final ChannelHandlerContext ctx, final Object msg) { } // We want the callback in the scope of the parent, not the client span - try (final AgentScope scope = activateSpan(parent)) { + try (final ContextScope scope = activateSpan(parent)) { ctx.fireChannelRead(msg); } } @@ -66,14 +66,14 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws E if (span != null) { // If an exception is passed to this point, it likely means it was unhandled and the // client span won't be finished with a proper response, so we should finish the span here. - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { DECORATE.onError(span, cause); DECORATE.beforeFinish(span); span.finish(); } } // We want the callback in the scope of the parent, not the client span - try (final AgentScope scope = activateSpan(parent)) { + try (final ContextScope scope = activateSpan(parent)) { super.exceptionCaught(ctx, cause); } } @@ -92,13 +92,13 @@ public void channelInactive(ChannelHandlerContext ctx) throws Exception { } if (span != null && span != parent) { - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { DECORATE.beforeFinish(span); span.finish(); } } // We want the callback in the scope of the parent, not the client span - try (final AgentScope scope = activateSpan(parent)) { + try (final ContextScope scope = activateSpan(parent)) { super.channelInactive(ctx); } } diff --git a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/websocket/WebSocketServerRequestTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/websocket/WebSocketServerRequestTracingHandler.java index 6ec281b3ae9..5d6bbec1ee0 100644 --- a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/websocket/WebSocketServerRequestTracingHandler.java +++ b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/websocket/WebSocketServerRequestTracingHandler.java @@ -5,7 +5,7 @@ import static datadog.trace.bootstrap.instrumentation.websocket.HandlersExtractor.MESSAGE_TYPE_TEXT; import static datadog.trace.instrumentation.netty40.AttributeKeys.*; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.websocket.HandlerContext; import io.netty.channel.Channel; @@ -43,7 +43,7 @@ public void channelRead(ChannelHandlerContext ctx, Object frame) { final AgentSpan span = DECORATE.onReceiveFrameStart( receiverContext, textFrame.text(), textFrame.isFinalFragment()); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { ctx.fireChannelRead(textFrame); // WebSocket Read Text Start } finally { @@ -63,7 +63,7 @@ public void channelRead(ChannelHandlerContext ctx, Object frame) { receiverContext, binaryFrame.content().nioBuffer(), binaryFrame.isFinalFragment()); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { ctx.fireChannelRead(binaryFrame); } finally { // WebSocket Read Binary End @@ -86,7 +86,7 @@ public void channelRead(ChannelHandlerContext ctx, Object frame) { ? continuationWebSocketFrame.text() : continuationWebSocketFrame.content().nioBuffer(), continuationWebSocketFrame.isFinalFragment()); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { ctx.fireChannelRead(continuationWebSocketFrame); } finally { if (continuationWebSocketFrame.isFinalFragment()) { @@ -106,7 +106,7 @@ public void channelRead(ChannelHandlerContext ctx, Object frame) { channel.attr(WEBSOCKET_RECEIVER_HANDLER_CONTEXT).remove(); final AgentSpan span = DECORATE.onSessionCloseReceived(receiverContext, reasonText, statusCode); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { ctx.fireChannelRead(closeFrame); if (closeFrame.isFinalFragment()) { DECORATE.onFrameEnd(receiverContext); diff --git a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/websocket/WebSocketServerResponseTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/websocket/WebSocketServerResponseTracingHandler.java index bdea83f8bc2..bb6cd290ee8 100644 --- a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/websocket/WebSocketServerResponseTracingHandler.java +++ b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/websocket/WebSocketServerResponseTracingHandler.java @@ -6,7 +6,7 @@ import static datadog.trace.bootstrap.instrumentation.websocket.HandlersExtractor.MESSAGE_TYPE_TEXT; import static datadog.trace.instrumentation.netty40.AttributeKeys.WEBSOCKET_SENDER_HANDLER_CONTEXT; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.websocket.HandlerContext; import io.netty.channel.*; @@ -32,7 +32,7 @@ public void write(ChannelHandlerContext ctx, Object frame, ChannelPromise promis final AgentSpan span = DECORATE.onSendFrameStart( handlerContext, MESSAGE_TYPE_TEXT, textFrame.text().length()); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { ctx.write(frame, promise); } finally { // WebSocket Write Text End @@ -49,7 +49,7 @@ public void write(ChannelHandlerContext ctx, Object frame, ChannelPromise promis final AgentSpan span = DECORATE.onSendFrameStart( handlerContext, MESSAGE_TYPE_BINARY, binaryFrame.content().readableBytes()); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { ctx.write(frame, promise); } finally { // WebSocket Write Binary End @@ -70,7 +70,7 @@ public void write(ChannelHandlerContext ctx, Object frame, ChannelPromise promis MESSAGE_TYPE_TEXT.equals(handlerContext.getMessageType()) ? continuationWebSocketFrame.text().length() : continuationWebSocketFrame.content().readableBytes()); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { ctx.write(frame, promise); } finally { // WebSocket Write Binary End @@ -89,7 +89,7 @@ public void write(ChannelHandlerContext ctx, Object frame, ChannelPromise promis channel.attr(WEBSOCKET_SENDER_HANDLER_CONTEXT).remove(); final AgentSpan span = DECORATE.onSessionCloseIssued(handlerContext, reasonText, statusCode); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { ctx.write(frame, promise); } finally { if (closeFrame.isFinalFragment()) { diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientRequestTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientRequestTracingHandler.java index 70d82ba6836..33031aa4c73 100644 --- a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientRequestTracingHandler.java +++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientRequestTracingHandler.java @@ -15,6 +15,7 @@ import static datadog.trace.instrumentation.netty41.client.NettyResponseInjectAdapter.SETTER; import datadog.context.Context; +import datadog.context.ContextScope; import datadog.trace.api.Config; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; @@ -54,7 +55,7 @@ public void write(final ChannelHandlerContext ctx, final Object msg, final Chann return; } - AgentScope parentScope = null; + ContextScope parentScope = null; final AgentScope.Continuation continuation = takeConnectParentContinuation(ctx); if (continuation != null) { parentScope = continuation.activate(); @@ -81,7 +82,7 @@ public void write(final ChannelHandlerContext ctx, final Object msg, final Chann final AgentSpan span = startSpan(NETTY_CLIENT.toString(), NETTY_CLIENT_REQUEST); final Context context = getCurrentContext().with(span); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { decorate.afterStart(span); decorate.onRequest(span, request); diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientResponseTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientResponseTracingHandler.java index a1973706338..871745c00d7 100644 --- a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientResponseTracingHandler.java +++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientResponseTracingHandler.java @@ -8,7 +8,7 @@ import static datadog.trace.instrumentation.netty41.client.NettyHttpClientDecorator.DECORATE; import datadog.context.Context; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; @@ -43,7 +43,7 @@ public void channelRead(final ChannelHandlerContext ctx, final Object msg) { || "websocket" .equals(((HttpResponse) msg).headers().get(HttpHeaderNames.UPGRADE))); if (finishSpan) { - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { DECORATE.onResponse(span, (HttpResponse) msg); DECORATE.beforeFinish(span); span.finish(); @@ -56,7 +56,7 @@ public void channelRead(final ChannelHandlerContext ctx, final Object msg) { } // We want the callback in the scope of the parent, not the client span - try (final AgentScope scope = activateSpan(parent)) { + try (final ContextScope scope = activateSpan(parent)) { ctx.fireChannelRead(msg); } } @@ -77,14 +77,14 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws E if (span != null) { // If an exception is passed to this point, it likely means it was unhandled and the // client span won't be finished with a proper response, so we should finish the span here. - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { DECORATE.onError(span, cause); DECORATE.beforeFinish(span); span.finish(); } } // We want the callback in the scope of the parent, not the client span - try (final AgentScope scope = activateSpan(parent)) { + try (final ContextScope scope = activateSpan(parent)) { super.exceptionCaught(ctx, cause); } } @@ -103,13 +103,13 @@ public void channelInactive(ChannelHandlerContext ctx) throws Exception { } if (span != null && span != parent) { - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { DECORATE.beforeFinish(span); span.finish(); } } // We want the callback in the scope of the parent, not the client span - try (final AgentScope scope = activateSpan(parent)) { + try (final ContextScope scope = activateSpan(parent)) { super.channelInactive(ctx); } } diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/websocket/WebSocketServerInboundTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/websocket/WebSocketServerInboundTracingHandler.java index 882a826e15e..24aab8b5500 100644 --- a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/websocket/WebSocketServerInboundTracingHandler.java +++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/websocket/WebSocketServerInboundTracingHandler.java @@ -6,7 +6,7 @@ import static datadog.trace.instrumentation.netty41.AttributeKeys.WEBSOCKET_RECEIVER_HANDLER_CONTEXT; import static datadog.trace.instrumentation.netty41.AttributeKeys.WEBSOCKET_SENDER_HANDLER_CONTEXT; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.websocket.HandlerContext; import io.netty.channel.*; @@ -44,7 +44,7 @@ public void channelRead(ChannelHandlerContext ctx, Object frame) { final AgentSpan span = DECORATE.onReceiveFrameStart( receiverContext, textFrame.text(), textFrame.isFinalFragment()); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { ctx.fireChannelRead(textFrame); // WebSocket Read Text Start } finally { @@ -64,7 +64,7 @@ public void channelRead(ChannelHandlerContext ctx, Object frame) { receiverContext, binaryFrame.content().nioBuffer(), binaryFrame.isFinalFragment()); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { ctx.fireChannelRead(binaryFrame); } finally { // WebSocket Read Binary End @@ -87,7 +87,7 @@ public void channelRead(ChannelHandlerContext ctx, Object frame) { ? continuationWebSocketFrame.text() : continuationWebSocketFrame.content().nioBuffer(), continuationWebSocketFrame.isFinalFragment()); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { ctx.fireChannelRead(continuationWebSocketFrame); } finally { if (continuationWebSocketFrame.isFinalFragment()) { @@ -107,7 +107,7 @@ public void channelRead(ChannelHandlerContext ctx, Object frame) { channel.attr(WEBSOCKET_RECEIVER_HANDLER_CONTEXT).remove(); final AgentSpan span = DECORATE.onSessionCloseReceived(receiverContext, reasonText, statusCode); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { ctx.fireChannelRead(closeFrame); if (closeFrame.isFinalFragment()) { DECORATE.onFrameEnd(receiverContext); diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/websocket/WebSocketServerOutboundTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/websocket/WebSocketServerOutboundTracingHandler.java index e500c2357f5..3f1b7a69674 100644 --- a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/websocket/WebSocketServerOutboundTracingHandler.java +++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/websocket/WebSocketServerOutboundTracingHandler.java @@ -6,7 +6,7 @@ import static datadog.trace.bootstrap.instrumentation.websocket.HandlersExtractor.MESSAGE_TYPE_TEXT; import static datadog.trace.instrumentation.netty41.AttributeKeys.WEBSOCKET_SENDER_HANDLER_CONTEXT; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.websocket.HandlerContext; import io.netty.channel.*; @@ -36,7 +36,7 @@ public void write(ChannelHandlerContext ctx, Object frame, ChannelPromise promis final AgentSpan span = DECORATE.onSendFrameStart( handlerContext, MESSAGE_TYPE_TEXT, textFrame.text().length()); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { ctx.write(frame, promise); } finally { // WebSocket Write Text End @@ -53,7 +53,7 @@ public void write(ChannelHandlerContext ctx, Object frame, ChannelPromise promis final AgentSpan span = DECORATE.onSendFrameStart( handlerContext, MESSAGE_TYPE_BINARY, binaryFrame.content().readableBytes()); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { ctx.write(frame, promise); } finally { // WebSocket Write Binary End @@ -74,7 +74,7 @@ public void write(ChannelHandlerContext ctx, Object frame, ChannelPromise promis MESSAGE_TYPE_TEXT.equals(handlerContext.getMessageType()) ? continuationWebSocketFrame.text().length() : continuationWebSocketFrame.content().readableBytes()); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { ctx.write(frame, promise); } finally { // WebSocket Write Binary End @@ -93,7 +93,7 @@ public void write(ChannelHandlerContext ctx, Object frame, ChannelPromise promis channel.attr(WEBSOCKET_SENDER_HANDLER_CONTEXT).remove(); final AgentSpan span = DECORATE.onSessionCloseIssued(handlerContext, reasonText, statusCode); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { ctx.write(frame, promise); } finally { if (closeFrame.isFinalFragment()) { diff --git a/dd-java-agent/instrumentation/netty/netty-promise-4.0/src/main/java/datadog/trace/instrumentation/netty4/promise/ListenerWrapper.java b/dd-java-agent/instrumentation/netty/netty-promise-4.0/src/main/java/datadog/trace/instrumentation/netty4/promise/ListenerWrapper.java index f0cffb08460..3c41a5e1140 100644 --- a/dd-java-agent/instrumentation/netty/netty-promise-4.0/src/main/java/datadog/trace/instrumentation/netty4/promise/ListenerWrapper.java +++ b/dd-java-agent/instrumentation/netty/netty-promise-4.0/src/main/java/datadog/trace/instrumentation/netty4/promise/ListenerWrapper.java @@ -4,6 +4,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.captureActiveSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopContinuation; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import io.netty.util.concurrent.Future; import io.netty.util.concurrent.GenericFutureListener; @@ -40,7 +41,7 @@ public GenericWrapper( @Override public void operationComplete(T future) throws Exception { - try (AgentScope scope = continuation.activate()) { + try (ContextScope scope = continuation.activate()) { listener.operationComplete(future); } } @@ -60,7 +61,7 @@ public GenericProgressiveWrapper( @Override public void operationProgressed(S future, long progress, long total) throws Exception { // not yet complete, not ready to do final activation of continuation - try (AgentScope scope = activateSpan(continuation.span())) { + try (ContextScope scope = activateSpan(continuation.span())) { listener.operationProgressed(future, progress, total); } } diff --git a/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/TracingInterceptor.java b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/TracingInterceptor.java index 4a2fbb473fd..46469204281 100644 --- a/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/TracingInterceptor.java +++ b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/TracingInterceptor.java @@ -10,7 +10,7 @@ import com.squareup.okhttp.Interceptor; import com.squareup.okhttp.Request; import com.squareup.okhttp.Response; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.io.IOException; @@ -19,7 +19,7 @@ public class TracingInterceptor implements Interceptor { public Response intercept(final Chain chain) throws IOException { final AgentSpan span = startSpan("okhttp", OKHTTP_REQUEST); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { DECORATE.afterStart(span); DECORATE.onRequest(span, chain.request()); diff --git a/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/TracingInterceptor.java b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/TracingInterceptor.java index ee8e04362b5..0246a81f531 100644 --- a/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/TracingInterceptor.java +++ b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/TracingInterceptor.java @@ -7,7 +7,7 @@ import static datadog.trace.instrumentation.okhttp3.OkHttpClientDecorator.OKHTTP_REQUEST; import static datadog.trace.instrumentation.okhttp3.RequestBuilderInjectAdapter.SETTER; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.io.IOException; import okhttp3.Interceptor; @@ -23,7 +23,7 @@ public Response intercept(final Chain chain) throws IOException { final AgentSpan span = startSpan("okhttp", OKHTTP_REQUEST); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { DECORATE.afterStart(span); DECORATE.onRequest(span, chain.request()); diff --git a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/test/java/datadog/trace/instrumentation/openai_java/SessionIdPropagationForkedTest.java b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/test/java/datadog/trace/instrumentation/openai_java/SessionIdPropagationForkedTest.java index 19695ee9ea7..5914d280e80 100644 --- a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/test/java/datadog/trace/instrumentation/openai_java/SessionIdPropagationForkedTest.java +++ b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/test/java/datadog/trace/instrumentation/openai_java/SessionIdPropagationForkedTest.java @@ -13,7 +13,6 @@ import datadog.context.ContextScope; import datadog.trace.agent.test.AbstractInstrumentationTest; import datadog.trace.api.llmobs.LLMObsContext; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import datadog.trace.core.DDSpan; @@ -77,7 +76,7 @@ void openAiRequestSpanInheritsSessionIdFromActiveContext() throws Exception { String expectedSessionId = "session-propagation-test-abc"; AgentSpan parentSpan = AgentTracer.startSpan("test", "parent"); - try (AgentScope ignored1 = AgentTracer.activateSpan(parentSpan)) { + try (ContextScope ignored1 = AgentTracer.activateSpan(parentSpan)) { try (ContextScope ignored2 = LLMObsContext.attach(parentSpan.spanContext(), expectedSessionId)) { try { diff --git a/dd-java-agent/instrumentation/play-ws/play-ws-1.0/src/main/java/datadog/trace/instrumentation/playws1/AsyncHandlerWrapper.java b/dd-java-agent/instrumentation/play-ws/play-ws-1.0/src/main/java/datadog/trace/instrumentation/playws1/AsyncHandlerWrapper.java index 27502d6d1e4..64f01569dec 100644 --- a/dd-java-agent/instrumentation/play-ws/play-ws-1.0/src/main/java/datadog/trace/instrumentation/playws1/AsyncHandlerWrapper.java +++ b/dd-java-agent/instrumentation/play-ws/play-ws-1.0/src/main/java/datadog/trace/instrumentation/playws1/AsyncHandlerWrapper.java @@ -3,6 +3,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.captureSpan; import static datadog.trace.instrumentation.playws.PlayWSClientDecorator.DECORATE; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import play.shaded.ahc.org.asynchttpclient.AsyncHandler; @@ -53,7 +54,7 @@ public Object onCompleted() throws Exception { span.finish(); if (continuation != null) { - try (final AgentScope scope = continuation.activate()) { + try (final ContextScope scope = continuation.activate()) { return delegate.onCompleted(); } } else { @@ -68,7 +69,7 @@ public void onThrowable(final Throwable throwable) { span.finish(); if (continuation != null) { - try (final AgentScope scope = continuation.activate()) { + try (final ContextScope scope = continuation.activate()) { delegate.onThrowable(throwable); } } else { diff --git a/dd-java-agent/instrumentation/play-ws/play-ws-2.0/src/main/java/datadog/trace/instrumentation/playws2/AsyncHandlerWrapper.java b/dd-java-agent/instrumentation/play-ws/play-ws-2.0/src/main/java/datadog/trace/instrumentation/playws2/AsyncHandlerWrapper.java index 3572424749e..82e80328724 100644 --- a/dd-java-agent/instrumentation/play-ws/play-ws-2.0/src/main/java/datadog/trace/instrumentation/playws2/AsyncHandlerWrapper.java +++ b/dd-java-agent/instrumentation/play-ws/play-ws-2.0/src/main/java/datadog/trace/instrumentation/playws2/AsyncHandlerWrapper.java @@ -3,6 +3,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.captureSpan; import static datadog.trace.instrumentation.playws.PlayWSClientDecorator.DECORATE; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.net.InetSocketAddress; @@ -57,7 +58,7 @@ public Object onCompleted() throws Exception { span.finish(); if (continuation != null) { - try (final AgentScope scope = continuation.activate()) { + try (final ContextScope scope = continuation.activate()) { return delegate.onCompleted(); } } else { @@ -72,7 +73,7 @@ public void onThrowable(final Throwable throwable) { span.finish(); if (continuation != null) { - try (final AgentScope scope = continuation.activate()) { + try (final ContextScope scope = continuation.activate()) { delegate.onThrowable(throwable); } } else { diff --git a/dd-java-agent/instrumentation/play-ws/play-ws-2.1/src/main/java/datadog/trace/instrumentation/playws21/AsyncHandlerWrapper.java b/dd-java-agent/instrumentation/play-ws/play-ws-2.1/src/main/java/datadog/trace/instrumentation/playws21/AsyncHandlerWrapper.java index b442f327c0b..2f864174bda 100644 --- a/dd-java-agent/instrumentation/play-ws/play-ws-2.1/src/main/java/datadog/trace/instrumentation/playws21/AsyncHandlerWrapper.java +++ b/dd-java-agent/instrumentation/play-ws/play-ws-2.1/src/main/java/datadog/trace/instrumentation/playws21/AsyncHandlerWrapper.java @@ -3,6 +3,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.captureSpan; import static datadog.trace.instrumentation.playws.PlayWSClientDecorator.DECORATE; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.net.InetSocketAddress; @@ -58,7 +59,7 @@ public Object onCompleted() throws Exception { span.finish(); if (continuation != null) { - try (final AgentScope scope = continuation.activate()) { + try (final ContextScope scope = continuation.activate()) { return delegate.onCompleted(); } } else { @@ -73,7 +74,7 @@ public void onThrowable(final Throwable throwable) { span.finish(); if (continuation != null) { - try (final AgentScope scope = continuation.activate()) { + try (final ContextScope scope = continuation.activate()) { delegate.onThrowable(throwable); } } else { diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ActionWrapper.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ActionWrapper.java index 23ab189156f..b0ce89cc2cd 100644 --- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ActionWrapper.java +++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ActionWrapper.java @@ -2,7 +2,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -22,7 +22,7 @@ private ActionWrapper(final Action delegate, final AgentSpan span) { @Override public void execute(final T t) throws Exception { - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { delegate.execute(t); } } diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/BlockWrapper.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/BlockWrapper.java index 2dc9eb10690..7fe94d5a86e 100644 --- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/BlockWrapper.java +++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/BlockWrapper.java @@ -2,7 +2,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -23,7 +23,7 @@ private BlockWrapper(final Block delegate, final AgentSpan span) { @Override public void execute() throws Exception { - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { delegate.execute(); } } diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/TracingHandler.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/TracingHandler.java index 022af818747..7c5ad8b19b2 100644 --- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/TracingHandler.java +++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/TracingHandler.java @@ -8,8 +8,8 @@ import static datadog.trace.instrumentation.ratpack.RatpackServerDecorator.DECORATE; import com.google.common.reflect.TypeToken; +import datadog.context.ContextScope; import datadog.trace.api.gateway.Flow; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import io.netty.util.Attribute; import io.netty.util.AttributeKey; @@ -45,12 +45,12 @@ public void handle(final Context ctx) { boolean setFinalizer = false; - try (final AgentScope scope = activateSpan(ratpackSpan)) { + try (final ContextScope scope = activateSpan(ratpackSpan)) { ctx.getResponse() .beforeSend( response -> { - try (final AgentScope ignored = activateSpan(ratpackSpan)) { + try (final ContextScope ignored = activateSpan(ratpackSpan)) { if (nettySpan != null) { // Rename the netty span resource name with the ratpack route. DECORATE.onContext(nettySpan, ctx); diff --git a/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/WrapperWithContext.java b/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/WrapperWithContext.java index a791f605bbb..6d4553508d1 100644 --- a/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/WrapperWithContext.java +++ b/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/WrapperWithContext.java @@ -1,5 +1,6 @@ package datadog.trace.instrumentation.resilience4j; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; @@ -32,7 +33,7 @@ public CheckedConsumerWithContext( @Override public void accept(I arg) throws Throwable { - try (AgentScope ignore = activateScope()) { + try (ContextScope ignore = activateScope()) { delegate.accept(arg); } finally { finishSpanIfNeeded(); @@ -52,7 +53,7 @@ public ConsumerWithContext( @Override public void accept(I arg) { - try (AgentScope ignore = activateScope()) { + try (ContextScope ignore = activateScope()) { delegate.accept(arg); } finally { finishSpanIfNeeded(); @@ -72,7 +73,7 @@ public CheckedFunctionWithContext( @Override public O apply(I arg) throws Throwable { - try (AgentScope ignore = activateScope()) { + try (ContextScope ignore = activateScope()) { return delegate.apply(arg); } finally { finishSpanIfNeeded(); @@ -92,7 +93,7 @@ public SupplierWithContext( @Override public O get() { - try (AgentScope ignore = activateScope()) { + try (ContextScope ignore = activateScope()) { return delegate.get(); } finally { finishSpanIfNeeded(); @@ -112,7 +113,7 @@ public CallableWithContext( @Override public O call() throws Exception { - try (AgentScope ignore = activateScope()) { + try (ContextScope ignore = activateScope()) { return delegate.call(); } finally { finishSpanIfNeeded(); @@ -132,7 +133,7 @@ public FunctionWithContext( @Override public O apply(I arg) { - try (AgentScope ignore = activateScope()) { + try (ContextScope ignore = activateScope()) { return delegate.apply(arg); } finally { finishSpanIfNeeded(); @@ -152,7 +153,7 @@ public CheckedSupplierWithContext( @Override public O get() throws Throwable { - try (AgentScope ignore = activateScope()) { + try (ContextScope ignore = activateScope()) { return delegate.get(); } finally { finishSpanIfNeeded(); @@ -172,7 +173,7 @@ public CheckedRunnableWithContext( @Override public void run() throws Throwable { - try (AgentScope ignore = activateScope()) { + try (ContextScope ignore = activateScope()) { delegate.run(); } finally { finishSpanIfNeeded(); @@ -192,7 +193,7 @@ public RunnableWithContext( @Override public void run() { - try (AgentScope ignore = activateScope()) { + try (ContextScope ignore = activateScope()) { delegate.run(); } finally { finishSpanIfNeeded(); @@ -212,7 +213,7 @@ public SupplierOfCompletionStageWithContext( @Override public CompletionStage get() { - try (AgentScope ignore = activateScope()) { + try (ContextScope ignore = activateScope()) { return delegate .get() .whenComplete( @@ -235,7 +236,7 @@ public SupplierOfFutureWithContext( @Override public Future get() { - try (AgentScope ignore = activateScope()) { + try (ContextScope ignore = activateScope()) { Future future = delegate.get(); if (future instanceof CompletableFuture) { ((CompletableFuture) future) diff --git a/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/ReactorHelper.java b/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/ReactorHelper.java index 97dc83e0859..84b8c878b5e 100644 --- a/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/ReactorHelper.java +++ b/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/ReactorHelper.java @@ -2,7 +2,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.util.function.BiConsumer; import java.util.function.Consumer; @@ -31,7 +31,7 @@ public static Function, Publisher> wrapFunction( spanDecorator.afterStart(current); } spanDecorator.decorate(current, null); - try (AgentScope scope = activateSpan(current)) { + try (ContextScope scope = activateSpan(current)) { Publisher ret = operator.apply(value); attachContext.accept(ret, current); if (owned == null) { diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/src/main/java/datadog/trace/instrumentation/jaxrs/ClientTracingFilter.java b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/src/main/java/datadog/trace/instrumentation/jaxrs/ClientTracingFilter.java index 639891cace2..45e6c04a3a0 100644 --- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/src/main/java/datadog/trace/instrumentation/jaxrs/ClientTracingFilter.java +++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/src/main/java/datadog/trace/instrumentation/jaxrs/ClientTracingFilter.java @@ -8,7 +8,7 @@ import static datadog.trace.instrumentation.jaxrs.JaxRsClientDecorator.JAX_RS_CLIENT; import static datadog.trace.instrumentation.jaxrs.JaxRsClientDecorator.JAX_RS_CLIENT_CALL; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import javax.annotation.Priority; import javax.ws.rs.Priorities; @@ -24,7 +24,7 @@ public class ClientTracingFilter implements ClientRequestFilter, ClientResponseF @Override public void filter(final ClientRequestContext requestContext) { final AgentSpan span = startSpan(JAX_RS_CLIENT.toString(), JAX_RS_CLIENT_CALL); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { DECORATE.afterStart(span); DECORATE.onRequest(span, requestContext); DECORATE.injectContext(current().with(span), requestContext.getHeaders(), SETTER); diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-1.0/src/main/java/datadog/trace/instrumentation/rxjava/TracedOnSubscribe.java b/dd-java-agent/instrumentation/rxjava/rxjava-1.0/src/main/java/datadog/trace/instrumentation/rxjava/TracedOnSubscribe.java index dadbb510029..f88a82fa3d6 100644 --- a/dd-java-agent/instrumentation/rxjava/rxjava-1.0/src/main/java/datadog/trace/instrumentation/rxjava/TracedOnSubscribe.java +++ b/dd-java-agent/instrumentation/rxjava/rxjava-1.0/src/main/java/datadog/trace/instrumentation/rxjava/TracedOnSubscribe.java @@ -4,7 +4,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.decorator.BaseDecorator; import rx.DDTracingUtil; @@ -39,7 +39,7 @@ public void call(final Subscriber subscriber) { instrumentationName(), operationName, parent != null ? parent.spanContext() : null); afterStart(span); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { delegate.call(new TracedSubscriber(span, subscriber, decorator)); } } diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-1.0/src/main/java/datadog/trace/instrumentation/rxjava/TracedSubscriber.java b/dd-java-agent/instrumentation/rxjava/rxjava-1.0/src/main/java/datadog/trace/instrumentation/rxjava/TracedSubscriber.java index c9eccecbc85..9eeb30270f4 100644 --- a/dd-java-agent/instrumentation/rxjava/rxjava-1.0/src/main/java/datadog/trace/instrumentation/rxjava/TracedSubscriber.java +++ b/dd-java-agent/instrumentation/rxjava/rxjava-1.0/src/main/java/datadog/trace/instrumentation/rxjava/TracedSubscriber.java @@ -2,7 +2,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.decorator.BaseDecorator; import java.util.concurrent.atomic.AtomicReference; @@ -28,7 +28,7 @@ public TracedSubscriber( public void onStart() { final AgentSpan span = spanRef.get(); if (span != null) { - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { delegate.onStart(); } } else { @@ -40,7 +40,7 @@ public void onStart() { public void onNext(final T value) { final AgentSpan span = spanRef.get(); if (span != null) { - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { delegate.onNext(value); } catch (final Throwable e) { onError(e); @@ -55,7 +55,7 @@ public void onCompleted() { final AgentSpan span = spanRef.getAndSet(null); if (span != null) { boolean errored = false; - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { delegate.onCompleted(); } catch (final Throwable e) { // Repopulate the spanRef for onError @@ -78,7 +78,7 @@ public void onCompleted() { public void onError(final Throwable e) { final AgentSpan span = spanRef.getAndSet(null); if (span != null) { - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { decorator.onError(span, e); delegate.onError(e); } catch (final Throwable e2) { diff --git a/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/test/java/LinearTask.java b/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/test/java/LinearTask.java index c62b49217fe..0bfd9877d15 100644 --- a/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/test/java/LinearTask.java +++ b/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/test/java/LinearTask.java @@ -1,7 +1,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import scala.concurrent.forkjoin.RecursiveTask; @@ -32,7 +32,7 @@ protected Integer compute() { } else { int next = parent + 1; AgentSpan span = startSpan("test", Integer.toString(next)); - try (AgentScope scope = activateSpan(span)) { + try (ContextScope scope = activateSpan(span)) { LinearTask child = new LinearTask(next, depth); return child.fork().join(); } finally { diff --git a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpannedMethodInvocation.java b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpannedMethodInvocation.java index 7e5fbea27c7..c9b210c5185 100644 --- a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpannedMethodInvocation.java +++ b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpannedMethodInvocation.java @@ -5,6 +5,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.instrumentation.springscheduling.SpringSchedulingDecorator.DECORATE; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.lang.reflect.AccessibleObject; @@ -42,14 +43,14 @@ public Object proceed() throws Throwable { } private Object invokeWithContinuation(CharSequence spanName) throws Throwable { - try (AgentScope scope = continuation.activate()) { + try (ContextScope scope = continuation.activate()) { return invokeWithSpan(spanName); } } private Object invokeWithSpan(CharSequence spanName) throws Throwable { AgentSpan span = startSpan("spring-scheduling", spanName); - try (AgentScope scope = activateSpan(span)) { + try (ContextScope scope = activateSpan(span)) { return delegate.proceed(); } finally { span.finish(); diff --git a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingRunnableWrapper.java b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingRunnableWrapper.java index bf0dc7ceced..553f4518d83 100644 --- a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingRunnableWrapper.java +++ b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingRunnableWrapper.java @@ -7,8 +7,8 @@ import static datadog.trace.instrumentation.springscheduling.SpringSchedulingDecorator.DECORATE; import static datadog.trace.instrumentation.springscheduling.SpringSchedulingDecorator.SCHEDULED_CALL; +import datadog.context.ContextScope; import datadog.trace.api.Config; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.util.MethodHandles; import java.lang.invoke.MethodHandle; @@ -60,7 +60,7 @@ public void run() { : startSpan("spring-scheduling", SCHEDULED_CALL, null); DECORATE.afterStart(span); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { DECORATE.onRun(span, runnable); try { diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/client/TraceWebClientSubscriber.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/client/TraceWebClientSubscriber.java index b04c5cf9eea..c0d75bf4999 100644 --- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/client/TraceWebClientSubscriber.java +++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/client/TraceWebClientSubscriber.java @@ -4,7 +4,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopSpan; import static datadog.trace.instrumentation.springwebflux.client.SpringWebfluxHttpClientDecorator.DECORATE; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import org.reactivestreams.Subscription; import org.springframework.web.reactive.function.client.ClientResponse; @@ -32,14 +32,14 @@ public TraceWebClientSubscriber( @Override public void onSubscribe(final Subscription subscription) { - try (final AgentScope scope = activateSpan(parent)) { + try (final ContextScope scope = activateSpan(parent)) { actual.onSubscribe(subscription); } } @Override public void onNext(final ClientResponse response) { - try (final AgentScope scope = activateSpan(parent)) { + try (final ContextScope scope = activateSpan(parent)) { actual.onNext(response); } finally { DECORATE.onResponse(span, response); @@ -50,7 +50,7 @@ public void onNext(final ClientResponse response) { @Override public void onError(final Throwable t) { - try (final AgentScope scope = activateSpan(parent)) { + try (final ContextScope scope = activateSpan(parent)) { actual.onError(t); } finally { DECORATE.onError(span, t); @@ -62,7 +62,7 @@ public void onError(final Throwable t) { @Override public void onComplete() { - try (final AgentScope scope = activateSpan(parent)) { + try (final ContextScope scope = activateSpan(parent)) { actual.onComplete(); } } diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/client/WebClientTracingFilter.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/client/WebClientTracingFilter.java index 79f0e3c5310..ad84ba4be92 100644 --- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/client/WebClientTracingFilter.java +++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/client/WebClientTracingFilter.java @@ -6,7 +6,7 @@ import static datadog.trace.instrumentation.springwebflux.client.SpringWebfluxHttpClientDecorator.DECORATE; import static datadog.trace.instrumentation.springwebflux.client.SpringWebfluxHttpClientDecorator.HTTP_REQUEST; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.util.List; import org.springframework.web.reactive.function.client.ClientRequest; @@ -54,7 +54,7 @@ public void subscribe(final CoreSubscriber subscriber) { DECORATE.afterStart(span); DECORATE.onRequest(span, request); AgentSpan parent = activeSpan(); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { TraceWebClientSubscriber tracingSubscriber = new TraceWebClientSubscriber(subscriber, span, parent); next.exchange(request).doOnCancel(tracingSubscriber::onCancel).subscribe(tracingSubscriber); diff --git a/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/CompletionListener.java b/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/CompletionListener.java index a3c31f49522..d079b05c342 100644 --- a/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/CompletionListener.java +++ b/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/CompletionListener.java @@ -3,7 +3,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.instrumentation.spymemcached.MemcacheClientDecorator.DECORATE; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.util.concurrent.CancellationException; import java.util.concurrent.ExecutionException; @@ -19,14 +19,14 @@ public abstract class CompletionListener { public CompletionListener(final AgentSpan span, final String methodName) { this.span = span; - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { DECORATE.afterStart(span); DECORATE.onOperation(span, methodName); } } protected void closeAsyncSpan(final T future) { - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { try { processResult(span, future); } catch (final CancellationException e) { @@ -54,7 +54,7 @@ protected void closeAsyncSpan(final T future) { } protected void closeSyncSpan(final Throwable thrown) { - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { DECORATE.onError(span, thrown); DECORATE.beforeFinish(span); span.finish(); diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/TaskInstrumentation.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/TaskInstrumentation.java index c4b3ca071a4..d99a6c9b5a9 100644 --- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/TaskInstrumentation.java +++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/TaskInstrumentation.java @@ -11,6 +11,7 @@ import com.tibco.pe.core.ProcessGroup; import com.tibco.pe.core.Task; import com.tibco.pe.plugin.ProcessContext; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; import datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers; @@ -87,7 +88,7 @@ public static void after( @Advice.Enter boolean traced, @Advice.Local("ddActivityInfo") ActivityHelper.ActivityInfo ddActivityInfo, @Advice.Local("ddScope") AgentScope ddScope) { - try (AgentScope closeMe = ddScope) { + try (ContextScope closeMe = ddScope) { if (!traced) { return; } diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/ProcessInstrumentation.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/ProcessInstrumentation.java index e6a90077917..d6a070d0126 100644 --- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/ProcessInstrumentation.java +++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/ProcessInstrumentation.java @@ -11,12 +11,12 @@ import com.tibco.pvm.api.PmProcessInstance; import com.tibco.pvm.api.PmWorkUnit; import com.tibco.pvm.api.session.PmContext; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; import datadog.trace.api.Config; import datadog.trace.bootstrap.ContextStore; import datadog.trace.bootstrap.InstrumentationContext; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.type.TypeDescription; @@ -65,7 +65,7 @@ public static void onExit( // cannot find the name } } - try (AgentScope maybeScope = parentSpan != null ? activateSpan(parentSpan) : null) { + try (ContextScope maybeScope = parentSpan != null ? activateSpan(parentSpan) : null) { AgentSpan span = startSpan("tibco_bw", TibcoDecorator.TIBCO_PROCESS_OPERATION); TibcoDecorator.DECORATE.afterStart(span); if (appName != null) { diff --git a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/UndertowRunnableWrapper.java b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/UndertowRunnableWrapper.java index 0b27f27fe2d..2385d8cb8cd 100644 --- a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/UndertowRunnableWrapper.java +++ b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/UndertowRunnableWrapper.java @@ -5,6 +5,7 @@ import static datadog.trace.bootstrap.instrumentation.java.concurrent.ExcludeFilter.ExcludeType.RUNNABLE; import static datadog.trace.bootstrap.instrumentation.java.concurrent.ExcludeFilter.exclude; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import io.undertow.server.HttpServerExchange; @@ -23,7 +24,7 @@ public UndertowRunnableWrapper( @Override public void run() { - try (AgentScope scope = continuation.activate()) { + try (ContextScope scope = continuation.activate()) { runnable.run(); } } diff --git a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisAPIImplSendAdvice.java b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisAPIImplSendAdvice.java index 3c8aadba9a3..3599f31233d 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisAPIImplSendAdvice.java +++ b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisAPIImplSendAdvice.java @@ -4,8 +4,8 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopSpan; import static datadog.trace.instrumentation.vertx_redis_client.VertxRedisClientDecorator.DECORATE; +import datadog.context.ContextScope; import datadog.trace.bootstrap.InstrumentationContext; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import io.vertx.core.Future; import io.vertx.core.net.SocketAddress; import io.vertx.redis.client.Redis; @@ -27,7 +27,7 @@ public static void afterSend( */ // Note that we should not _leak_ the active scope to the handler if it gets executed directly - try (AgentScope scope = activateSpan(noopSpan())) { + try (ContextScope scope = activateSpan(noopSpan())) { // Get the handler from the context, set by RedisAPICallAdvice ResponseHandlerWrapper handler = InstrumentationContext.get(RedisAPI.class, ResponseHandlerWrapper.class).get(self); diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteHandlerWrapper.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteHandlerWrapper.java index b001826420e..0f7a5adade7 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteHandlerWrapper.java +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteHandlerWrapper.java @@ -8,7 +8,7 @@ import static datadog.trace.instrumentation.vertx_3_4.server.VertxDecorator.DECORATE; import static datadog.trace.instrumentation.vertx_3_4.server.VertxDecorator.INSTRUMENTATION_NAME; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.Tags; import io.vertx.core.Handler; @@ -62,7 +62,7 @@ public void handle(final RoutingContext routingContext) { } setRoute(routingContext); } - try (final AgentScope scope = span != null ? activateSpan(span) : noopScope()) { + try (final ContextScope scope = span != null ? activateSpan(span) : noopScope()) { try { actual.handle(routingContext); } catch (final Throwable t) { diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteHandlerWrapper.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteHandlerWrapper.java index 19b344b75f6..c34fb32cdfb 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteHandlerWrapper.java +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteHandlerWrapper.java @@ -8,7 +8,7 @@ import static datadog.trace.instrumentation.vertx_4_0.server.VertxDecorator.DECORATE; import static datadog.trace.instrumentation.vertx_4_0.server.VertxDecorator.INSTRUMENTATION_NAME; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.Tags; import io.vertx.core.Handler; @@ -60,7 +60,7 @@ public void handle(final RoutingContext routingContext) { setRoute(routingContext); } - try (final AgentScope scope = span != null ? activateSpan(span) : noopScope()) { + try (final ContextScope scope = span != null ? activateSpan(span) : noopScope()) { try { actual.handle(routingContext); } catch (final Throwable t) { diff --git a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/TracingOutputStream.java b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/TracingOutputStream.java index 6aa3d2f01eb..83b5de0ea20 100644 --- a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/TracingOutputStream.java +++ b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/TracingOutputStream.java @@ -4,8 +4,8 @@ import static datadog.trace.bootstrap.instrumentation.decorator.WebsocketDecorator.DECORATE; import static datadog.trace.bootstrap.instrumentation.websocket.HandlersExtractor.MESSAGE_TYPE_BINARY; +import datadog.context.ContextScope; import datadog.trace.bootstrap.CallDepthThreadLocalMap; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.websocket.HandlerContext; import java.io.IOException; import java.io.OutputStream; @@ -26,7 +26,7 @@ public void write(int b) throws IOException { if (doTrace) { DECORATE.onSendFrameStart(handlerContext, MESSAGE_TYPE_BINARY, 1); } - try (final AgentScope ignored = activateSpan(handlerContext.getWebsocketSpan())) { + try (final ContextScope ignored = activateSpan(handlerContext.getWebsocketSpan())) { delegate.write(b); } finally { if (doTrace) { @@ -41,7 +41,7 @@ public void write(byte[] b, int off, int len) throws IOException { if (doTrace) { DECORATE.onSendFrameStart(handlerContext, MESSAGE_TYPE_BINARY, len); } - try (final AgentScope ignored = activateSpan(handlerContext.getWebsocketSpan())) { + try (final ContextScope ignored = activateSpan(handlerContext.getWebsocketSpan())) { delegate.write(b, off, len); } finally { if (doTrace) { @@ -53,7 +53,7 @@ public void write(byte[] b, int off, int len) throws IOException { @Override public void close() throws IOException { final boolean doTrace = CallDepthThreadLocalMap.incrementCallDepth(HandlerContext.class) == 0; - try (final AgentScope ignored = + try (final ContextScope ignored = handlerContext.getWebsocketSpan() != null ? activateSpan(handlerContext.getWebsocketSpan()) : null) { diff --git a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/TracingSendHandler.java b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/TracingSendHandler.java index 1401ae0f502..c5a582859a3 100644 --- a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/TracingSendHandler.java +++ b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/TracingSendHandler.java @@ -3,7 +3,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.decorator.WebsocketDecorator.DECORATE; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.websocket.HandlerContext; import javax.websocket.SendHandler; @@ -21,7 +21,7 @@ public TracingSendHandler(SendHandler delegate, HandlerContext handlerContext) { @Override public void onResult(SendResult sendResult) { final AgentSpan wsSpan = handlerContext.getWebsocketSpan(); - try (final AgentScope ignored = activateSpan(wsSpan)) { + try (final ContextScope ignored = activateSpan(wsSpan)) { delegate.onResult(sendResult); } finally { if (sendResult.getException() != null) { diff --git a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/TracingWriter.java b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/TracingWriter.java index 4d37d1ba307..075637763df 100644 --- a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/TracingWriter.java +++ b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/TracingWriter.java @@ -4,8 +4,8 @@ import static datadog.trace.bootstrap.instrumentation.decorator.WebsocketDecorator.DECORATE; import static datadog.trace.bootstrap.instrumentation.websocket.HandlersExtractor.MESSAGE_TYPE_TEXT; +import datadog.context.ContextScope; import datadog.trace.bootstrap.CallDepthThreadLocalMap; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.websocket.HandlerContext; import java.io.IOException; import java.io.Writer; @@ -26,7 +26,7 @@ public void write(char[] cbuf, int off, int len) throws IOException { if (doTrace) { DECORATE.onSendFrameStart(handlerContext, MESSAGE_TYPE_TEXT, len); } - try (final AgentScope ignored = activateSpan(handlerContext.getWebsocketSpan())) { + try (final ContextScope ignored = activateSpan(handlerContext.getWebsocketSpan())) { delegate.write(cbuf, off, len); } finally { if (doTrace) { @@ -43,7 +43,7 @@ public void flush() throws IOException { @Override public void close() throws IOException { final boolean doTrace = CallDepthThreadLocalMap.incrementCallDepth(HandlerContext.class) == 0; - try (final AgentScope ignored = + try (final ContextScope ignored = handlerContext.getWebsocketSpan() != null ? activateSpan(handlerContext.getWebsocketSpan()) : null) { diff --git a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10.0/src/main/java11/datadog/trace/instrumentation/websocket/jetty10/MethodHandleWrappers.java b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10.0/src/main/java11/datadog/trace/instrumentation/websocket/jetty10/MethodHandleWrappers.java index 7896b2eb5a6..c1af95f1cdd 100644 --- a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10.0/src/main/java11/datadog/trace/instrumentation/websocket/jetty10/MethodHandleWrappers.java +++ b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10.0/src/main/java11/datadog/trace/instrumentation/websocket/jetty10/MethodHandleWrappers.java @@ -3,11 +3,11 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.decorator.WebsocketDecorator.DECORATE; +import datadog.context.ContextScope; import datadog.trace.api.Config; import datadog.trace.bootstrap.CallDepthThreadLocalMap; import datadog.trace.bootstrap.ContextStore; import datadog.trace.bootstrap.ExceptionLogger; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import datadog.trace.bootstrap.instrumentation.websocket.HandlerContext; @@ -117,7 +117,7 @@ public static void onClose( if (handlerContext != null) { final HandlerContext.Receiver closeContext = new HandlerContext.Receiver(handlerContext.getHandshakeSpan(), session.getId()); - try (AgentScope ignored = + try (ContextScope ignored = activateSpan( DECORATE.onSessionCloseReceived( closeContext, @@ -163,7 +163,7 @@ public static Object onMessage( ExceptionLogger.LOGGER.debug("Unforeseen error instrumenting jetty websocket POJO", t); } if (wsSpan != null) { - try (AgentScope ignored = activateSpan(wsSpan)) { + try (ContextScope ignored = activateSpan(wsSpan)) { return delegate.invokeWithArguments(args); } catch (Throwable t) { finishSpan = true; diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/java/lang/ProcessImplInstrumentationHelpers.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/java/lang/ProcessImplInstrumentationHelpers.java index e5e2f2ab6f2..09a16559910 100644 --- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/java/lang/ProcessImplInstrumentationHelpers.java +++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/java/lang/ProcessImplInstrumentationHelpers.java @@ -6,6 +6,7 @@ import static java.lang.invoke.MethodType.methodType; import datadog.appsec.api.blocking.BlockingException; +import datadog.context.ContextScope; import datadog.trace.api.Config; import datadog.trace.api.gateway.BlockResponseFunction; import datadog.trace.api.gateway.Flow; @@ -313,7 +314,7 @@ private static void finishSpan( span.finish(); return; } - try (final AgentScope scope = parentContinuation.activate()) { + try (final ContextScope scope = parentContinuation.activate()) { span.finish(); } } From f62f9054d17ef8d06b1ef6be45fd80ba2492dbd9 Mon Sep 17 00:00:00 2001 From: Stuart McCulloch Date: Wed, 1 Jul 2026 18:16:51 +0100 Subject: [PATCH 112/139] Avoid allocation when adding the same key-value to an existing IndexedContext/SingletonContext (#11673) Avoid allocation when adding the same key-value to an existing IndexedContext/SingletonContext Co-authored-by: devflow.devflow-routing-intake --- .../main/java/datadog/context/IndexedContext.java | 3 +++ .../main/java/datadog/context/SingletonContext.java | 10 +++++++--- .../src/test/java/datadog/context/ContextTest.java | 12 ++++++++++++ 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/components/context/src/main/java/datadog/context/IndexedContext.java b/components/context/src/main/java/datadog/context/IndexedContext.java index ff9acb33e57..d4590b6f859 100644 --- a/components/context/src/main/java/datadog/context/IndexedContext.java +++ b/components/context/src/main/java/datadog/context/IndexedContext.java @@ -28,6 +28,9 @@ public T get(ContextKey key) { public Context with(ContextKey key, @Nullable T value) { requireNonNull(key, "Context key cannot be null"); int index = key.index; + if (index < this.store.length && this.store[index] == value) { + return this; + } Object[] newStore = copyOfRange(this.store, 0, max(this.store.length, index + 1)); newStore[index] = value; return new IndexedContext(newStore); diff --git a/components/context/src/main/java/datadog/context/SingletonContext.java b/components/context/src/main/java/datadog/context/SingletonContext.java index 773c26b1fa3..300c9247798 100644 --- a/components/context/src/main/java/datadog/context/SingletonContext.java +++ b/components/context/src/main/java/datadog/context/SingletonContext.java @@ -29,9 +29,13 @@ public Context with(ContextKey secondKey, @Nullable V secondValue) { requireNonNull(secondKey, "Context key cannot be null"); int secondIndex = secondKey.index; if (this.index == secondIndex) { - return secondValue == null - ? EmptyContext.INSTANCE - : new SingletonContext(this.index, secondValue); + if (secondValue == null) { + return EmptyContext.INSTANCE; + } else if (secondValue != this.value) { + return new SingletonContext(this.index, secondValue); + } else { + return this; + } } else { Object[] store = new Object[max(this.index, secondIndex) + 1]; store[this.index] = this.value; diff --git a/components/context/src/test/java/datadog/context/ContextTest.java b/components/context/src/test/java/datadog/context/ContextTest.java index b4f884166b2..d8f50a00df3 100644 --- a/components/context/src/test/java/datadog/context/ContextTest.java +++ b/components/context/src/test/java/datadog/context/ContextTest.java @@ -7,6 +7,7 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -167,6 +168,17 @@ void testToString(Context context) { "Context string representation should contain implementation name"); } + @ParameterizedTest + @MethodSource("contextImplementations") + void testWithSameValueReturnsThis(Context context) { + String value = "value"; + Context context1 = context.with(STRING_KEY, value); + // storing the same value again should return the same instance + assertSame(context1, context1.with(STRING_KEY, value)); + // storing a different value should return a new instance + assertNotEquals(context1, context1.with(STRING_KEY, "other")); + } + @SuppressWarnings({"SimplifiableAssertion"}) @Test void testInflation() { From b710ce8abd2bd45d1826c50c38619c30c3a425bb Mon Sep 17 00:00:00 2001 From: Jean-Philippe Bempel Date: Wed, 1 Jul 2026 20:10:33 +0200 Subject: [PATCH 113/139] Debugger fix coverage (#11807) fix coverage fix coverage for - ExceptionProbeManager.ThrowableState - SpringHelper.ParserSpringVersion - SourceMapper - ConfigurationUpdater add check coverage for debugger tests exclude from coverage JDK version or Spring version dependent move detect method parameters to helper fix covergage for semeru8 disable coverage for all ibm jvms enable Kotlin for all JDKs Co-authored-by: devflow.devflow-routing-intake --- .gitlab-ci.yml | 6 + dd-java-agent/agent-debugger/build.gradle | 6 +- .../debugger/agent/ConfigurationUpdater.java | 244 +++++++++--------- .../exception/ExceptionProbeManager.java | 4 - .../debugger/probe/ExceptionProbe.java | 2 +- .../datadog/debugger/util/SpringHelper.java | 2 +- .../agent/ConfigurationUpdaterTest.java | 8 +- .../debugger/symbol/SourceRemapperTest.java | 14 + .../SymbolExtractionTransformerTest.java | 1 - .../debugger/util/SpringHelperTest.java | 8 + 10 files changed, 168 insertions(+), 127 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 58fb26607a2..6c018b1f99b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1046,11 +1046,17 @@ test_debugger: DEFAULT_TEST_JVMS: /^(8|11|17|21|25|semeru8)$/ # the latest "tip" version is LTS v25 parallel: matrix: *test_matrix + # avoid running coverage for semeru8, semeru11, semeru17 and ibm8 as some tests are disabled and therefore cannot reach the + # exepected coverage + script: + - if [[ "$testJvm" != "semeru8" && "$testJvm" != "semeru11" && "$testJvm" != "semeru17" && "$testJvm" != "ibm8" ]]; then export GRADLE_PARAMS="$GRADLE_PARAMS -PcheckCoverage"; fi + - !reference [.test_job, script] test_debugger_arm64: extends: .test_job_arm64 variables: GRADLE_TARGET: ":debuggerTest" + GRADLE_PARAMS: "-PcheckCoverage" CACHE_TYPE: "base" parallel: matrix: *test_matrix diff --git a/dd-java-agent/agent-debugger/build.gradle b/dd-java-agent/agent-debugger/build.gradle index b6836682a5d..47bbce94548 100644 --- a/dd-java-agent/agent-debugger/build.gradle +++ b/dd-java-agent/agent-debugger/build.gradle @@ -27,7 +27,11 @@ excludedClassesCoverage += [ // tested through smoke tests 'com.datadog.debugger.exception.FailedTestReplayExceptionDebugger', // dynamically compiled test classes - exclude to prevent Jacoco instrumentation interference - 'com.datadog.debugger.symboltest.SymbolExtraction*' + 'com.datadog.debugger.symboltest.SymbolExtraction*', + // Depends on multiple versions of Spring to be tested while we have dep lockfiles + 'com.datadog.debugger.util.SpringHelper*', + // Used for helper methods that are JDK version specific + 'com.datadog.debugger.agent.ConfigurationUpdater.JDKVersionSpecificHelper' ] dependencies { diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ConfigurationUpdater.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ConfigurationUpdater.java index 3caa2a149ab..5a68838f3b8 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ConfigurationUpdater.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ConfigurationUpdater.java @@ -41,6 +41,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; +import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Supplier; import java.util.stream.Collectors; @@ -210,8 +211,12 @@ private void handleProbesChanges(ConfigurationComparer changes, Configuration ne } List> changedClasses = finder.getAllLoadedChangedClasses(instrumentation.getAllLoadedClasses(), changes); - changedClasses = detectMethodParameters(changes, changedClasses); - changedClasses = detectRecordWithTypeAnnotation(changes, changedClasses); + changedClasses = + JDKVersionSpecificHelper.detectMethodParameters( + errorMsg -> reportError(changes, errorMsg), instrumentation, changedClasses); + changedClasses = + JDKVersionSpecificHelper.detectRecordWithTypeAnnotation( + errorMsg -> reportError(changes, errorMsg), changedClasses); retransformClasses(changedClasses); // ensures that we have at least re-transformed 1 class if (changedClasses.size() > 0) { @@ -219,122 +224,6 @@ private void handleProbesChanges(ConfigurationComparer changes, Configuration ne } } - /* - * Because of this bug (https://bugs.openjdk.org/browse/JDK-8240908), classes compiled with - * method parameters (javac -parameters) strip this attribute once retransformed - * Spring 6/Spring boot 3 rely exclusively on this attribute and may throw an exception - * if no attribute found. - */ - private List> detectMethodParameters( - ConfigurationComparer changes, List> changedClasses) { - if (JAVA_AT_LEAST_19) { - // bug is fixed since JDK19, no need to perform detection - return changedClasses; - } - List> result = new ArrayList<>(); - for (Class changedClass : changedClasses) { - boolean addClass = true; - try { - Method[] declaredMethods = changedClass.getDeclaredMethods(); - // capping scanning of methods to 100 to avoid generated class with thousand of methods - // assuming that in those first 100 methods there is at least one with at least one - // parameter - for (int methodIdx = 0; - methodIdx < declaredMethods.length && methodIdx < 100; - methodIdx++) { - Method method = declaredMethods[methodIdx]; - Parameter[] parameters = method.getParameters(); - if (parameters.length == 0) { - continue; - } - if (parameters[0].isNamePresent()) { - if (!SpringHelper.isSpringUsingOnlyMethodParameters(instrumentation)) { - return changedClasses; - } - LOGGER.debug( - "Detecting method parameter: method={} param={}, Skipping retransforming this class", - method.getName(), - parameters[0].getName()); - // skip the class: compiled with -parameters - reportError( - changes, - "Method Parameters detected, instrumentation not supported for " - + changedClass.getTypeName()); - addClass = false; - } - // we found at leat a method with one parameter if name is not present we can stop there - break; - } - } catch (Exception e) { - LOGGER.debug("Exception scanning method parameters", e); - } - if (addClass) { - result.add(changedClass); - } - } - return result; - } - - private List> detectRecordWithTypeAnnotation( - ConfigurationComparer changes, List> changedClasses) { - if (!JAVA_AT_LEAST_16) { - // records introduced in JDK 16 (final version) - return changedClasses; - } - List> result = new ArrayList<>(); - for (Class changedClass : changedClasses) { - boolean addClass = true; - try { - if (changedClass.getSuperclass() != null - && changedClass.getSuperclass().getTypeName().equals("java.lang.Record") - && Modifier.isFinal(changedClass.getModifiers())) { - if (hasTypeAnnotationOnRecordComponent(changedClass)) { - LOGGER.debug( - "Record with type annotation detected, instrumentation not supported for {}", - changedClass.getTypeName()); - reportError( - changes, - "Record with type annotation detected, instrumentation not supported for " - + changedClass.getTypeName()); - addClass = false; - } - } - } catch (Exception e) { - LOGGER.debug("Exception detecting record with type annotation", e); - } - if (addClass) { - result.add(changedClass); - } - } - return result; - } - - private boolean hasTypeAnnotationOnRecordComponent(Class recordClass) { - if (GET_RECORD_COMPONENTS_METHOD == null || GET_ANNOTATED_TYPES_METHOD == null) { - return false; - } - try { - Object recordComponentsArray = GET_RECORD_COMPONENTS_METHOD.invoke(recordClass); - int len = Array.getLength(recordComponentsArray); - for (int i = 0; i < len; i++) { - Object recordComponent = Array.get(recordComponentsArray, i); - AnnotatedType annotatedType = - (AnnotatedType) GET_ANNOTATED_TYPES_METHOD.invoke(recordComponent); - for (Annotation annotation : annotatedType.getAnnotations()) { - Target annotationTarget = annotation.annotationType().getAnnotation(Target.class); - if (annotationTarget != null - && Arrays.stream(annotationTarget.value()) - .anyMatch(it -> it == ElementType.TYPE_USE)) { - return true; - } - } - } - return false; - } catch (Exception ex) { - return false; - } - } - private void reportReceived(ConfigurationComparer changes) { for (ProbeDefinition def : changes.getAddedDefinitions()) { if (def instanceof ExceptionProbe) { @@ -461,4 +350,123 @@ Map getAppliedDefinitions() { Map getInstrumentationResults() { return instrumentationResults; } + + private static class JDKVersionSpecificHelper { + + public static List> detectRecordWithTypeAnnotation( + Consumer reportError, List> changedClasses) { + if (!JAVA_AT_LEAST_16) { + // records introduced in JDK 16 (final version) + return changedClasses; + } + List> result = new ArrayList<>(); + for (Class changedClass : changedClasses) { + boolean addClass = true; + try { + if (changedClass.getSuperclass() != null + && changedClass.getSuperclass().getTypeName().equals("java.lang.Record") + && Modifier.isFinal(changedClass.getModifiers())) { + if (hasTypeAnnotationOnRecordComponent(changedClass)) { + LOGGER.debug( + "Record with type annotation detected, instrumentation not supported for {}", + changedClass.getTypeName()); + reportError.accept( + "Record with type annotation detected, instrumentation not supported for " + + changedClass.getTypeName()); + addClass = false; + } + } + } catch (Exception e) { + LOGGER.debug("Exception detecting record with type annotation", e); + } + if (addClass) { + result.add(changedClass); + } + } + return result; + } + + private static boolean hasTypeAnnotationOnRecordComponent(Class recordClass) { + if (GET_RECORD_COMPONENTS_METHOD == null || GET_ANNOTATED_TYPES_METHOD == null) { + return false; + } + try { + Object recordComponentsArray = GET_RECORD_COMPONENTS_METHOD.invoke(recordClass); + int len = Array.getLength(recordComponentsArray); + for (int i = 0; i < len; i++) { + Object recordComponent = Array.get(recordComponentsArray, i); + AnnotatedType annotatedType = + (AnnotatedType) GET_ANNOTATED_TYPES_METHOD.invoke(recordComponent); + for (Annotation annotation : annotatedType.getAnnotations()) { + Target annotationTarget = annotation.annotationType().getAnnotation(Target.class); + if (annotationTarget != null + && Arrays.stream(annotationTarget.value()) + .anyMatch(it -> it == ElementType.TYPE_USE)) { + return true; + } + } + } + return false; + } catch (Exception ex) { + return false; + } + } + + /* + * Because of this bug (https://bugs.openjdk.org/browse/JDK-8240908), classes compiled with + * method parameters (javac -parameters) strip this attribute once retransformed + * Spring 6/Spring boot 3 rely exclusively on this attribute and may throw an exception + * if no attribute found. + */ + public static List> detectMethodParameters( + Consumer reportError, + Instrumentation instrumentation, + List> changedClasses) { + if (JAVA_AT_LEAST_19) { + // bug is fixed since JDK19, no need to perform detection + return changedClasses; + } + List> result = new ArrayList<>(); + for (Class changedClass : changedClasses) { + boolean addClass = true; + try { + Method[] declaredMethods = changedClass.getDeclaredMethods(); + // capping scanning of methods to 100 to avoid generated class with thousand of methods + // assuming that in those first 100 methods there is at least one with at least one + // parameter + for (int methodIdx = 0; + methodIdx < declaredMethods.length && methodIdx < 100; + methodIdx++) { + Method method = declaredMethods[methodIdx]; + Parameter[] parameters = method.getParameters(); + if (parameters.length == 0) { + continue; + } + if (parameters[0].isNamePresent()) { + if (!SpringHelper.isSpringUsingOnlyMethodParameters(instrumentation)) { + return changedClasses; + } + LOGGER.debug( + "Detecting method parameter: method={} param={}, Skipping retransforming this class", + method.getName(), + parameters[0].getName()); + // skip the class: compiled with -parameters + reportError.accept( + "Method Parameters detected, instrumentation not supported for " + + changedClass.getTypeName()); + addClass = false; + } + // we found at leat a method with one parameter if name is not present we can stop there + break; + } + } catch (Exception e) { + LOGGER.debug("Exception scanning method parameters", e); + } + if (addClass) { + result.add(changedClass); + } + } + return result; + } + } } diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/exception/ExceptionProbeManager.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/exception/ExceptionProbeManager.java index 3aeb7d05237..71b80c1d02f 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/exception/ExceptionProbeManager.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/exception/ExceptionProbeManager.java @@ -197,10 +197,6 @@ public List getSnapshots() { return snapshots; } - public boolean isSampling() { - return !snapshots.isEmpty(); - } - public void addSnapshot(Snapshot snapshot) { snapshots.add(snapshot); } diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/ExceptionProbe.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/ExceptionProbe.java index c1e2b67ca8a..d405203648f 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/ExceptionProbe.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/ExceptionProbe.java @@ -108,7 +108,7 @@ public void evaluate( exceptionProbeManager.getStateByThrowable(innerMostThrowable); if (state != null) { // Already unwinding the exception - if (!state.isSampling()) { + if (state.getSnapshots().isEmpty()) { // skip snapshot because no snapshot from previous stack level return; } diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/SpringHelper.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/SpringHelper.java index d058caab85d..dbcb2f1a477 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/SpringHelper.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/SpringHelper.java @@ -76,7 +76,7 @@ private static boolean isSpringUsingOnlyMethodParametersSpecificClass(Instrument return false; } - private static class ParsedSpringVersion { + static class ParsedSpringVersion { private static final Pattern VERSION_PATTERN = Pattern.compile("(\\d+)\\.(\\d+)\\.(\\d+)"); final int major; diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/ConfigurationUpdaterTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/ConfigurationUpdaterTest.java index 0ec8e1622e1..fe383c040b5 100644 --- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/ConfigurationUpdaterTest.java +++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/ConfigurationUpdaterTest.java @@ -2,6 +2,9 @@ import static com.datadog.debugger.agent.ConfigurationAcceptor.Source.REMOTE_CONFIG; import static com.datadog.debugger.agent.DebuggerProductChangesListener.LOG_PROBE_PREFIX; +import static com.datadog.debugger.agent.DebuggerProductChangesListener.METRIC_PROBE_PREFIX; +import static com.datadog.debugger.agent.DebuggerProductChangesListener.SPAN_DECORATION_PROBE_PREFIX; +import static com.datadog.debugger.agent.DebuggerProductChangesListener.SPAN_PROBE_PREFIX; import static com.datadog.debugger.probe.ProbeDefinitionDeserializer.deserializeLogProbe; import static com.datadog.debugger.probe.ProbeDefinitionDeserializer.deserializeSpanDecorationProbe; import static com.datadog.debugger.probe.ProbeDefinitionDeserializer.deserializeTriggerProbe; @@ -643,7 +646,10 @@ public void handleException() { ConfigurationUpdater configurationUpdater = createConfigUpdater(debuggerSinkWithMockStatusSink); Exception ex = new Exception("oops"); configurationUpdater.handleException(LOG_PROBE_PREFIX + PROBE_ID.getId(), ex); - verify(probeStatusSink).addError(eq(ProbeId.from(PROBE_ID.getId() + ":0")), eq(ex)); + configurationUpdater.handleException(METRIC_PROBE_PREFIX + PROBE_ID.getId(), ex); + configurationUpdater.handleException(SPAN_PROBE_PREFIX + PROBE_ID.getId(), ex); + configurationUpdater.handleException(SPAN_DECORATION_PROBE_PREFIX + PROBE_ID.getId(), ex); + verify(probeStatusSink, times(4)).addError(eq(ProbeId.from(PROBE_ID.getId() + ":0")), eq(ex)); } @Test diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/SourceRemapperTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/SourceRemapperTest.java index 891338d7674..c050915f5ae 100644 --- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/SourceRemapperTest.java +++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/SourceRemapperTest.java @@ -30,4 +30,18 @@ public void kotlinSourceRemapper() { assertTrue(sourceRemapper instanceof SourceRemapper.KotlinSourceRemapper); assertEquals(24, sourceRemapper.remapSourceLine(42)); } + + @Test + public void noKotlinDebug() { + SourceMap sourceMapMock = mock(SourceMap.class); + when(sourceMapMock.getDefaultStratumName()).thenReturn("Main"); + StratumExt stratumMainMock = mock(StratumExt.class); + when(sourceMapMock.getStratum(eq("Kotlin"))).thenReturn(stratumMainMock); + when(sourceMapMock.getStratum(eq("KotlinDebug"))).thenReturn(null); + IllegalArgumentException illegalArgumentException = + assertThrows( + IllegalArgumentException.class, + () -> SourceRemapper.getSourceRemapper("foo.kt", sourceMapMock)); + assertEquals("No stratumDebug found for KotlinDebug", illegalArgumentException.getMessage()); + } } diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/SymbolExtractionTransformerTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/SymbolExtractionTransformerTest.java index c6e488752c4..594b76e67d0 100644 --- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/SymbolExtractionTransformerTest.java +++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/SymbolExtractionTransformerTest.java @@ -968,7 +968,6 @@ public void symbolExtraction15() throws IOException, URISyntaxException { } @Test - @EnabledForJreRange(max = JRE.JAVA_25) @DisabledIf( value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Flaky on J9 JVMs") diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/SpringHelperTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/SpringHelperTest.java index 526ecdd2adf..3381dfe71e6 100644 --- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/SpringHelperTest.java +++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/SpringHelperTest.java @@ -35,4 +35,12 @@ void isSpringUsingOnlyMethodParametersFalseFallback() throws Exception { when(inst.getAllLoadedClasses()).thenReturn(new Class[0]); assertFalse(SpringHelper.isSpringUsingOnlyMethodParameters(inst)); } + + @Test + void invalidSpringVersion() { + IllegalArgumentException illegalArgumentException = + assertThrows( + IllegalArgumentException.class, () -> new SpringHelper.ParsedSpringVersion("foo")); + assertEquals("Cannot parse SpringVersion: foo", illegalArgumentException.getMessage()); + } } From d7ad296898d99a43b60b8b873c27b5e08c4cc4bc Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Wed, 1 Jul 2026 15:05:22 -0400 Subject: [PATCH 114/139] =?UTF-8?q?Add=20custom=20`ImageNameSubstitutor`?= =?UTF-8?q?=20implementation=20that=20rewrites=20Docker=20image=20names=20?= =?UTF-8?q?to=20use=20Datadog=E2=80=99s=20internal=20registry=20`registry.?= =?UTF-8?q?ddbuild.io`=20when=20running=20in=20a=20CI=20environment.=20(#9?= =?UTF-8?q?679)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add custom `ImageNameSubstitutor` implementation that rewrites Docker image names to use Datadog’s internal registry `registry.ddbuild.io` when running in a CI environment. Merge branch 'master' into alexeyk/docker-image-substitutor Spotless Merge branch 'master' into alexeyk/docker-image-substitutor Merge branch 'master' into alexeyk/docker-image-substitutor Merge branch 'master' into alexeyk/docker-image-substitutor # Conflicts: # dd-java-agent/instrumentation/jdbc/src/test/groovy/RemoteJDBCInstrumentationTest.groovy Groovy to Java. Applied code review suggestion. Co-authored-by: alexey.kuznetsov --- .../RemoteJDBCInstrumentationTest.groovy | 30 ++++++++-------- .../DataDogRegistryImageNameSubstitutor.java | 35 +++++++++++++++++++ .../test/resources/testcontainers.properties | 1 + 3 files changed, 51 insertions(+), 15 deletions(-) create mode 100644 dd-java-agent/instrumentation/jdbc/src/test/java/test/DataDogRegistryImageNameSubstitutor.java create mode 100644 dd-java-agent/instrumentation/jdbc/src/test/resources/testcontainers.properties diff --git a/dd-java-agent/instrumentation/jdbc/src/test/groovy/RemoteJDBCInstrumentationTest.groovy b/dd-java-agent/instrumentation/jdbc/src/test/groovy/RemoteJDBCInstrumentationTest.groovy index 0637f56d9ef..da27c427158 100644 --- a/dd-java-agent/instrumentation/jdbc/src/test/groovy/RemoteJDBCInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/jdbc/src/test/groovy/RemoteJDBCInstrumentationTest.groovy @@ -69,10 +69,10 @@ abstract class RemoteJDBCInstrumentationTest extends VersionedNamingTestBase { @Shared private Map jdbcUrls = [ - (POSTGRESQL): "jdbc:postgresql://localhost:5432/" + dbName.get(POSTGRESQL), - (MYSQL) : "jdbc:mysql://localhost:3306/" + dbName.get(MYSQL), - (SQLSERVER) : "jdbc:sqlserver://localhost:1433/" + dbName.get(SQLSERVER), - (ORACLE) : "jdbc:oracle:thin:@//localhost:1521/" + dbName.get(ORACLE), + (POSTGRESQL): "jdbc:postgresql://localhost:5432/${dbName.get(POSTGRESQL)}", + (MYSQL) : "jdbc:mysql://localhost:3306/${dbName.get(MYSQL)}", + (SQLSERVER) : "jdbc:sqlserver://localhost:1433/${dbName.get(SQLSERVER)}", + (ORACLE) : "jdbc:oracle:thin:@//localhost:1521/${dbName.get(ORACLE)}" ] @Shared @@ -119,14 +119,14 @@ abstract class RemoteJDBCInstrumentationTest extends VersionedNamingTestBase { && OperatingSystem.architecture().isArm64()) } - def peerConnectionProps(DbType db){ + def peerConnectionProps(DbType db) { def props = new Properties() props.setProperty("user", jdbcUserNames.get(db)) props.setProperty("password", jdbcPasswords.get(db)) return props } - protected String getDbType(DbType dbType){ + protected String getDbType(DbType dbType) { return dbType.toString() } @@ -456,7 +456,7 @@ abstract class RemoteJDBCInstrumentationTest extends VersionedNamingTestBase { resultSet.next() resultSet.getInt(1) == 3 def addDbmTag = dbmTraceInjected() - if (driver == SQLSERVER && addDbmTag){ + if (driver == SQLSERVER && addDbmTag) { assertTraces(1) { trace(3) { basicSpan(it, "parent") @@ -539,7 +539,7 @@ abstract class RemoteJDBCInstrumentationTest extends VersionedNamingTestBase { if (usingHikari) { "$Tags.DB_POOL_NAME" String } - if (this.dbmTracePreparedStatements(driver)){ + if (this.dbmTracePreparedStatements(driver)) { "$InstrumentationTags.DBM_TRACE_INJECTED" true if (driver == POSTGRESQL) { "$InstrumentationTags.INSTRUMENTATION_TIME_MS" Long @@ -593,7 +593,7 @@ abstract class RemoteJDBCInstrumentationTest extends VersionedNamingTestBase { resultSet.getInt(1) == 3 def addDbmTag = dbmTraceInjected() - if (driver == SQLSERVER && addDbmTag){ + if (driver == SQLSERVER && addDbmTag) { assertTraces(1) { trace(3) { basicSpan(it, "parent") @@ -678,7 +678,7 @@ abstract class RemoteJDBCInstrumentationTest extends VersionedNamingTestBase { if (pool == "hikari") { "$Tags.DB_POOL_NAME" String } - if (this.dbmTracePreparedStatements(driver)){ + if (this.dbmTracePreparedStatements(driver)) { "$InstrumentationTags.DBM_TRACE_INJECTED" true if (driver == POSTGRESQL) { "$InstrumentationTags.INSTRUMENTATION_TIME_MS" Long @@ -731,7 +731,7 @@ abstract class RemoteJDBCInstrumentationTest extends VersionedNamingTestBase { resultSet.next() resultSet.getInt(1) == 3 def addDbmTag = dbmTraceInjected() - if (driver == SQLSERVER && addDbmTag){ + if (driver == SQLSERVER && addDbmTag) { assertTraces(1) { trace(3) { basicSpan(it, "parent") @@ -811,7 +811,7 @@ abstract class RemoteJDBCInstrumentationTest extends VersionedNamingTestBase { if (pool == "hikari") { "$Tags.DB_POOL_NAME" String } - if (this.dbmTracePreparedStatements(driver)){ + if (this.dbmTracePreparedStatements(driver)) { "$InstrumentationTags.DBM_TRACE_INJECTED" true if (driver == POSTGRESQL) { "$InstrumentationTags.INSTRUMENTATION_TIME_MS" Long @@ -1065,7 +1065,7 @@ abstract class RemoteJDBCInstrumentationTest extends VersionedNamingTestBase { injectSysConfig("dd.dbm.propagation.mode", "full") CallableStatement proc = connection.prepareCall(query) - proc.setInt(1,1) + proc.setInt(1, 1) proc.registerOutParameter(1, Types.INTEGER) when: runUnderTrace("parent") { @@ -1218,7 +1218,7 @@ class RemoteDBMTraceInjectedForkedTest extends RemoteJDBCInstrumentationTest { } @Override - protected boolean dbmTracePreparedStatements(DbType dbType){ + protected boolean dbmTracePreparedStatements(DbType dbType) { return dbType == ORACLE } @@ -1317,7 +1317,7 @@ class RemoteDBMTraceInjectedForkedTestTracePreparedStatements extends RemoteJDBC } @Override - protected boolean dbmTracePreparedStatements(DbType dbType){ + protected boolean dbmTracePreparedStatements(DbType dbType) { return dbType == POSTGRESQL || dbType == ORACLE } } diff --git a/dd-java-agent/instrumentation/jdbc/src/test/java/test/DataDogRegistryImageNameSubstitutor.java b/dd-java-agent/instrumentation/jdbc/src/test/java/test/DataDogRegistryImageNameSubstitutor.java new file mode 100644 index 00000000000..8f7693f49d1 --- /dev/null +++ b/dd-java-agent/instrumentation/jdbc/src/test/java/test/DataDogRegistryImageNameSubstitutor.java @@ -0,0 +1,35 @@ +package test; + +import org.testcontainers.utility.DockerImageName; +import org.testcontainers.utility.ImageNameSubstitutor; + +/** + * A custom {@link ImageNameSubstitutor} implementation that rewrites Docker image names to use + * Datadog's internal registry {@code registry.ddbuild.io} when running in a CI environment. + * + *

    Images from DockerHub already mirrored by {@code registry.ddbuild.io} via environment variable + * {@code TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX} + * + *

    For images from other repositories custom image name substitutor should be implemented. + * Internal registry is faster and not affected by rate limiting. + */ +public class DataDogRegistryImageNameSubstitutor extends ImageNameSubstitutor { + @Override + public DockerImageName apply(DockerImageName original) { + String name = original.asCanonicalNameString(); + + if (System.getenv("CI") != null) { + // For now, we need to mirror Microsoft SQL Server images only. + name = + name.replace( + "mcr.microsoft.com/mssql/server:", "registry.ddbuild.io/images/mirror/sqlserver:"); + } + + return DockerImageName.parse(name); + } + + @Override + protected String getDescription() { + return "Image name substitutor to load images from registry.ddbuild.io"; + } +} diff --git a/dd-java-agent/instrumentation/jdbc/src/test/resources/testcontainers.properties b/dd-java-agent/instrumentation/jdbc/src/test/resources/testcontainers.properties new file mode 100644 index 00000000000..03fb660c6d1 --- /dev/null +++ b/dd-java-agent/instrumentation/jdbc/src/test/resources/testcontainers.properties @@ -0,0 +1 @@ +image.substitutor=test.DataDogRegistryImageNameSubstitutor From 46cbf67119419387ce6b979f08fbe10e439d2ca2 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Wed, 1 Jul 2026 15:14:09 -0400 Subject: [PATCH 115/139] Bump Gradle to 9.6.1 (#11787) Bump Gradle to 9.6.1 Co-authored-by: alexey.kuznetsov --- .gitlab-ci.yml | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- gradlew | 4 ++-- gradlew.bat | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6c018b1f99b..83ffc2f91a7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -49,7 +49,7 @@ variables: BUILD_JOB_NAME: "build" DEPENDENCY_CACHE_POLICY: pull BUILD_CACHE_POLICY: pull - GRADLE_VERSION: "9.6.0" # must match gradle-wrapper.properties + GRADLE_VERSION: "9.6.1" # must match gradle-wrapper.properties MASS_READ_URL: "https://mass-read.us1.ddbuild.io" MAVEN_REPOSITORY_PROXY: "https://depot-read-api-java.us1.ddbuild.io/magicmirror/magicmirror/@current/" GRADLE_PLUGIN_PROXY: "https://depot-read-api-java.us1.ddbuild.io/magicmirror/magicmirror/@current/" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 65d8749eabe..dbe66e1d665 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=bbaeb2fef8710818cf0e261201dab964c572f92b942812df0c3620d62a529a01 -distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.0-bin.zip +distributionSha256Sum=9c0f7faeeb306cb14e4279a3e084ca6b596894089a0638e68a07c945a32c9e14 +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/gradlew b/gradlew index b9bb139f790..249efbb032c 100755 --- a/gradlew +++ b/gradlew @@ -20,7 +20,7 @@ ############################################################################## # -# Gradle start up script for POSIX generated by Gradle. +# gradlew start up script for POSIX generated by Gradle. # # Important for running: # @@ -29,7 +29,7 @@ # bash, then to run this script, type that shell name before the whole # command line, like: # -# ksh Gradle +# ksh gradlew # # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: diff --git a/gradlew.bat b/gradlew.bat index aa5f10b069f..8508ef684d4 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -19,7 +19,7 @@ @if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem -@rem Gradle startup script for Windows +@rem gradlew startup script for Windows @rem @rem ########################################################################## @@ -72,7 +72,7 @@ echo location of your Java installation. 1>&2 -@rem Execute Gradle +@rem Execute gradlew @rem endlocal doesn't take effect until after the line is parsed and variables are expanded @rem which allows us to clear the local environment before executing the java command endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel From 9d8cd4e5959cc5e0ca929919d24e6ef0b0c72d1b Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Wed, 1 Jul 2026 16:45:03 -0400 Subject: [PATCH 116/139] Bump develocity plugin to 4.5.0 (#11830) Bump develocity plugin to 4.5.0 Co-authored-by: alexey.kuznetsov --- settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 0647382920a..53fe2bff423 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -29,7 +29,7 @@ pluginManagement { } plugins { - id("com.gradle.develocity") version "4.4.2" + id("com.gradle.develocity") version "4.5.0" id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0" } From 9775a5893284d19bc59a2d46fba8076ca1361960 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Bempel Date: Wed, 1 Jul 2026 22:48:07 +0200 Subject: [PATCH 117/139] Fix Kotlin Debug source mapping (#11803) Fix Kotlin Debug source mapping KotlinDebug stratum in SMAP is not always emitted if not present make one empty and avoid throwing exception fix unit tests Co-authored-by: devflow.devflow-routing-intake --- .../datadog/debugger/symbol/SourceRemapper.java | 2 +- .../debugger/symbol/SourceRemapperTest.java | 7 ++----- .../symbol/SymbolExtractionTransformerTest.java | 17 ++++++++++------- .../debugger/symboltest/SymbolExtraction16.kt | 9 ++++++++- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SourceRemapper.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SourceRemapper.java index 161b5517534..022956ba322 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SourceRemapper.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SourceRemapper.java @@ -22,7 +22,7 @@ static SourceRemapper getSourceRemapper(String sourceFile, SourceMap sourceMap) } StratumExt stratumDebug = sourceMap.getStratum("KotlinDebug"); if (stratumDebug == null) { - throw new IllegalArgumentException("No stratumDebug found for KotlinDebug"); + stratumDebug = new StratumExt("KotlinDebug"); } return new KotlinSourceRemapper(stratumMain, stratumDebug); default: diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/SourceRemapperTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/SourceRemapperTest.java index c050915f5ae..4ec263429bb 100644 --- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/SourceRemapperTest.java +++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/SourceRemapperTest.java @@ -38,10 +38,7 @@ public void noKotlinDebug() { StratumExt stratumMainMock = mock(StratumExt.class); when(sourceMapMock.getStratum(eq("Kotlin"))).thenReturn(stratumMainMock); when(sourceMapMock.getStratum(eq("KotlinDebug"))).thenReturn(null); - IllegalArgumentException illegalArgumentException = - assertThrows( - IllegalArgumentException.class, - () -> SourceRemapper.getSourceRemapper("foo.kt", sourceMapMock)); - assertEquals("No stratumDebug found for KotlinDebug", illegalArgumentException.getMessage()); + SourceRemapper sourceRemapper = SourceRemapper.getSourceRemapper("foo.kt", sourceMapMock); + assertNotNull(sourceRemapper); } } diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/SymbolExtractionTransformerTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/SymbolExtractionTransformerTest.java index 594b76e67d0..cef56569746 100644 --- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/SymbolExtractionTransformerTest.java +++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/symbol/SymbolExtractionTransformerTest.java @@ -995,13 +995,13 @@ public void symbolExtraction16() throws IOException, URISyntaxException { KotlinHelper.compileAndLoad(CLASS_NAME, resource.getFile(), filesToDelete); Object companion = Reflect.onClass(testClass).get("Companion"); int result = Reflect.on(companion).call("main", "").get(); - assertEquals(48, result); + assertEquals(73, result); } finally { filesToDelete.forEach(File::delete); } - assertEquals(2, symbolSinkMock.jarScopes.size()); + assertEquals(4, symbolSinkMock.jarScopes.size()); Scope classScope = symbolSinkMock.jarScopes.get(0).getScopes().get(0); - assertScope(classScope, ScopeType.CLASS, CLASS_NAME, 6, 23, SOURCE_FILE, 5, 1); + assertScope(classScope, ScopeType.CLASS, CLASS_NAME, 6, 28, SOURCE_FILE, 6, 1); assertLangSpecifics( classScope.getLanguageSpecifics(), asList("public", "final"), @@ -1026,12 +1026,15 @@ public void symbolExtraction16() throws IOException, URISyntaxException { Scope f3MethodScope = classScope.getScopes().get(3); assertScope(f3MethodScope, ScopeType.METHOD, "f3", 21, 23, SOURCE_FILE, 1, 1); assertLineRanges(f3MethodScope, "21-23"); + Scope f4MethodScope = classScope.getScopes().get(4); + assertScope(f4MethodScope, ScopeType.METHOD, "f4", 27, 28, SOURCE_FILE, 1, 1); + assertLineRanges(f4MethodScope, "27-28"); assertScope( - classScope.getScopes().get(4), ScopeType.METHOD, "", 0, 0, SOURCE_FILE, 0, 0); + classScope.getScopes().get(5), ScopeType.METHOD, "", 0, 0, SOURCE_FILE, 0, 0); Scope companionClassScope = symbolSinkMock.jarScopes.get(1).getScopes().get(0); assertScope( - companionClassScope, ScopeType.CLASS, CLASS_NAME + "$Companion", 28, 29, SOURCE_FILE, 3, 0); + companionClassScope, ScopeType.CLASS, CLASS_NAME + "$Companion", 33, 34, SOURCE_FILE, 3, 0); assertLangSpecifics( classScope.getLanguageSpecifics(), asList("public", "final"), @@ -1049,8 +1052,8 @@ public void symbolExtraction16() throws IOException, URISyntaxException { 0, 0); Scope mainMethodScope = companionClassScope.getScopes().get(1); - assertScope(mainMethodScope, ScopeType.METHOD, "main", 28, 29, SOURCE_FILE, 1, 1); - assertLineRanges(mainMethodScope, "28-29"); + assertScope(mainMethodScope, ScopeType.METHOD, "main", 33, 34, SOURCE_FILE, 1, 1); + assertLineRanges(mainMethodScope, "33-34"); } @Test diff --git a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/symboltest/SymbolExtraction16.kt b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/symboltest/SymbolExtraction16.kt index b3f73b84773..e13757d0814 100644 --- a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/symboltest/SymbolExtraction16.kt +++ b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/symboltest/SymbolExtraction16.kt @@ -23,10 +23,17 @@ class SymbolExtraction16 { return value } + fun f4(value: Int): Int { + val set = setOf(Person("john", "doe"), Person("agent", "smith")) + return set.groupingBy { it.firstName }.eachCount().toMutableMap().size + } + companion object { fun main(arg: String): Int { val c = SymbolExtraction16() - return c.f1(31) + c.f2(17) + return c.f1(31) + c.f2(17) + c.f3(23) + c.f4(0) } } } + +data class Person(val firstName: String, val lastName: String) From 2c5c7cc28cc8c954fc70309d947f6d69fc2689ee Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Wed, 1 Jul 2026 17:15:07 -0400 Subject: [PATCH 118/139] Disallow manual triggers of `populate_dep_cache` (#11829) Scope dependency caches to protected refs Revert "Scope dependency caches to protected refs" This reverts commit 14eca47871a53d7aadac1f54ed63b3b653ee55de. Dont allow manual triggers for populate_dep_cache Merge branch 'master' into sarahchen6/protect-caches Co-authored-by: sarah.chen --- .gitlab-ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 83ffc2f91a7..4629e4bfd74 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -388,8 +388,6 @@ populate_dep_cache: rules: - if: '$POPULATE_CACHE' when: on_success - - when: manual - allow_failure: true parallel: matrix: - GRADLE_TARGET: ":dd-java-agent:shadowJar :dd-trace-api:jar :dd-trace-ot:shadowJar" From 3d19e7d25a2deabb9569bf1985a3fc0c8d82e2a9 Mon Sep 17 00:00:00 2001 From: Yury Gribkov Date: Wed, 1 Jul 2026 14:41:23 -0700 Subject: [PATCH 119/139] fix(lettuce5+): decorate Redis command spans with a resolved node connection for master-replica connection providers (#11819) test(lettuce5): reproduce the missing hostname on the lettuce5 static master/replica command span fix(lettuce5): decorate Redis command spans with resolved node connection for master-replica connetion providers Lettuce master/replica APIs expose a routing connection, while the concrete node connection is selected only when the command is dispatched. The existing command advice only sees the wrapper connection, so static master/replica routing can leave peer.hostname unset. Instrument the legacy MasterSlaveConnectionProvider#getConnection path and the newer MasterReplicaConnectionProvider#getConnection* paths. When a Redis command span is active, decorate it with the RedisURI from the resolved StatefulRedisConnection. Use reflective Lettuce master-replica API lookup Prefer the newer MasterReplica facade in the Lettuce master/replica test and fall back to the legacy MasterSlave facade when needed. Add pinned Lettuce 5.1, 6.0, 6.1, and 6.2 test suites to exercise master/replica command span connection tagging across the version range. Add missing instrumentationfor missed lettuce connection providers Fix Lettuce master/replica connection provider matching Collapse version-specific `getConnection*` matchers to public method shape matching and keep coverage for Lettuce 5.0 through latest master/replica command span connection tagging. Clean up Lettuce5MasterReplicaTest.connectMasterReplica Merge branch 'master' into ygree/fix-lettuce5-masterreplica-instrumentation Co-authored-by: yury.gribkov --- .../lettuce/lettuce-5.0/build.gradle | 8 ++ .../MasterReplicaConnectionHelper.java | 38 ++++++ ...licaConnectionProviderInstrumentation.java | 113 ++++++++++++++++ .../test/java/Lettuce5MasterReplicaTest.java | 123 ++++++++++++++++++ 4 files changed, 282 insertions(+) create mode 100644 dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/MasterReplicaConnectionHelper.java create mode 100644 dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/MasterReplicaConnectionProviderInstrumentation.java create mode 100644 dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/test/java/Lettuce5MasterReplicaTest.java diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/build.gradle b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/build.gradle index becb0a29ad7..9f5a2579038 100644 --- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/build.gradle +++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/build.gradle @@ -12,6 +12,10 @@ apply from: "$rootDir/gradle/java.gradle" addTestSuiteForDir('latestDepTest', 'test') addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test') +addTestSuiteForDir('lettuce51Test', 'test') +addTestSuiteForDir('lettuce60Test', 'test') +addTestSuiteForDir('lettuce61Test', 'test') +addTestSuiteForDir('lettuce62Test', 'test') dependencies { compileOnly group: 'io.lettuce', name: 'lettuce-core', version: '5.0.0.RELEASE' @@ -24,6 +28,10 @@ dependencies { latestDepTestImplementation group: 'io.lettuce', name: 'lettuce-core', version: '+' + lettuce51TestImplementation group: 'io.lettuce', name: 'lettuce-core', version: '5.1.0.RELEASE' + lettuce60TestImplementation group: 'io.lettuce', name: 'lettuce-core', version: '6.0.0.RELEASE' + lettuce61TestImplementation group: 'io.lettuce', name: 'lettuce-core', version: '6.1.0.RELEASE' + lettuce62TestImplementation group: 'io.lettuce', name: 'lettuce-core', version: '6.2.0.RELEASE' tasks.withType(Test).configureEach { usesService(testcontainersLimit) diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/MasterReplicaConnectionHelper.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/MasterReplicaConnectionHelper.java new file mode 100644 index 00000000000..39261f49eb1 --- /dev/null +++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/MasterReplicaConnectionHelper.java @@ -0,0 +1,38 @@ +package datadog.trace.instrumentation.lettuce5; + +import static datadog.trace.instrumentation.lettuce5.LettuceClientDecorator.DECORATE; + +import datadog.trace.bootstrap.ContextStore; +import datadog.trace.bootstrap.instrumentation.api.AgentSpan; +import datadog.trace.bootstrap.instrumentation.api.Tags; +import io.lettuce.core.RedisURI; +import io.lettuce.core.api.StatefulConnection; +import java.util.function.BiConsumer; + +public final class MasterReplicaConnectionHelper { + + private MasterReplicaConnectionHelper() {} + + public static boolean isRedisClientSpan(final AgentSpan span) { + return span != null && LettuceClientDecorator.REDIS_CLIENT.equals(span.getTag(Tags.COMPONENT)); + } + + public static void onConnection( + final AgentSpan span, + final StatefulConnection connection, + final ContextStore contextStore) { + if (connection == null) { + return; + } + + final RedisURI redisURI = contextStore.get(connection); + if (redisURI != null) { + DECORATE.onConnection(span, redisURI); + } + } + + public static BiConsumer onConnectionComplete( + final AgentSpan span, final ContextStore contextStore) { + return (connection, _throwable) -> onConnection(span, connection, contextStore); + } +} diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/MasterReplicaConnectionProviderInstrumentation.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/MasterReplicaConnectionProviderInstrumentation.java new file mode 100644 index 00000000000..e0f93f7bc20 --- /dev/null +++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/MasterReplicaConnectionProviderInstrumentation.java @@ -0,0 +1,113 @@ +package datadog.trace.instrumentation.lettuce5; + +import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; +import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan; +import static net.bytebuddy.matcher.ElementMatchers.isMethod; +import static net.bytebuddy.matcher.ElementMatchers.isPublic; +import static net.bytebuddy.matcher.ElementMatchers.returns; +import static net.bytebuddy.matcher.ElementMatchers.takesArguments; + +import com.google.auto.service.AutoService; +import datadog.trace.agent.tooling.Instrumenter; +import datadog.trace.agent.tooling.InstrumenterModule; +import datadog.trace.bootstrap.InstrumentationContext; +import datadog.trace.bootstrap.instrumentation.api.AgentSpan; +import io.lettuce.core.RedisURI; +import io.lettuce.core.api.StatefulConnection; +import io.lettuce.core.api.StatefulRedisConnection; +import java.util.Collections; +import java.util.Map; +import java.util.concurrent.CompletableFuture; +import net.bytebuddy.asm.Advice; + +/** + * Master/replica APIs expose a routing connection ({@code + * StatefulRedisMasterReplicaConnectionImpl}; legacy {@code MasterSlave} wraps it in {@code + * MasterSlaveConnectionWrapper}). The real node connection is selected only after a command span + * has started and the command is dispatched, so this decorates the active span with the RedisURI + * that is available on the real connection, not the wrapper. + */ +@AutoService(InstrumenterModule.class) +public class MasterReplicaConnectionProviderInstrumentation extends InstrumenterModule.Tracing + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { + + public MasterReplicaConnectionProviderInstrumentation() { + super("lettuce", "lettuce-5"); + } + + @Override + public String[] knownMatchingTypes() { + return new String[] { + // Legacy Lettuce 5.x + "io.lettuce.core.masterslave.MasterSlaveConnectionProvider", + // Transitional Lettuce 6.0 provider + "io.lettuce.core.masterreplica.UpstreamReplicaConnectionProvider", + // Lettuce 6.1+ + "io.lettuce.core.masterreplica.MasterReplicaConnectionProvider" + }; + } + + @Override + public Map contextStore() { + return Collections.singletonMap( + "io.lettuce.core.api.StatefulConnection", "io.lettuce.core.RedisURI"); + } + + @Override + public String[] helperClassNames() { + return new String[] { + packageName + ".LettuceClientDecorator", + packageName + ".MasterReplicaConnectionHelper", + packageName + ".LettuceInstrumentationUtil" + }; + } + + @Override + public void methodAdvice(MethodTransformer transformer) { + // Intent argument types move across Lettuce versions, but only the returned connection is used. + transformer.applyAdvice( + isMethod() + .and(isPublic()) + .and(named("getConnection")) + .and(takesArguments(1)) + .and(returns(named("io.lettuce.core.api.StatefulRedisConnection"))), + MasterReplicaConnectionProviderInstrumentation.class.getName() + "$SyncAdvice"); + transformer.applyAdvice( + isMethod() + .and(isPublic()) + .and(named("getConnectionAsync")) + .and(takesArguments(1)) + .and(returns(named("java.util.concurrent.CompletableFuture"))), + MasterReplicaConnectionProviderInstrumentation.class.getName() + "$AsyncAdvice"); + } + + public static class SyncAdvice { + + @Advice.OnMethodExit(suppress = Throwable.class) + public static void onExit(@Advice.Return final StatefulRedisConnection connection) { + final AgentSpan span = activeSpan(); + if (!MasterReplicaConnectionHelper.isRedisClientSpan(span)) { + return; + } + + MasterReplicaConnectionHelper.onConnection( + span, connection, InstrumentationContext.get(StatefulConnection.class, RedisURI.class)); + } + } + + public static class AsyncAdvice { + + @Advice.OnMethodExit(suppress = Throwable.class) + public static void onExit( + @Advice.Return final CompletableFuture connectionFuture) { + final AgentSpan span = activeSpan(); + if (!MasterReplicaConnectionHelper.isRedisClientSpan(span) || connectionFuture == null) { + return; + } + + connectionFuture.whenComplete( + MasterReplicaConnectionHelper.onConnectionComplete( + span, InstrumentationContext.get(StatefulConnection.class, RedisURI.class))); + } + } +} diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/test/java/Lettuce5MasterReplicaTest.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/test/java/Lettuce5MasterReplicaTest.java new file mode 100644 index 00000000000..40d8564e34c --- /dev/null +++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/test/java/Lettuce5MasterReplicaTest.java @@ -0,0 +1,123 @@ +import static java.util.Collections.singletonList; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +import com.redis.testcontainers.RedisContainer; +import datadog.trace.agent.test.AbstractInstrumentationTest; +import datadog.trace.bootstrap.instrumentation.api.Tags; +import datadog.trace.core.DDSpan; +import io.lettuce.core.ClientOptions; +import io.lettuce.core.RedisClient; +import io.lettuce.core.RedisURI; +import io.lettuce.core.api.StatefulRedisConnection; +import io.lettuce.core.codec.RedisCodec; +import io.lettuce.core.codec.StringCodec; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.TimeUnit; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.testcontainers.containers.wait.strategy.Wait; +import org.testcontainers.utility.DockerImageName; + +class Lettuce5MasterReplicaTest extends AbstractInstrumentationTest { + private RedisContainer redisServer; + private RedisClient redisClient; + private StatefulRedisConnection connection; + private String host; + private int port; + + @BeforeEach + void setUpRedis() throws Exception { + redisServer = + new RedisContainer(DockerImageName.parse("redis:6.2.6")) + .waitingFor(Wait.forListeningPort()); + redisServer.start(); + + host = redisServer.getHost(); + port = redisServer.getFirstMappedPort(); + + RedisURI redisURI = RedisURI.Builder.redis(host, port).withDatabase(0).build(); + redisClient = RedisClient.create(); + redisClient.setOptions(ClientOptions.builder().autoReconnect(false).build()); + connection = connectMasterReplica(redisClient, redisURI); + connection.sync().ping(); + + writer.waitForTraces(2); + tracer.flush(); + writer.clear(); + } + + @AfterEach + void cleanUpRedis() { + if (connection != null) { + connection.close(); + } + + if (redisClient != null) { + redisClient.shutdown(5, 10, TimeUnit.SECONDS); + } + + if (redisServer != null) { + redisServer.stop(); + } + } + + @Test + void staticMasterReplicaCommandSpanHasPeerHostname() throws Exception { + String result = connection.sync().set("TESTSETKEY", "TESTSETVAL"); + + assertEquals("OK", result); + writer.waitForTraces(1); + + List setSpans = new ArrayList<>(); + for (List trace : writer) { + for (DDSpan span : trace) { + if ("SET".contentEquals(span.getResourceName()) + && "redis-client".equals(String.valueOf(span.getTag(Tags.COMPONENT)))) { + setSpans.add(span); + } + } + } + + assertEquals(1, setSpans.size(), "expected exactly one SET command span"); + DDSpan span = setSpans.get(0); + assertEquals("SET", String.valueOf(span.getResourceName())); + assertEquals("redis-client", String.valueOf(span.getTag(Tags.COMPONENT))); + assertEquals("redis", span.getTag(Tags.DB_TYPE)); + assertNotNull(span.getTag(Tags.PEER_HOSTNAME), "command span should include peer.hostname"); + assertEquals(host, span.getTag(Tags.PEER_HOSTNAME)); + } + + @SuppressWarnings("unchecked") + private static StatefulRedisConnection connectMasterReplica( + RedisClient redisClient, RedisURI redisURI) throws Exception { + // Prefer the newer MasterReplica facade when this source is compiled for latestDepTest, but + // resolve both APIs reflectively so the same test still compiles with the Lettuce 5.0 baseline + // and can keep compiling if the deprecated MasterSlave facade disappears later. + Class facade; + try { + facade = Class.forName("io.lettuce.core.masterreplica.MasterReplica"); + } catch (ClassNotFoundException ignored) { + facade = Class.forName("io.lettuce.core.masterslave.MasterSlave"); + } + Method connect = + facade.getMethod("connect", RedisClient.class, RedisCodec.class, Iterable.class); + try { + return (StatefulRedisConnection) + connect.invoke(null, redisClient, StringCodec.UTF8, singletonList(redisURI)); + } catch (InvocationTargetException e) { + Throwable cause = e.getCause(); + if (cause instanceof Exception) { + throw (Exception) cause; + } + if (cause instanceof Error) { + throw (Error) cause; + } + throw e; + } + } +} From 94bcb7eba7c0a2b83bccd60c7d7ee14bc99421ff Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Wed, 1 Jul 2026 20:26:20 -0400 Subject: [PATCH 120/139] Run arm64 tests on merge queue and master (#11832) Run arm64 tests on merge queue and master Co-Authored-By: Claude Opus 4.8 (1M context) Accept review notes. Co-authored-by: Sarah Chen Fixed typo. Co-authored-by: alexey.kuznetsov --- .gitlab-ci.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4629e4bfd74..87bcec4c412 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -751,11 +751,14 @@ muzzle-dep-report: GIT_SUBMODULE_STRATEGY: normal GIT_SUBMODULE_DEPTH: 1 rules: - - if: $testJvm =~ $DEFAULT_TEST_JVMS - when: manual - allow_failure: true - # Note: `ibm8` and `oracle8` omitted — no arm64 images published upstream. - - if: '$NON_DEFAULT_JVMS == "true" && $testJvm != "ibm8" && $testJvm != "oracle8"' + # `ibm8`/`oracle8` have no arm64 images published upstream — never run them on arm64. + - if: '$testJvm == "ibm8" || $testJvm == "oracle8"' + when: never + - if: '$CI_COMMIT_BRANCH =~ /^mq-working-branch-/' + when: on_success + - if: '$CI_COMMIT_BRANCH == "master"' + when: on_success + - if: '$testJvm =~ $DEFAULT_TEST_JVMS' when: manual allow_failure: true cache: From 4f5c4cc2bde4b5fa95d2dddccaec1fd15b321985 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Thu, 2 Jul 2026 01:34:41 -0400 Subject: [PATCH 121/139] Relax arm64 CI jobs and align coverage with amd64 (#11835) Relax arm64 CI jobs and align coverage with amd64 Make arm64 tests non-blocking on merge queue and master while collecting stability stats, and fix -PcheckCoverage setup to mirror the amd64 jobs. Co-Authored-By: Claude Opus 4.8 (1M context) Enable non-default JVMs on demand. Co-Authored-By: Claude Opus 4.8 (1M context) Co-authored-by: devflow.devflow-routing-intake --- .gitlab-ci.yml | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 87bcec4c412..c089ef9fab2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -754,10 +754,23 @@ muzzle-dep-report: # `ibm8`/`oracle8` have no arm64 images published upstream — never run them on arm64. - if: '$testJvm == "ibm8" || $testJvm == "oracle8"' when: never + # arm64 tests are newly introduced to the merge queue and master. Keep them + # non-blocking (allow_failure) for now so we can collect stability stats and + # fix flaky/failing jobs without blocking the whole team. Remove allow_failure + # once the arm64 suite is proven stable. - if: '$CI_COMMIT_BRANCH =~ /^mq-working-branch-/' when: on_success + allow_failure: true - if: '$CI_COMMIT_BRANCH == "master"' when: on_success + allow_failure: true + # Enable non-default JVMs on demand. + - if: '$NON_DEFAULT_JVMS == "true"' + when: on_success + allow_failure: true + - if: '$CI_COMMIT_MESSAGE =~ /\[ci: NON_DEFAULT_JVMS\]/' + when: on_success + allow_failure: true - if: '$testJvm =~ $DEFAULT_TEST_JVMS' when: manual allow_failure: true @@ -924,6 +937,10 @@ test_base_arm64: CACHE_TYPE: "base" parallel: matrix: *test_matrix_4 + # run coverage only on JVM 8, mirroring the amd64 test_base job + script: + - if [ "$testJvm" == "8" ]; then export GRADLE_PARAMS="$GRADLE_PARAMS -PcheckCoverage"; fi + - !reference [.test_job_arm64, script] test_inst: extends: .test_job_with_test_agent @@ -1057,10 +1074,14 @@ test_debugger_arm64: extends: .test_job_arm64 variables: GRADLE_TARGET: ":debuggerTest" - GRADLE_PARAMS: "-PcheckCoverage" CACHE_TYPE: "base" parallel: matrix: *test_matrix + # avoid running coverage for semeru8, semeru11 and semeru17 as some tests are disabled and therefore cannot reach the + # expected coverage (ibm8/oracle8 never run on arm64) + script: + - if [[ "$testJvm" != "semeru8" && "$testJvm" != "semeru11" && "$testJvm" != "semeru17" ]]; then export GRADLE_PARAMS="$GRADLE_PARAMS -PcheckCoverage"; fi + - !reference [.test_job_arm64, script] test_smoke: extends: .test_job From 6a2f484811aefb5dca4dc1b4fb72a56a8628d4c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Vandon?= Date: Thu, 2 Jul 2026 11:31:25 +0100 Subject: [PATCH 122/139] fix for armeria 1.40 (#11827) fix for armeria 1.40 change of plans, we need a different advice for the new signature remove irrelevant comment Co-authored-by: devflow.devflow-routing-intake --- .../armeria/armeria-grpc-0.84/gradle.lockfile | 70 +++++++++---------- .../client/ClientCallImplInstrumentation.java | 49 ++++++++++++- 2 files changed, 82 insertions(+), 37 deletions(-) diff --git a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/gradle.lockfile b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/gradle.lockfile index 9e411ef2bbf..5ef684e2be1 100644 --- a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/gradle.lockfile +++ b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/gradle.lockfile @@ -16,17 +16,17 @@ com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compil com.datadoghq:java-dogstatsd-client:4.4.5=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.11.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-annotations:2.21=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.22=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.9.8=compileClasspath,compileProtoPath com.fasterxml.jackson.core:jackson-core:2.11.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.21.3=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.22.0=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath com.fasterxml.jackson.core:jackson-core:2.9.8=compileClasspath,compileProtoPath com.fasterxml.jackson.core:jackson-databind:2.11.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-databind:2.21.3=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.22.0=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath com.fasterxml.jackson.core:jackson-databind:2.9.8=compileClasspath,compileProtoPath -com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.21.3=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath -com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.21.3=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath -com.fasterxml.jackson:jackson-bom:2.21.3=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.22.0=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.22.0=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.22.0=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc com.github.jnr:jffi:1.3.15=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath com.github.jnr:jnr-a64asm:1.0.0=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath @@ -74,15 +74,15 @@ com.google.re2j:re2j:1.2=compileClasspath,compileProtoPath com.google.re2j:re2j:1.8=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath com.linecorp.armeria:armeria-grpc-protocol:0.84.0=compileClasspath,compileProtoPath com.linecorp.armeria:armeria-grpc-protocol:1.0.0=testCompileProtoPath,testRuntimeClasspath -com.linecorp.armeria:armeria-grpc-protocol:1.39.1=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +com.linecorp.armeria:armeria-grpc-protocol:1.40.0=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath com.linecorp.armeria:armeria-grpc:0.84.0=compileClasspath,compileProtoPath com.linecorp.armeria:armeria-grpc:1.0.0=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.linecorp.armeria:armeria-grpc:1.39.1=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +com.linecorp.armeria:armeria-grpc:1.40.0=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath com.linecorp.armeria:armeria-junit4:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.linecorp.armeria:armeria-protobuf:1.39.1=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +com.linecorp.armeria:armeria-protobuf:1.40.0=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath com.linecorp.armeria:armeria:0.84.0=compileClasspath,compileProtoPath com.linecorp.armeria:armeria:1.0.0=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.linecorp.armeria:armeria:1.39.1=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +com.linecorp.armeria:armeria:1.40.0=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath @@ -116,64 +116,64 @@ io.grpc:grpc-util:1.81.0=latestDepForkedTestCompileProtoPath,latestDepForkedTest io.grpc:protoc-gen-grpc-java:1.42.2=protobufToolsLocator_grpc io.leangen.geantyref:geantyref:1.3.16=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath io.micrometer:context-propagation:1.2.1=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath -io.micrometer:micrometer-commons:1.16.5=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.micrometer:micrometer-commons:1.17.0=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.micrometer:micrometer-core:1.1.4=compileClasspath,compileProtoPath -io.micrometer:micrometer-core:1.16.5=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.micrometer:micrometer-core:1.17.0=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.micrometer:micrometer-core:1.5.4=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.micrometer:micrometer-observation:1.16.5=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.micrometer:micrometer-observation:1.17.0=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.netty:netty-buffer:4.1.34.Final=compileClasspath,compileProtoPath io.netty:netty-buffer:4.1.51.Final=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.netty:netty-buffer:4.2.13.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath -io.netty:netty-codec-base:4.2.13.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath -io.netty:netty-codec-compression:4.2.13.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-buffer:4.2.15.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-codec-base:4.2.15.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-codec-compression:4.2.15.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.netty:netty-codec-dns:4.1.34.Final=compileClasspath,compileProtoPath io.netty:netty-codec-dns:4.1.51.Final=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.netty:netty-codec-dns:4.2.13.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-codec-dns:4.2.15.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.netty:netty-codec-haproxy:4.1.34.Final=compileClasspath,compileProtoPath io.netty:netty-codec-haproxy:4.1.51.Final=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.netty:netty-codec-haproxy:4.2.13.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-codec-haproxy:4.2.15.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.netty:netty-codec-http2:4.1.34.Final=compileClasspath,compileProtoPath io.netty:netty-codec-http2:4.1.51.Final=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.netty:netty-codec-http2:4.2.13.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-codec-http2:4.2.15.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.netty:netty-codec-http:4.1.34.Final=compileClasspath,compileProtoPath io.netty:netty-codec-http:4.1.51.Final=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.netty:netty-codec-http:4.2.13.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-codec-http:4.2.15.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.netty:netty-codec-socks:4.1.51.Final=testCompileProtoPath,testRuntimeClasspath -io.netty:netty-codec-socks:4.2.13.Final=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-codec-socks:4.2.15.Final=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.netty:netty-codec:4.1.34.Final=compileClasspath,compileProtoPath io.netty:netty-codec:4.1.51.Final=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath io.netty:netty-common:4.1.34.Final=compileClasspath,compileProtoPath io.netty:netty-common:4.1.51.Final=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.netty:netty-common:4.2.13.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-common:4.2.15.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.netty:netty-handler-proxy:4.1.51.Final=testCompileProtoPath,testRuntimeClasspath -io.netty:netty-handler-proxy:4.2.13.Final=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-handler-proxy:4.2.15.Final=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.netty:netty-handler:4.1.34.Final=compileClasspath,compileProtoPath io.netty:netty-handler:4.1.51.Final=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.netty:netty-handler:4.2.13.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath -io.netty:netty-resolver-dns-classes-macos:4.2.13.Final=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath -io.netty:netty-resolver-dns-native-macos:4.2.13.Final=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-handler:4.2.15.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-resolver-dns-classes-macos:4.2.15.Final=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-resolver-dns-native-macos:4.2.15.Final=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.netty:netty-resolver-dns:4.1.34.Final=compileClasspath,compileProtoPath io.netty:netty-resolver-dns:4.1.51.Final=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.netty:netty-resolver-dns:4.2.13.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-resolver-dns:4.2.15.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.netty:netty-resolver:4.1.34.Final=compileClasspath,compileProtoPath io.netty:netty-resolver:4.1.51.Final=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.netty:netty-resolver:4.2.13.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-resolver:4.2.15.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.netty:netty-tcnative-boringssl-static:2.0.23.Final=compileClasspath,compileProtoPath io.netty:netty-tcnative-boringssl-static:2.0.31.Final=testCompileProtoPath,testRuntimeClasspath io.netty:netty-tcnative-boringssl-static:2.0.77.Final=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.netty:netty-tcnative-classes:2.0.77.Final=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath -io.netty:netty-transport-classes-epoll:4.2.13.Final=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath -io.netty:netty-transport-classes-kqueue:4.2.13.Final=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-transport-classes-epoll:4.2.15.Final=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-transport-classes-kqueue:4.2.15.Final=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.netty:netty-transport-native-epoll:4.1.34.Final=compileClasspath,compileProtoPath io.netty:netty-transport-native-epoll:4.1.51.Final=testCompileProtoPath,testRuntimeClasspath -io.netty:netty-transport-native-epoll:4.2.13.Final=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath -io.netty:netty-transport-native-kqueue:4.2.13.Final=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-transport-native-epoll:4.2.15.Final=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-transport-native-kqueue:4.2.15.Final=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.netty:netty-transport-native-unix-common:4.1.34.Final=compileClasspath,compileProtoPath io.netty:netty-transport-native-unix-common:4.1.51.Final=testCompileProtoPath,testRuntimeClasspath -io.netty:netty-transport-native-unix-common:4.2.13.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.2.15.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.netty:netty-transport:4.1.34.Final=compileClasspath,compileProtoPath io.netty:netty-transport:4.1.51.Final=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.netty:netty-transport:4.2.13.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-transport:4.2.15.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.opencensus:opencensus-api:0.19.2=compileClasspath,compileProtoPath io.opencensus:opencensus-contrib-grpc-metrics:0.19.2=compileClasspath,compileProtoPath io.perfmark:perfmark-api:0.19.0=testCompileProtoPath,testRuntimeClasspath @@ -237,7 +237,7 @@ org.junit.platform:junit-platform-suite-api:1.14.1=latestDepForkedTestCompilePro org.junit.platform:junit-platform-suite-commons:1.14.1=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath org.junit:junit-bom:5.14.0=compileProtoPath,spotbugs org.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.latencyutils:LatencyUtils:2.0.3=compileClasspath,compileProtoPath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath +org.latencyutils:LatencyUtils:2.0.3=compileClasspath,compileProtoPath,testCompileProtoPath,testRuntimeClasspath org.mockito:mockito-core:4.4.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ClientCallImplInstrumentation.java b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ClientCallImplInstrumentation.java index 7833daeb1c0..c5548f707c2 100644 --- a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ClientCallImplInstrumentation.java +++ b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ClientCallImplInstrumentation.java @@ -27,6 +27,7 @@ import io.grpc.MethodDescriptor; import io.grpc.Status; import io.grpc.StatusException; +import io.grpc.StatusRuntimeException; import java.util.Arrays; import net.bytebuddy.asm.Advice; @@ -60,8 +61,16 @@ public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( named("sendMessage").and(isMethod()), getClass().getName() + "$SendMessage"); transformer.applyAdvice( + // matches the method signature for versions until 1.40 excluded named("close").and(isMethod().and(takesArguments(2))), getClass().getName() + "$CloseObserver"); + transformer.applyAdvice( + // matches the signature after v1.40 + named("close") + .and(isMethod()) + .and(takesArguments(3)) + .and(takesArgument(2, named("java.lang.Throwable"))), + getClass().getName() + "$CloseObserverWithCause"); if (InstrumenterConfig.get() .isIntegrationEnabled(Arrays.asList("armeria-grpc-message", "grpc-message"), false)) { transformer.applyAdvice( @@ -176,7 +185,9 @@ public static void before( @Advice.This ClientCall call, @Advice.Argument(1) Throwable cause) { AgentSpan span = InstrumentationContext.get(ClientCall.class, AgentSpan.class).remove(call); if (null != span) { - if (cause instanceof StatusException) { + if (cause instanceof StatusRuntimeException) { + DECORATE.onClose(span, ((StatusRuntimeException) cause).getStatus()); + } else if (cause instanceof StatusException) { DECORATE.onClose(span, ((StatusException) cause).getStatus()); } span.finish(); @@ -187,7 +198,6 @@ public static void before( public static final class CloseObserver { @Advice.OnMethodEnter public static AgentScope before(@Advice.This ClientCall call) { - // could create a message span here for the request AgentSpan span = InstrumentationContext.get(ClientCall.class, AgentSpan.class).remove(call); if (span != null) { return activateSpan(span); @@ -206,6 +216,41 @@ public static void closeObserver( } } + /** + * After armeria 1.40 and this PR, it is + * possible that the first call to close would not be the real close. We need to rely on the + * internal boolean `closed` to know if we are dealing with the real closing. + */ + public static final class CloseObserverWithCause { + @Advice.OnMethodEnter + public static AgentScope before(@Advice.This ClientCall call) { + AgentSpan span = InstrumentationContext.get(ClientCall.class, AgentSpan.class).get(call); + if (span != null) { + return activateSpan(span); + } + return null; + } + + @Advice.OnMethodExit(onThrowable = Throwable.class) + public static void closeObserver( + @Advice.This ClientCall call, + @Advice.Enter AgentScope scope, + @Advice.Argument(0) Status status, + @Advice.FieldValue("closed") boolean closed) { + if (null != scope) { + if (closed) { + AgentSpan span = + InstrumentationContext.get(ClientCall.class, AgentSpan.class).remove(call); + if (span != null) { + DECORATE.onClose(span, status); + span.finish(); + } + } + scope.close(); + } + } + } + public static final class ReceiveMessages { @Advice.OnMethodEnter public static AgentScope before() { From d3398eaf5d1597cbc7e2105f77edfceb6511fed5 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Thu, 2 Jul 2026 08:50:26 -0400 Subject: [PATCH 123/139] Remove unused SpotBugs suppressions from dd-smoke-tests (#11831) Remove unused SpotBugs suppressions from dd-smoke-tests Co-Authored-By: Claude Opus 4.8 (1M context) Co-authored-by: alexey.kuznetsov --- .../application/build.gradle | 1 - .../apmtracingdisabled/Controller.java | 2 -- .../controller/IastWebController.java | 3 --- .../springboot/controller/XssController.java | 21 ------------------- .../profiling/ProfilingTestApplication.java | 3 --- 5 files changed, 30 deletions(-) diff --git a/dd-smoke-tests/apm-tracing-disabled/application/build.gradle b/dd-smoke-tests/apm-tracing-disabled/application/build.gradle index b5653805e95..cac44f5c2dd 100644 --- a/dd-smoke-tests/apm-tracing-disabled/application/build.gradle +++ b/dd-smoke-tests/apm-tracing-disabled/application/build.gradle @@ -34,7 +34,6 @@ if (hasProperty('apiJar')) { } dependencies { - compileOnly 'com.github.spotbugs:spotbugs-annotations:4.9.8' implementation 'org.springframework.boot:spring-boot-starter-web' // OpenTracing 0.32.0 is the last release and is intentionally pinned: this smoke test // exercises the legacy OpenTracing bridge in dd-trace-ot. Do not "upgrade" — there is diff --git a/dd-smoke-tests/apm-tracing-disabled/application/src/main/java/datadog/smoketest/apmtracingdisabled/Controller.java b/dd-smoke-tests/apm-tracing-disabled/application/src/main/java/datadog/smoketest/apmtracingdisabled/Controller.java index 3bb55197614..8fdda3fd75e 100644 --- a/dd-smoke-tests/apm-tracing-disabled/application/src/main/java/datadog/smoketest/apmtracingdisabled/Controller.java +++ b/dd-smoke-tests/apm-tracing-disabled/application/src/main/java/datadog/smoketest/apmtracingdisabled/Controller.java @@ -1,6 +1,5 @@ package datadog.smoketest.apmtracingdisabled; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.opentracing.Span; import io.opentracing.util.GlobalTracer; import java.io.IOException; @@ -51,7 +50,6 @@ public String pathParam( } @GetMapping("/iast") - @SuppressFBWarnings public void write( @RequestParam(name = "injection", required = false) String injection, @RequestParam(name = "url", required = false) String url, diff --git a/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/IastWebController.java b/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/IastWebController.java index 6545f3f3625..f9b20ca2796 100644 --- a/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/IastWebController.java +++ b/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/IastWebController.java @@ -6,7 +6,6 @@ import datadog.smoketest.springboot.TestBean; import datadog.smoketest.springboot.controller.mock.JakartaMockTransport; import ddtest.client.sources.Hasher; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.File; import java.io.IOException; import java.io.ObjectInputStream; @@ -186,14 +185,12 @@ public String commandInjectionProcessBuilder(final HttpServletRequest request) { return "Command Injection page"; } - @SuppressFBWarnings("PT_ABSOLUTE_PATH_TRAVERSAL") @GetMapping("/path_traversal/file") public String pathTraversalFile(final HttpServletRequest request) { new File(request.getParameter("path")); return "Path Traversal page"; } - @SuppressFBWarnings("PT_ABSOLUTE_PATH_TRAVERSAL") @GetMapping("/path_traversal/paths") public String pathTraversalPaths(final HttpServletRequest request) { Paths.get(request.getParameter("path")); diff --git a/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/XssController.java b/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/XssController.java index 32cad411098..7889a3c81a9 100644 --- a/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/XssController.java +++ b/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/XssController.java @@ -2,7 +2,6 @@ import ddtest.securitycontrols.InputValidator; import ddtest.securitycontrols.Sanitizer; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.IOException; import java.util.Locale; import javax.servlet.http.HttpServletRequest; @@ -18,7 +17,6 @@ public class XssController { @GetMapping("/write") - @SuppressFBWarnings public void write(final HttpServletRequest request, final HttpServletResponse response) { try { response.getWriter().write(request.getParameter("string")); @@ -28,7 +26,6 @@ public void write(final HttpServletRequest request, final HttpServletResponse re } @GetMapping("/write2") - @SuppressFBWarnings public void write2(final HttpServletRequest request, final HttpServletResponse response) { try { response.getWriter().write(request.getParameter("string").toCharArray()); @@ -38,7 +35,6 @@ public void write2(final HttpServletRequest request, final HttpServletResponse r } @GetMapping("/write3") - @SuppressFBWarnings public void write3(final HttpServletRequest request, final HttpServletResponse response) { try { String insecure = request.getParameter("string"); @@ -49,7 +45,6 @@ public void write3(final HttpServletRequest request, final HttpServletResponse r } @GetMapping("/write4") - @SuppressFBWarnings public void write4(final HttpServletRequest request, final HttpServletResponse response) { try { char[] buf = request.getParameter("string").toCharArray(); @@ -60,7 +55,6 @@ public void write4(final HttpServletRequest request, final HttpServletResponse r } @GetMapping("/print") - @SuppressFBWarnings public void print(final HttpServletRequest request, final HttpServletResponse response) { try { response.getWriter().print(request.getParameter("string")); @@ -70,7 +64,6 @@ public void print(final HttpServletRequest request, final HttpServletResponse re } @GetMapping("/print2") - @SuppressFBWarnings public void print2(final HttpServletRequest request, final HttpServletResponse response) { try { response.getWriter().print(request.getParameter("string").toCharArray()); @@ -80,7 +73,6 @@ public void print2(final HttpServletRequest request, final HttpServletResponse r } @GetMapping("/println") - @SuppressFBWarnings public void println(final HttpServletRequest request, final HttpServletResponse response) { try { response.getWriter().println(request.getParameter("string")); @@ -90,7 +82,6 @@ public void println(final HttpServletRequest request, final HttpServletResponse } @GetMapping("/println2") - @SuppressFBWarnings public void println2(final HttpServletRequest request, final HttpServletResponse response) { try { response.getWriter().println(request.getParameter("string").toCharArray()); @@ -100,7 +91,6 @@ public void println2(final HttpServletRequest request, final HttpServletResponse } @GetMapping("/printf") - @SuppressFBWarnings public void printf(final HttpServletRequest request, final HttpServletResponse response) { try { String format = request.getParameter("string"); @@ -111,7 +101,6 @@ public void printf(final HttpServletRequest request, final HttpServletResponse r } @GetMapping("/printf2") - @SuppressFBWarnings public void printf2(final HttpServletRequest request, final HttpServletResponse response) { try { String format = "Formatted like: %1$s and %2$s."; @@ -122,7 +111,6 @@ public void printf2(final HttpServletRequest request, final HttpServletResponse } @GetMapping("/printf3") - @SuppressFBWarnings public void printf3(final HttpServletRequest request, final HttpServletResponse response) { try { String format = request.getParameter("string"); @@ -133,7 +121,6 @@ public void printf3(final HttpServletRequest request, final HttpServletResponse } @GetMapping("/printf4") - @SuppressFBWarnings public void printf4(final HttpServletRequest request, final HttpServletResponse response) { try { String format = "Formatted like: %1$s and %2$s."; @@ -144,7 +131,6 @@ public void printf4(final HttpServletRequest request, final HttpServletResponse } @GetMapping("/format") - @SuppressFBWarnings public void format(final HttpServletRequest request, final HttpServletResponse response) { try { String format = request.getParameter("string"); @@ -155,7 +141,6 @@ public void format(final HttpServletRequest request, final HttpServletResponse r } @GetMapping("/format2") - @SuppressFBWarnings public void format2(final HttpServletRequest request, final HttpServletResponse response) { try { String format = "Formatted like: %1$s and %2$s."; @@ -166,7 +151,6 @@ public void format2(final HttpServletRequest request, final HttpServletResponse } @GetMapping("/format3") - @SuppressFBWarnings public void format3(final HttpServletRequest request, final HttpServletResponse response) { try { String format = request.getParameter("string"); @@ -177,7 +161,6 @@ public void format3(final HttpServletRequest request, final HttpServletResponse } @GetMapping("/format4") - @SuppressFBWarnings public void format4(final HttpServletRequest request, final HttpServletResponse response) { try { String format = "Formatted like: %1$s and %2$s."; @@ -194,7 +177,6 @@ public String responseBody(final HttpServletRequest request, final HttpServletRe } @GetMapping("/sanitize") - @SuppressFBWarnings public void sanitize(final HttpServletRequest request, final HttpServletResponse response) { try { response.getWriter().write(Sanitizer.sanitize(request.getParameter("string"))); @@ -204,7 +186,6 @@ public void sanitize(final HttpServletRequest request, final HttpServletResponse } @GetMapping("/validateAll") - @SuppressFBWarnings public void validateAll(final HttpServletRequest request, final HttpServletResponse response) { try { String s = request.getParameter("string"); @@ -216,7 +197,6 @@ public void validateAll(final HttpServletRequest request, final HttpServletRespo } @GetMapping("/validateAll2") - @SuppressFBWarnings public void validate2(final HttpServletRequest request, final HttpServletResponse response) { try { String string1 = request.getParameter("string"); @@ -229,7 +209,6 @@ public void validate2(final HttpServletRequest request, final HttpServletRespons } @GetMapping("/validate") - @SuppressFBWarnings public void validate(final HttpServletRequest request, final HttpServletResponse response) { try { String string1 = request.getParameter("string"); diff --git a/dd-smoke-tests/profiling-integration-tests/src/main/java/datadog/smoketest/profiling/ProfilingTestApplication.java b/dd-smoke-tests/profiling-integration-tests/src/main/java/datadog/smoketest/profiling/ProfilingTestApplication.java index 8d7a5d67c0c..5db03d485a2 100644 --- a/dd-smoke-tests/profiling-integration-tests/src/main/java/datadog/smoketest/profiling/ProfilingTestApplication.java +++ b/dd-smoke-tests/profiling-integration-tests/src/main/java/datadog/smoketest/profiling/ProfilingTestApplication.java @@ -4,7 +4,6 @@ import datadog.trace.api.profiling.Profiling; import datadog.trace.api.profiling.ProfilingContextAttribute; import datadog.trace.api.profiling.ProfilingScope; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.lang.management.ManagementFactory; import java.lang.management.ThreadMXBean; import java.util.List; @@ -54,7 +53,6 @@ public static void main(final String[] args) throws Exception { } @Trace - @SuppressFBWarnings("DM_GC") private static void tracedMethod() throws InterruptedException { System.out.println("Tracing"); tracedBusyMethod(); @@ -68,7 +66,6 @@ private static void tracedMethod() throws InterruptedException { } @Trace - @SuppressFBWarnings("DMI_RANDOM_USED_ONLY_ONCE") private static void tracedBusyMethod() { long startTime = THREAD_MX_BEAN.getCurrentThreadCpuTime(); Random random = new Random(); From ac29db231693fdddfc9250ce0b1940e3296ecd05 Mon Sep 17 00:00:00 2001 From: Bruce Bujon Date: Thu, 2 Jul 2026 16:12:02 +0200 Subject: [PATCH 124/139] Context tests improvement proposals (#11839) feat(context): Add listener assertion methods This will help with readability when building complex sequence of events refactor(core): Add null annotations for context manager implementation refactoring(junit): Fix variable name following #11763 Co-authored-by: bruce.bujon --- .../context/ContextContinuationTest.java | 104 +++++++-------- .../context/ContextListenerEventTest.java | 71 +++++----- .../context/ContextProvidersForkedTest.java | 16 +-- .../java/datadog/context/ContextTestBase.java | 121 +++++++++++------- .../junit5/BeforeAfterOperationsTracer.java | 2 +- .../scopemanager/ContinuableScopeManager.java | 9 +- 6 files changed, 171 insertions(+), 152 deletions(-) diff --git a/components/context/src/test/java/datadog/context/ContextContinuationTest.java b/components/context/src/test/java/datadog/context/ContextContinuationTest.java index 0b6508220bf..1b132717ac7 100644 --- a/components/context/src/test/java/datadog/context/ContextContinuationTest.java +++ b/components/context/src/test/java/datadog/context/ContextContinuationTest.java @@ -2,14 +2,14 @@ import static datadog.context.Context.current; import static datadog.context.Context.root; -import static java.util.Arrays.asList; +import static java.util.Collections.singletonList; +import static java.util.Collections.synchronizedList; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; @@ -46,16 +46,16 @@ void testCaptureStoresContext() { @Test void testCaptureFiresOnCaptureEvent() { - List events = new ArrayList<>(); - ContextManager.register(trackingListener(events)); + TrackingListener listener = trackingListener(); + ContextManager.register(listener); Context context = root().with(CONTINUATION_KEY, "value"); try (ContextScope scope = context.attach()) { ContextContinuation continuation = context.capture(); // capture while active (recommended pattern) - assertEquals(asList("attach", "capture"), events); + listener.assertNewEvents("attach", "capture"); continuation.release(); } - assertEquals(asList("attach", "capture", "release", "detach"), events); + listener.assertNewEvents("release", "detach"); } @Test @@ -75,25 +75,25 @@ void testResumeAttachesContextAndRestoresPreviousOnClose() { @Test void testResumeAndScopeCloseFiresLifecycleEvents() { - List events = new ArrayList<>(); - ContextManager.register(trackingListener(events)); + TrackingListener listener = trackingListener(); + ContextManager.register(listener); Context context = root().with(CONTINUATION_KEY, "value"); ContextContinuation continuation; try (ContextScope scope = context.attach()) { continuation = context.capture(); // capture while active } - assertEquals(asList("attach", "capture", "detach"), events); + listener.assertNewEvents("attach", "capture", "detach"); try (ContextScope scope = continuation.resume()) { - assertEquals(asList("attach", "capture", "detach", "attach"), events); + listener.assertNewEvents("attach"); } // release fires before detach (continuation is released first inside ContextScopeImpl.close) - assertEquals(asList("attach", "capture", "detach", "attach", "release", "detach"), events); + listener.assertNewEvents("release", "detach"); } @Test void testHoldPreventsAutoReleaseOnScopeClose() { - List events = new ArrayList<>(); - ContextManager.register(trackingListener(events)); + TrackingListener listener = trackingListener(); + ContextManager.register(listener); Context context = root().with(CONTINUATION_KEY, "value"); ContextContinuation continuation; try (ContextScope scope = context.attach()) { @@ -104,26 +104,24 @@ void testHoldPreventsAutoReleaseOnScopeClose() { assertEquals(context, current()); } assertEquals(root(), current()); - assertEquals( - asList("attach", "capture", "detach", "attach", "detach"), - events, - "release should not fire while hold is active"); + // release should not fire while hold is active + listener.assertNewEvents("attach", "capture", "detach", "attach", "detach"); continuation.release(); - assertEquals(asList("attach", "capture", "detach", "attach", "detach", "release"), events); + listener.assertNewEvents("release"); } @Test void testExplicitReleaseWithoutResumeFiresReleaseEvent() { - List events = new ArrayList<>(); - ContextManager.register(trackingListener(events)); + TrackingListener listener = trackingListener(); + ContextManager.register(listener); Context context = root().with(CONTINUATION_KEY, "value"); ContextContinuation continuation; try (ContextScope scope = context.attach()) { continuation = context.capture(); // capture while active } - assertEquals(asList("attach", "capture", "detach"), events); + listener.assertNewEvents("attach", "capture", "detach"); continuation.release(); - assertEquals(asList("attach", "capture", "detach", "release"), events); + listener.assertNewEvents("release"); } @Test @@ -168,7 +166,7 @@ void testResumeOnDifferentThread() { @Test void testMultipleResumesReleaseAfterLastScopeCloses() throws InterruptedException { - List events = Collections.synchronizedList(new ArrayList<>()); + List events = synchronizedList(new ArrayList<>()); ContextManager.register( new ContextListener() { @Override @@ -217,7 +215,7 @@ public void onRelease(Context c) { closeSecond.countDown(); assertDoesNotThrow(() -> f1.get()); assertDoesNotThrow(() -> f2.get()); - assertEquals(asList("release"), events); + assertEquals(singletonList("release"), events); } finally { executor.shutdown(); } @@ -225,19 +223,19 @@ public void onRelease(Context c) { @Test void testSameContextResumeReleasesImmediately() { - List events = new ArrayList<>(); - ContextManager.register(trackingListener(events)); + TrackingListener listener = trackingListener(); + ContextManager.register(listener); Context context = root().with(CONTINUATION_KEY, "value"); try (ContextScope outer = context.attach()) { // Context is already current; resume is a noop and continuation is released immediately ContextContinuation continuation = context.capture(); try (ContextScope noop = continuation.resume()) { assertEquals(context, current()); - assertEquals(asList("attach", "capture", "release"), events); // released synchronously + listener.assertNewEvents("attach", "capture", "release"); // released synchronously } assertEquals(context, current()); // outer scope still holds context } - assertEquals(asList("attach", "capture", "release", "detach"), events); + listener.assertNewEvents("detach"); } @Test @@ -249,8 +247,8 @@ void testOutOfOrderScopeCloseReleasesImmediately() { continuation = contextC.capture(); } - List events = new ArrayList<>(); - ContextManager.register(keyedTrackingListener(events, CONTINUATION_KEY)); + TrackingListener listener = keyedTrackingListener(CONTINUATION_KEY); + ContextManager.register(listener); Context contextD = root().with(CONTINUATION_KEY, "D"); try (ContextScope scopeR = continuation.resume()) { @@ -261,17 +259,14 @@ void testOutOfOrderScopeCloseReleasesImmediately() { // close the resume scope out-of-order while D is still nested on top; // release fires immediately, but detach:C does not (C is not current) scopeR.close(); - assertEquals(asList("attach:C", "detach:C", "attach:D", "release:C"), events); + listener.assertNewEvents("attach:C", "detach:C", "attach:D", "release:C"); assertEquals(contextD, current()); // D is still current } // scopeD closes here: unwind D normally, restores C - assertEquals( - asList("attach:C", "detach:C", "attach:D", "release:C", "detach:D", "attach:C"), events); + listener.assertNewEvents("detach:D", "attach:C"); } // try-with-resources closes scopeR again; no second release, C unwinds to root assertEquals(root(), current()); - assertEquals( - asList("attach:C", "detach:C", "attach:D", "release:C", "detach:D", "attach:C", "detach:C"), - events); + listener.assertNewEvents("detach:C"); } @Test @@ -285,8 +280,8 @@ void testHoldWithOutOfOrderScopeCloseFiresReleaseOnExplicitRelease() { continuation.hold(); } - List events = new ArrayList<>(); - ContextManager.register(keyedTrackingListener(events, CONTINUATION_KEY)); + TrackingListener listener = keyedTrackingListener(CONTINUATION_KEY); + ContextManager.register(listener); Context contextD = root().with(CONTINUATION_KEY, "D"); try (ContextScope scopeR = continuation.resume()) { @@ -295,26 +290,23 @@ void testHoldWithOutOfOrderScopeCloseFiresReleaseOnExplicitRelease() { assertEquals(contextD, current()); scopeR.close(); // out-of-order close while D is still on top; hold prevents auto-release - assertEquals(asList("attach:C", "detach:C", "attach:D"), events); + listener.assertNewEvents("attach:C", "detach:C", "attach:D"); assertEquals(contextD, current()); } // scopeD closes here: unwind D, restores C } // TWR closes scopeR again (now in-order); detach:C, no release yet (hold is active) assertEquals(root(), current()); - assertEquals( - asList("attach:C", "detach:C", "attach:D", "detach:D", "attach:C", "detach:C"), events); + listener.assertNewEvents("detach:D", "attach:C", "detach:C"); continuation.release(); // explicit release must fire release:C - assertEquals( - asList("attach:C", "detach:C", "attach:D", "detach:D", "attach:C", "detach:C", "release:C"), - events); + listener.assertNewEvents("release:C"); } @Test void testMultipleHoldCallsAreIdempotent() { // Calling hold() more than once should not require more than one explicit release(). - List events = new ArrayList<>(); - ContextManager.register(trackingListener(events)); + TrackingListener listener = trackingListener(); + ContextManager.register(listener); Context context = root().with(CONTINUATION_KEY, "value"); ContextContinuation continuation; try (ContextScope scope = context.attach()) { @@ -324,36 +316,36 @@ void testMultipleHoldCallsAreIdempotent() { } // One explicit release() is enough — no extra releases needed for the second hold(). continuation.release(); - assertEquals(asList("attach", "capture", "detach", "release"), events); + listener.assertNewEvents("attach", "capture", "detach", "release"); continuation.release(); // still idempotent after the final release - assertEquals(asList("attach", "capture", "detach", "release"), events); + listener.assertNoNewEvents(); } @Test void testHoldAfterReleaseIsIgnored() { // hold() on an already-released continuation must not resurrect it. - List events = new ArrayList<>(); - ContextManager.register(trackingListener(events)); + TrackingListener listener = trackingListener(); + ContextManager.register(listener); Context context = root().with(CONTINUATION_KEY, "value"); ContextContinuation continuation; try (ContextScope scope = context.attach()) { continuation = context.capture(); } continuation.release(); - assertEquals(asList("attach", "capture", "detach", "release"), events); + listener.assertNewEvents("attach", "capture", "detach", "release"); continuation.hold(); // must be silently ignored // resume() after release is already a noop, even with the spurious hold() try (ContextScope scope = continuation.resume()) { assertEquals(root(), current()); } continuation.release(); // must not fire a second release event - assertEquals(asList("attach", "capture", "detach", "release"), events); + listener.assertNoNewEvents(); } @Test void testHoldAllowsMultipleReleaseCalls() { - List events = new ArrayList<>(); - ContextManager.register(trackingListener(events)); + TrackingListener listener = trackingListener(); + ContextManager.register(listener); Context context = root().with(CONTINUATION_KEY, "value"); ContextContinuation continuation; try (ContextScope scope = context.attach()) { @@ -361,8 +353,8 @@ void testHoldAllowsMultipleReleaseCalls() { continuation.hold(); } continuation.release(); - assertEquals(asList("attach", "capture", "detach", "release"), events); + listener.assertNewEvents("attach", "capture", "detach", "release"); continuation.release(); // second release is a no-op - assertEquals(asList("attach", "capture", "detach", "release"), events); + listener.assertNoNewEvents(); } } diff --git a/components/context/src/test/java/datadog/context/ContextListenerEventTest.java b/components/context/src/test/java/datadog/context/ContextListenerEventTest.java index cce5d10f167..4c26d230db5 100644 --- a/components/context/src/test/java/datadog/context/ContextListenerEventTest.java +++ b/components/context/src/test/java/datadog/context/ContextListenerEventTest.java @@ -3,102 +3,97 @@ import static datadog.context.Context.current; import static datadog.context.Context.root; import static datadog.context.ContextTest.STRING_KEY; -import static java.util.Arrays.asList; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertSame; -import static org.junit.jupiter.api.Assertions.assertTrue; -import java.util.ArrayList; -import java.util.List; import org.junit.jupiter.api.Test; class ContextListenerEventTest extends ContextTestBase { @Test void testListenersNotifiedOnAttachAndDetach() { - List events = new ArrayList<>(); - ContextManager.register(keyedTrackingListener(events, STRING_KEY)); + TrackingListener listener = keyedTrackingListener(STRING_KEY); + ContextManager.register(listener); Context context = root().with(STRING_KEY, "value"); try (ContextScope scope = context.attach()) { - assertEquals(asList("attach:value"), events); + listener.assertNewEvents("attach:value"); } - assertEquals(asList("attach:value", "detach:value"), events); + listener.assertNewEvents("detach:value"); } @Test void testListenersNotNotifiedForRootContext() { - List events = new ArrayList<>(); - ContextManager.register(trackingListener(events)); + TrackingListener listener = trackingListener(); + ContextManager.register(listener); root().attach(); // current is already root, no events - assertTrue(events.isEmpty(), "root attach should not trigger listeners"); + listener.assertNoEvents(); // root attach should not trigger listeners root().swap(); // current is already root, no events - assertTrue(events.isEmpty(), "root swap should not trigger listeners"); + listener.assertNoEvents(); // root swap should not trigger listeners Context context = root().with(STRING_KEY, "value"); try (ContextScope scope = context.attach()) { - assertEquals(1, events.size()); // attach:non-root only + listener.assertNewEvents("attach"); // attach:non-root only } - assertEquals(2, events.size()); // detach:non-root but not attach:root + listener.assertNewEvents("detach"); // detach:non-root but not attach:root } @Test void testListenersNotNotifiedOnSameContextAttach() { - List events = new ArrayList<>(); - ContextManager.register(trackingListener(events)); + TrackingListener listener = trackingListener(); + ContextManager.register(listener); Context context = root().with(STRING_KEY, "same"); try (ContextScope outer = context.attach()) { - assertEquals(asList("attach"), events); + listener.assertNewEvents("attach"); try (ContextScope noop = context.attach()) { assertEquals(context, current()); - assertEquals(asList("attach"), events); // no new events on same-context attach + listener.assertNoNewEvents(); // no new events on same-context attach } - assertEquals(asList("attach"), events); // noop close fires no events either + listener.assertNoNewEvents(); // noop close fires no events either } - assertEquals(asList("attach", "detach"), events); + listener.assertNewEvents("detach"); } @Test void testListenersNotNotifiedOnSameContextSwap() { - List events = new ArrayList<>(); - ContextManager.register(trackingListener(events)); + TrackingListener listener = trackingListener(); + ContextManager.register(listener); Context context = root().with(STRING_KEY, "same"); context.swap(); - assertEquals(asList("attach"), events); + listener.assertNewEvents("attach"); context.swap(); // same context again, no events - assertEquals(asList("attach"), events); + listener.assertNoNewEvents(); root().swap(); - assertEquals(asList("attach", "detach"), events); + listener.assertNewEvents("detach"); } @Test void testDuplicateListenerIgnored() { - List events = new ArrayList<>(); - ContextListener listener = trackingListener(events); + TrackingListener listener = trackingListener(); ContextManager.register(listener); ContextManager.register(listener); // should be ignored try (ContextScope scope = root().with(STRING_KEY, "value").attach()) {} - assertEquals(asList("attach", "detach"), events); + listener.assertEvents("attach", "detach"); } @Test void testMultipleListenersAllNotified() { - List events1 = new ArrayList<>(); - List events2 = new ArrayList<>(); - ContextManager.register(trackingListener(events1)); - ContextManager.register(trackingListener(events2)); + TrackingListener listener1 = trackingListener(); + TrackingListener listener2 = trackingListener(); + ContextManager.register(listener1); + ContextManager.register(listener2); try (ContextScope scope = root().with(STRING_KEY, "value").attach()) {} - assertEquals(asList("attach", "detach"), events1); - assertEquals(asList("attach", "detach"), events2); + listener1.assertEvents("attach", "detach"); + listener2.assertEvents("attach", "detach"); } @Test void testSwapNotifiesListeners() { - List events = new ArrayList<>(); - ContextManager.register(keyedTrackingListener(events, STRING_KEY)); + TrackingListener listener = keyedTrackingListener(STRING_KEY); + ContextManager.register(listener); Context context = root().with(STRING_KEY, "value"); Context previous = context.swap(); assertSame(root(), previous); - assertEquals(asList("attach:value"), events); + listener.assertNewEvents("attach:value"); previous = root().swap(); assertSame(context, previous); - assertEquals(asList("attach:value", "detach:value"), events); + listener.assertNewEvents("detach:value"); } } diff --git a/components/context/src/test/java/datadog/context/ContextProvidersForkedTest.java b/components/context/src/test/java/datadog/context/ContextProvidersForkedTest.java index 47e6287ea36..73c55a28c6f 100644 --- a/components/context/src/test/java/datadog/context/ContextProvidersForkedTest.java +++ b/components/context/src/test/java/datadog/context/ContextProvidersForkedTest.java @@ -7,8 +7,6 @@ import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertTrue; -import java.util.ArrayList; -import java.util.List; import javax.annotation.Nonnull; import org.junit.jupiter.api.Test; @@ -85,26 +83,26 @@ public Context current() { } @Override - public ContextScope attach(Context context) { + public ContextScope attach(@Nonnull Context context) { return new NoopContextScope(root()); } @Override - public Context swap(Context context) { + public Context swap(@Nonnull Context context) { return root(); } @Override - public ContextContinuation capture(Context context) { + public ContextContinuation capture(@Nonnull Context context) { return new NoopContextContinuation(root()); } @Override - public void addListener(ContextListener listener) {} + public void addListener(@Nonnull ContextListener listener) {} }); - List events = new ArrayList<>(); - ContextManager.register(trackingListener(events)); + ContextTestBase.TrackingListener listener = trackingListener(); + ContextManager.register(listener); // NOOP manager, context will always be root try (ContextScope scope = context.attach()) { @@ -123,6 +121,6 @@ public void addListener(ContextListener listener) {} assertSame(root(), Context.current()); // NOOP manager, no events emitted - assertTrue(events.isEmpty()); + listener.assertNoEvents(); } } diff --git a/components/context/src/test/java/datadog/context/ContextTestBase.java b/components/context/src/test/java/datadog/context/ContextTestBase.java index ecb0183e635..9fd2a4452cd 100644 --- a/components/context/src/test/java/datadog/context/ContextTestBase.java +++ b/components/context/src/test/java/datadog/context/ContextTestBase.java @@ -2,9 +2,12 @@ import static datadog.context.Context.current; import static datadog.context.Context.root; +import static java.util.Arrays.asList; import static org.junit.jupiter.api.Assertions.assertEquals; +import java.util.ArrayList; import java.util.List; +import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -22,51 +25,81 @@ void verifyNoContextAfter() { assertEquals(root(), current()); } - static ContextListener trackingListener(List events) { - return new ContextListener() { - @Override - public void onAttach(Context c) { - events.add("attach"); - } - - @Override - public void onDetach(Context c) { - events.add("detach"); - } - - @Override - public void onCapture(Context c) { - events.add("capture"); - } - - @Override - public void onRelease(Context c) { - events.add("release"); - } - }; + static TrackingListener trackingListener() { + return new TrackingListener(null); } - static ContextListener keyedTrackingListener(List events, ContextKey key) { - return new ContextListener() { - @Override - public void onAttach(Context c) { - events.add("attach:" + c.get(key)); - } - - @Override - public void onDetach(Context c) { - events.add("detach:" + c.get(key)); - } - - @Override - public void onCapture(Context c) { - events.add("capture:" + c.get(key)); - } - - @Override - public void onRelease(Context c) { - events.add("release:" + c.get(key)); - } - }; + static TrackingListener keyedTrackingListener(ContextKey key) { + return new TrackingListener(key); + } + + /** + * A {@link ContextListener} that records the events it receives so tests can assert on them. + * + *

    With a {@link ContextKey}, each event is suffixed with that key's context value; otherwise + * only the event name is recorded (e.g. {@code "attach"}). + */ + static final class TrackingListener implements ContextListener { + private final List events; + @Nullable private final ContextKey key; + private int checkpoint; + + private TrackingListener(@Nullable ContextKey key) { + this.events = new ArrayList<>(); + this.key = key; + } + + @Override + public void onAttach(Context context) { + record("attach", context); + } + + @Override + public void onDetach(Context context) { + record("detach", context); + } + + @Override + public void onCapture(Context context) { + record("capture", context); + } + + @Override + public void onRelease(Context context) { + record("release", context); + } + + private void record(String event, Context context) { + this.events.add(this.key == null ? event : event + ":" + context.get(this.key)); + } + + /** Asserts the full sequence of recorded events equals {@code expected}. */ + void assertEvents(String... expected) { + assertEquals(asList(expected), new ArrayList<>(this.events)); + } + + /** Asserts that no events have been recorded at all. */ + void assertNoEvents() { + assertEvents(); + } + + /** + * Asserts the events recorded since the previous {@link #assertNewEvents} call equal {@code + * expected}, then advances the checkpoint past them. + */ + void assertNewEvents(String... expected) { + List snapshot = new ArrayList<>(this.events); + List newEvents = new ArrayList<>(snapshot.subList(this.checkpoint, snapshot.size())); + assertEquals(asList(expected), newEvents); + this.checkpoint = snapshot.size(); + } + + /** + * Asserts that no events have been recorded since the previous {@link #assertNewEvents} or + * {@link #assertNoNewEvents} call. + */ + void assertNoNewEvents() { + assertNewEvents(); + } } } diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/BeforeAfterOperationsTracer.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/BeforeAfterOperationsTracer.java index b20b1a7d3f5..99448382196 100644 --- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/BeforeAfterOperationsTracer.java +++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/BeforeAfterOperationsTracer.java @@ -51,7 +51,7 @@ private static void traceInvocation( Invocation invocation, Method executable, String operationName) throws Throwable { AgentSpan agentSpan = AgentTracer.startSpan("junit", executable.getName()); agentSpan.setTag(Tags.TEST_CALLBACK, operationName); - try (ContextScope agentScope = AgentTracer.activateSpan(agentSpan)) { + try (ContextScope scope = AgentTracer.activateSpan(agentSpan)) { invocation.proceed(); } catch (Throwable t) { agentSpan.addThrowable(t); diff --git a/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScopeManager.java b/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScopeManager.java index d278097b053..04fbd637bb3 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScopeManager.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScopeManager.java @@ -30,6 +30,7 @@ import datadog.trace.bootstrap.instrumentation.api.ProfilingContextIntegration; import datadog.trace.core.monitor.HealthMetrics; import datadog.trace.util.AgentTaskScheduler; +import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -376,12 +377,12 @@ public Context current() { } @Override - public ContextScope attach(Context context) { + public ContextScope attach(@NonNull Context context) { return activate(context); } @Override - public Context swap(Context context) { + public Context swap(@NonNull Context context) { ScopeStack oldStack = tlsScopeStack.get(); ContinuableScope oldScope = oldStack.top; @@ -412,7 +413,7 @@ public Context swap(Context context) { } @Override - public ContextContinuation capture(Context context) { + public ContextContinuation capture(@NonNull Context context) { // respect async propagation flag for Context.current().capture() ContinuableScope activeScope = scopeStack().active(); if (activeScope != null @@ -431,7 +432,7 @@ public ContextContinuation capture(Context context) { } @Override - public void addListener(ContextListener unused) { + public void addListener(@NonNull ContextListener unused) { // this new API is not expected to be used in legacy mode... log.warn("Unexpected call to ContextManager.addListener(...)"); } From 24074e0316b9cff207b71de73cf4f27074b6f7b9 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Thu, 2 Jul 2026 11:13:22 -0400 Subject: [PATCH 125/139] v1: serialize span links as structured data and honor baggage tag config. (#11810) v1: serialize span links as structured data and honor baggage tag config. Merge branch 'master' into alexeyk/refactor-v1-baggage-and-span-links Merge branch 'master' into alexeyk/refactor-v1-baggage-and-span-links Co-authored-by: alexey.kuznetsov --- .../common/writer/ddagent/TraceMapperV1.java | 4 +- .../java/datadog/trace/core/CoreSpan.java | 13 +- .../main/java/datadog/trace/core/DDSpan.java | 6 +- .../datadog/trace/core/DDSpanContext.java | 14 + .../trace/common/metrics/SimpleSpan.groovy | 3 - .../ddagent/TraceMapperV1PayloadTest.groovy | 575 +----------------- .../trace/common/writer/TraceGenerator.java | 6 - .../writer/ddagent/V1PayloadReader.java | 558 +++++++++++++++++ .../trace/core/DDSpanSerializationTest.java | 151 +++++ .../groovy/TraceGenerator.groovy | 5 - 10 files changed, 757 insertions(+), 578 deletions(-) create mode 100644 dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/V1PayloadReader.java diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/TraceMapperV1.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/TraceMapperV1.java index 4cb41c597f4..819ff2021be 100644 --- a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/TraceMapperV1.java +++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/TraceMapperV1.java @@ -89,7 +89,7 @@ public void map(List> trace, Writable writable) { } CoreSpan firstSpan = trace.get(0); - firstSpan.processTagsAndBaggage(spanMetadata, false, false); + firstSpan.processTagsAndBaggageWithStructuredLinks(spanMetadata); Metadata firstSpanMeta = spanMetadata.metadata; // encoded fields: 1..7, but skipping #5, as not required by tracers and set by the agent. @@ -128,7 +128,7 @@ private void encodeSpans(Writable writable, int fieldId, List span : spans) { if (meta == null) { - span.processTagsAndBaggage(spanMetadata, false, false); + span.processTagsAndBaggageWithStructuredLinks(spanMetadata); meta = spanMetadata.metadata; } TagMap tags = meta.getTags(); diff --git a/dd-trace-core/src/main/java/datadog/trace/core/CoreSpan.java b/dd-trace-core/src/main/java/datadog/trace/core/CoreSpan.java index dd3b2bc6e06..da163c2f871 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/CoreSpan.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/CoreSpan.java @@ -98,8 +98,17 @@ default String getSpanKindString() { void processTagsAndBaggage(MetadataConsumer consumer); - void processTagsAndBaggage( - MetadataConsumer consumer, boolean injectLinksAsTags, boolean injectBaggageAsTags); + /** + * Variant of {@link #processTagsAndBaggage(MetadataConsumer)} for protocols that serialize span + * links as first-class structured data rather than tags. Baggage tag injection still follows the + * tracer configuration. + * + *

    To simplify tests, by default delegating to {@link + * #processTagsAndBaggage(MetadataConsumer)}. + */ + default void processTagsAndBaggageWithStructuredLinks(MetadataConsumer consumer) { + processTagsAndBaggage(consumer); + } T setSamplingPriority(int samplingPriority, int samplingMechanism); diff --git a/dd-trace-core/src/main/java/datadog/trace/core/DDSpan.java b/dd-trace-core/src/main/java/datadog/trace/core/DDSpan.java index c9a15901c03..a288c405e6f 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/DDSpan.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/DDSpan.java @@ -781,10 +781,8 @@ public void processTagsAndBaggage(final MetadataConsumer consumer) { } @Override - public void processTagsAndBaggage( - final MetadataConsumer consumer, boolean injectLinksAsTags, boolean injectBaggageAsTags) { - context.processTagsAndBaggage( - consumer, longRunningVersion, this, injectLinksAsTags, injectBaggageAsTags); + public void processTagsAndBaggageWithStructuredLinks(final MetadataConsumer consumer) { + context.processTagsAndBaggageWithStructuredLinks(consumer, longRunningVersion, this); } @Override diff --git a/dd-trace-core/src/main/java/datadog/trace/core/DDSpanContext.java b/dd-trace-core/src/main/java/datadog/trace/core/DDSpanContext.java index 520311a20c1..6120502ec09 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/DDSpanContext.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/DDSpanContext.java @@ -1199,6 +1199,20 @@ void processTagsAndBaggage( consumer, longRunningVersion, restrictedSpan, injectLinksAsTags, injectBaggageAsTags); } + /** + * Serialize span links as first-class structured data rather than tags. While baggage tag + * injection keeps following the tracer configuration. + */ + void processTagsAndBaggageWithStructuredLinks( + final MetadataConsumer consumer, int longRunningVersion, DDSpan restrictedSpan) { + processTagsAndBaggage( + consumer, + longRunningVersion, + restrictedSpan, + false, // injectLinksAsTags + injectBaggageAsTags); + } + void processTagsAndBaggage( final MetadataConsumer consumer, int longRunningVersion, diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/metrics/SimpleSpan.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/metrics/SimpleSpan.groovy index f23045856ef..8cb37243790 100644 --- a/dd-trace-core/src/test/groovy/datadog/trace/common/metrics/SimpleSpan.groovy +++ b/dd-trace-core/src/test/groovy/datadog/trace/common/metrics/SimpleSpan.groovy @@ -245,9 +245,6 @@ class SimpleSpan implements CoreSpan { @Override void processTagsAndBaggage(MetadataConsumer consumer) {} - @Override - void processTagsAndBaggage(MetadataConsumer consumer, boolean injectLinksAsTags, boolean injectBaggageAsTags) {} - @Override SimpleSpan setSamplingPriority(int samplingPriority, int samplingMechanism) { return this diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/ddagent/TraceMapperV1PayloadTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/ddagent/TraceMapperV1PayloadTest.groovy index a1350a7538c..b9975dd3038 100644 --- a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/ddagent/TraceMapperV1PayloadTest.groovy +++ b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/ddagent/TraceMapperV1PayloadTest.groovy @@ -1,14 +1,17 @@ package datadog.trace.common.writer.ddagent import static datadog.trace.common.writer.TraceGenerator.generateRandomTraces +import static datadog.trace.common.writer.ddagent.V1PayloadReader.readAttributes +import static datadog.trace.common.writer.ddagent.V1PayloadReader.readFirstSpan +import static datadog.trace.common.writer.ddagent.V1PayloadReader.readStreamingString +import static datadog.trace.common.writer.ddagent.V1PayloadReader.skipChunkField +import static datadog.trace.common.writer.ddagent.V1PayloadReader.skipPayloadField +import static datadog.trace.common.writer.ddagent.V1PayloadReader.skipSpanField +import static datadog.trace.common.writer.ddagent.V1PayloadReader.unpackUnsignedLong import static org.junit.jupiter.api.Assertions.assertArrayEquals import static org.junit.jupiter.api.Assertions.assertEquals import static org.junit.jupiter.api.Assertions.assertNotNull import static org.junit.jupiter.api.Assertions.assertTrue -import static org.msgpack.core.MessageFormat.FIXSTR -import static org.msgpack.core.MessageFormat.STR16 -import static org.msgpack.core.MessageFormat.STR32 -import static org.msgpack.core.MessageFormat.STR8 import datadog.communication.serialization.ByteBufferConsumer import datadog.communication.serialization.FlushingBuffer @@ -345,20 +348,20 @@ class TraceMapperV1PayloadTest extends DDSpecification { stringTable.add("") when: - List> links = readFirstSpanLinks(unpacker, stringTable) + List> links = readFirstSpan(unpacker, stringTable).links then: assertEquals(2, links.size()) assertArrayEquals(traceIdBytes(DDTraceId.fromHex("11223344556677889900aabbccddeeff")), links[0].traceId as byte[]) assertEquals(DDSpanId.fromHex("000000000000002a"), links[0].spanId) - assertEquals("dd=s:1", links[0].tracestate) - assertEquals(1L, links[0].flags) + assertEquals("dd=s:1", links[0].traceState) + assertEquals(1L, links[0].traceFlags) assertEquals(["link.kind": "follows_from", "context_headers": "tracecontext"], links[0].attributes) assertArrayEquals(traceIdBytes(DDTraceId.fromHex("00000000000000000000000000000001")), links[1].traceId as byte[]) assertEquals(DDSpanId.fromHex("0000000000000002"), links[1].spanId) - assertEquals("", links[1].tracestate) - assertEquals(0L, links[1].flags) + assertEquals("", links[1].traceState) + assertEquals(0L, links[1].traceFlags) assertEquals([:], links[1].attributes) } @@ -437,7 +440,7 @@ class TraceMapperV1PayloadTest extends DDSpecification { stringTable.add("") when: - List> links = readFirstSpanLinks(unpacker, stringTable) + List> links = readFirstSpan(unpacker, stringTable).links then: assertTrue(links.isEmpty()) @@ -487,7 +490,7 @@ class TraceMapperV1PayloadTest extends DDSpecification { stringTable.add("") when: - List> events = readFirstSpanEvents(unpacker, stringTable) + List> events = readFirstSpan(unpacker, stringTable).events then: assertEquals(2, events.size()) @@ -531,7 +534,7 @@ class TraceMapperV1PayloadTest extends DDSpecification { stringTable.add("") when: - List> events = readFirstSpanEvents(unpacker, stringTable) + List> events = readFirstSpan(unpacker, stringTable).events then: assertTrue(events.isEmpty()) @@ -565,7 +568,7 @@ class TraceMapperV1PayloadTest extends DDSpecification { stringTable.add("") when: - Map attributes = readFirstSpanAttributes(unpacker, stringTable) + Map attributes = readFirstSpan(unpacker, stringTable).attributes byte[] metaStructBytes = attributes["meta_key"] as byte[] MessageUnpacker metaStructUnpacker = MessagePack.newDefaultUnpacker(metaStructBytes) int metaStructFieldCount = metaStructUnpacker.unpackMapHeader() @@ -635,7 +638,7 @@ class TraceMapperV1PayloadTest extends DDSpecification { stringTable.add("") when: - Map attributes = readFirstSpanAttributes(unpacker, stringTable) + Map attributes = readFirstSpan(unpacker, stringTable).attributes then: assertTrue(attributes.containsKey("usr.id")) @@ -691,7 +694,7 @@ class TraceMapperV1PayloadTest extends DDSpecification { stringTable.add("") when: - Map attributes = readFirstSpanAttributes(unpacker, stringTable) + Map attributes = readFirstSpan(unpacker, stringTable).attributes then: assertEquals(true, attributes.get("tag.bool")) @@ -728,7 +731,7 @@ class TraceMapperV1PayloadTest extends DDSpecification { stringTable.add("") when: - Map attributes = readFirstSpanAttributes(unpacker, stringTable) + Map attributes = readFirstSpan(unpacker, stringTable).attributes then: assertAttributeValueEquals(span.getTag(DDTags.THREAD_ID), attributes.get(DDTags.THREAD_ID), DDTags.THREAD_ID) @@ -1031,40 +1034,6 @@ class TraceMapperV1PayloadTest extends DDSpecification { } } - private static Map readAttributes(MessageUnpacker unpacker, List stringTable) { - int attrArraySize = unpacker.unpackArrayHeader() - assertEquals(0, attrArraySize % 3) - int attrCount = attrArraySize / 3 - - Map attributes = new HashMap<>() - for (int i = 0; i < attrCount; i++) { - String key = readStreamingString(unpacker, stringTable) - int attrType = unpacker.unpackInt() - Object value - switch (attrType) { - case TraceMapperV1.VALUE_TYPE_STRING: - value = readStreamingString(unpacker, stringTable) - break - case TraceMapperV1.VALUE_TYPE_BOOLEAN: - value = unpacker.unpackBoolean() - break - case TraceMapperV1.VALUE_TYPE_FLOAT: - value = unpacker.unpackDouble() - break - case TraceMapperV1.VALUE_TYPE_BYTES: - int len = unpacker.unpackBinaryHeader() - byte[] data = new byte[len] - unpacker.readPayload(data) - value = data - break - default: - Assertions.fail("Unknown attribute value type: " + attrType) - } - attributes.put(key, value) - } - return attributes - } - private static void assertAttributeValueEquals(Object expected, Object actual, String key) { if (expected instanceof Number) { assertTrue(actual instanceof Number, "Attribute $key should be numeric") @@ -1079,14 +1048,6 @@ class TraceMapperV1PayloadTest extends DDSpecification { } } - private static long unpackUnsignedLong(MessageUnpacker unpacker) { - MessageFormat format = unpacker.nextFormat - if (format == MessageFormat.UINT64) { - return DDSpanId.from("${unpacker.unpackBigInteger()}") - } - return unpacker.unpackLong() - } - private static void addFlattenedExpectedAttribute( Map expectedAttributes, String key, @@ -1126,498 +1087,6 @@ class TraceMapperV1PayloadTest extends DDSpecification { } } - private static String readStreamingString(MessageUnpacker unpacker, List stringTable) { - MessageFormat format = unpacker.getNextFormat() - if (format == FIXSTR || format == STR8 || format == STR16 || format == STR32) { - String value = unpacker.unpackString() - if (!stringTable.contains(value)) { - stringTable.add(value) - } - return value - } - - int index = unpacker.unpackInt() - assertTrue(index >= 0 && index < stringTable.size(), "Invalid string-table index: " + index) - return stringTable.get(index) - } - - private static void skipPayloadField(MessageUnpacker unpacker, int fieldId, List stringTable) { - switch (fieldId) { - case 2: - case 3: - case 4: - case 5: - case 6: - case 7: - case 8: - case 9: - readStreamingString(unpacker, stringTable) - break - case 10: - readAttributes(unpacker, stringTable) - break - default: - Assertions.fail("Unexpected payload field id while skipping: " + fieldId) - } - } - - private static void skipChunkField(MessageUnpacker unpacker, int fieldId, List stringTable) { - switch (fieldId) { - case 1: - unpacker.unpackInt() - break - case 2: - readStreamingString(unpacker, stringTable) - break - case 3: - readAttributes(unpacker, stringTable) - break - case 4: - int spanCount = unpacker.unpackArrayHeader() - for (int i = 0; i < spanCount; i++) { - skipSpan(unpacker, stringTable) - } - break - case 5: - unpacker.unpackBoolean() - break - case 6: - int len = unpacker.unpackBinaryHeader() - byte[] ignored = new byte[len] - unpacker.readPayload(ignored) - break - case 7: - unpacker.unpackInt() - break - default: - Assertions.fail("Unexpected chunk field id while skipping: " + fieldId) - } - } - - private static void skipSpan(MessageUnpacker unpacker, List stringTable) { - int fieldCount = unpacker.unpackMapHeader() - for (int i = 0; i < fieldCount; i++) { - int fieldId = unpacker.unpackInt() - switch (fieldId) { - case 1: - case 2: - case 3: - case 10: - case 13: - case 14: - case 15: - readStreamingString(unpacker, stringTable) - break - case 4: - case 5: - unpacker.unpackValue().asNumberValue().toLong() - break - case 6: - case 7: - unpacker.unpackLong() - break - case 8: - unpacker.unpackBoolean() - break - case 9: - int attrArraySize = unpacker.unpackArrayHeader() - int attrCount = attrArraySize / 3 - for (int j = 0; j < attrCount; j++) { - readStreamingString(unpacker, stringTable) - int type = unpacker.unpackInt() - switch (type) { - case TraceMapperV1.VALUE_TYPE_STRING: - readStreamingString(unpacker, stringTable) - break - case TraceMapperV1.VALUE_TYPE_BOOLEAN: - unpacker.unpackBoolean() - break - case TraceMapperV1.VALUE_TYPE_FLOAT: - unpacker.unpackDouble() - break - case TraceMapperV1.VALUE_TYPE_BYTES: - int len = unpacker.unpackBinaryHeader() - byte[] ignored = new byte[len] - unpacker.readPayload(ignored) - break - default: - Assertions.fail("Unexpected attribute type while skipping: " + type) - } - } - break - case 11: - case 12: - unpacker.unpackArrayHeader() - break - case 16: - unpacker.unpackInt() - break - default: - Assertions.fail("Unexpected span field id while skipping: " + fieldId) - } - } - } - - private static Map readFirstSpanAttributes( - MessageUnpacker unpacker, - List stringTable) { - int payloadFieldCount = unpacker.unpackMapHeader() - for (int i = 0; i < payloadFieldCount; i++) { - int payloadFieldId = unpacker.unpackInt() - if (payloadFieldId != 11) { - skipPayloadField(unpacker, payloadFieldId, stringTable) - continue - } - - int chunkCount = unpacker.unpackArrayHeader() - assertEquals(1, chunkCount) - - int chunkFieldCount = unpacker.unpackMapHeader() - for (int chunkFieldIndex = 0; chunkFieldIndex < chunkFieldCount; chunkFieldIndex++) { - int chunkFieldId = unpacker.unpackInt() - if (chunkFieldId != 4) { - skipChunkField(unpacker, chunkFieldId, stringTable) - continue - } - - int spanCount = unpacker.unpackArrayHeader() - assertEquals(1, spanCount) - - int spanFieldCount = unpacker.unpackMapHeader() - for (int spanFieldIndex = 0; spanFieldIndex < spanFieldCount; spanFieldIndex++) { - int spanFieldId = unpacker.unpackInt() - if (spanFieldId == 9) { - return readAttributes(unpacker, stringTable) - } - skipSpanField(unpacker, spanFieldId, stringTable) - } - } - } - Assertions.fail("Could not find span attributes field in first span") - return [:] - } - - private static List> readFirstSpanLinks( - MessageUnpacker unpacker, - List stringTable) { - int payloadFieldCount = unpacker.unpackMapHeader() - for (int i = 0; i < payloadFieldCount; i++) { - int payloadFieldId = unpacker.unpackInt() - if (payloadFieldId != 11) { - skipPayloadField(unpacker, payloadFieldId, stringTable) - continue - } - - int chunkCount = unpacker.unpackArrayHeader() - assertEquals(1, chunkCount) - - int chunkFieldCount = unpacker.unpackMapHeader() - for (int chunkFieldIndex = 0; chunkFieldIndex < chunkFieldCount; chunkFieldIndex++) { - int chunkFieldId = unpacker.unpackInt() - if (chunkFieldId != 4) { - skipChunkField(unpacker, chunkFieldId, stringTable) - continue - } - - int spanCount = unpacker.unpackArrayHeader() - assertEquals(1, spanCount) - - int spanFieldCount = unpacker.unpackMapHeader() - for (int spanFieldIndex = 0; spanFieldIndex < spanFieldCount; spanFieldIndex++) { - int spanFieldId = unpacker.unpackInt() - if (spanFieldId == 11) { - return readSpanLinks(unpacker, stringTable) - } - skipSpanField(unpacker, spanFieldId, stringTable) - } - } - } - Assertions.fail("Could not find span links field in first span") - return [] - } - - private static void skipSpanField(MessageUnpacker unpacker, int fieldId, List stringTable) { - switch (fieldId) { - case 1: - case 2: - case 3: - case 10: - case 13: - case 14: - case 15: - readStreamingString(unpacker, stringTable) - break - case 4: - case 5: - unpacker.unpackValue().asNumberValue().toLong() - break - case 6: - case 7: - unpacker.unpackLong() - break - case 8: - unpacker.unpackBoolean() - break - case 9: - readAttributes(unpacker, stringTable) - break - case 12: - int eventsCount = unpacker.unpackArrayHeader() - for (int j = 0; j < eventsCount; j++) { - skipSpanEvent(unpacker, stringTable) - } - break - case 11: - int linksCount = unpacker.unpackArrayHeader() - for (int j = 0; j < linksCount; j++) { - int linkFieldCount = unpacker.unpackMapHeader() - for (int k = 0; k < linkFieldCount; k++) { - int linkFieldId = unpacker.unpackInt() - switch (linkFieldId) { - case 1: - int traceIdLen = unpacker.unpackBinaryHeader() - byte[] ignored = new byte[traceIdLen] - unpacker.readPayload(ignored) - break - case 2: - case 5: - unpacker.unpackValue().asNumberValue().toLong() - break - case 3: - readAttributes(unpacker, stringTable) - break - case 4: - readStreamingString(unpacker, stringTable) - break - default: - Assertions.fail("Unexpected span link field id while skipping: " + linkFieldId) - } - } - } - break - case 16: - unpacker.unpackInt() - break - default: - Assertions.fail("Unexpected span field id while skipping: " + fieldId) - } - } - - private static List> readSpanLinks( - MessageUnpacker unpacker, - List stringTable) { - int linksCount = unpacker.unpackArrayHeader() - List> links = [] - - for (int i = 0; i < linksCount; i++) { - int linkFieldCount = unpacker.unpackMapHeader() - assertEquals(5, linkFieldCount) - - byte[] traceId = null - Long spanId = null - Map attributes = null - String tracestate = null - Long flags = null - - for (int j = 0; j < linkFieldCount; j++) { - int linkFieldId = unpacker.unpackInt() - switch (linkFieldId) { - case 1: - int traceIdLen = unpacker.unpackBinaryHeader() - traceId = new byte[traceIdLen] - unpacker.readPayload(traceId) - break - case 2: - spanId = unpacker.unpackValue().asNumberValue().toLong() - break - case 3: - attributes = readAttributes(unpacker, stringTable) - break - case 4: - tracestate = readStreamingString(unpacker, stringTable) - break - case 5: - flags = unpacker.unpackValue().asNumberValue().toLong() - break - default: - Assertions.fail("Unexpected span link field id: " + linkFieldId) - } - } - - links.add([ - traceId : traceId, - spanId : spanId, - attributes: attributes, - tracestate: tracestate, - flags : flags - ]) - } - - return links - } - - private static List> readFirstSpanEvents( - MessageUnpacker unpacker, - List stringTable) { - int payloadFieldCount = unpacker.unpackMapHeader() - for (int i = 0; i < payloadFieldCount; i++) { - int payloadFieldId = unpacker.unpackInt() - if (payloadFieldId != 11) { - skipPayloadField(unpacker, payloadFieldId, stringTable) - continue - } - - int chunkCount = unpacker.unpackArrayHeader() - assertEquals(1, chunkCount) - - int chunkFieldCount = unpacker.unpackMapHeader() - for (int chunkFieldIndex = 0; chunkFieldIndex < chunkFieldCount; chunkFieldIndex++) { - int chunkFieldId = unpacker.unpackInt() - if (chunkFieldId != 4) { - skipChunkField(unpacker, chunkFieldId, stringTable) - continue - } - - int spanCount = unpacker.unpackArrayHeader() - assertEquals(1, spanCount) - - int spanFieldCount = unpacker.unpackMapHeader() - for (int spanFieldIndex = 0; spanFieldIndex < spanFieldCount; spanFieldIndex++) { - int spanFieldId = unpacker.unpackInt() - if (spanFieldId == 12) { - return readSpanEvents(unpacker, stringTable) - } - skipSpanField(unpacker, spanFieldId, stringTable) - } - } - } - Assertions.fail("Could not find span events field in first span") - return [] - } - - private static List> readSpanEvents( - MessageUnpacker unpacker, - List stringTable) { - int eventsCount = unpacker.unpackArrayHeader() - List> events = [] - - for (int i = 0; i < eventsCount; i++) { - int eventFieldCount = unpacker.unpackMapHeader() - assertEquals(3, eventFieldCount) - - Long timeUnixNano = null - String name = null - Map attributes = null - - for (int j = 0; j < eventFieldCount; j++) { - int eventFieldId = unpacker.unpackInt() - switch (eventFieldId) { - case 1: - timeUnixNano = unpacker.unpackLong() - break - case 2: - name = readStreamingString(unpacker, stringTable) - break - case 3: - attributes = readEventAttributes(unpacker, stringTable) - break - default: - Assertions.fail("Unexpected span event field id: " + eventFieldId) - } - } - - events.add([ - timeUnixNano: timeUnixNano, - name : name, - attributes : attributes - ]) - } - return events - } - - private static Map readEventAttributes( - MessageUnpacker unpacker, - List stringTable) { - int attrArraySize = unpacker.unpackArrayHeader() - assertEquals(0, attrArraySize % 3) - int attrCount = attrArraySize / 3 - Map attributes = new HashMap<>() - - for (int i = 0; i < attrCount; i++) { - String key = readStreamingString(unpacker, stringTable) - int attrType = unpacker.unpackInt() - Object value - switch (attrType) { - case TraceMapperV1.VALUE_TYPE_STRING: - value = readStreamingString(unpacker, stringTable) - break - case TraceMapperV1.VALUE_TYPE_BOOLEAN: - value = unpacker.unpackBoolean() - break - case TraceMapperV1.VALUE_TYPE_FLOAT: - value = unpacker.unpackDouble() - break - case TraceMapperV1.VALUE_TYPE_INT: - value = unpacker.unpackLong() - break - case TraceMapperV1.VALUE_TYPE_ARRAY: - value = readEventArrayValue(unpacker, stringTable) - break - default: - Assertions.fail("Unknown event attribute value type: " + attrType) - } - attributes.put(key, value) - } - return attributes - } - - private static List readEventArrayValue(MessageUnpacker unpacker, List stringTable) { - int itemArraySize = unpacker.unpackArrayHeader() - assertEquals(0, itemArraySize % 2) - int itemCount = itemArraySize / 2 - List values = [] - for (int i = 0; i < itemCount; i++) { - int itemType = unpacker.unpackInt() - switch (itemType) { - case TraceMapperV1.VALUE_TYPE_STRING: - values.add(readStreamingString(unpacker, stringTable)) - break - case TraceMapperV1.VALUE_TYPE_BOOLEAN: - values.add(unpacker.unpackBoolean()) - break - case TraceMapperV1.VALUE_TYPE_FLOAT: - values.add(unpacker.unpackDouble()) - break - case TraceMapperV1.VALUE_TYPE_INT: - values.add(unpacker.unpackLong()) - break - default: - Assertions.fail("Unknown event array item type: " + itemType) - } - } - return values - } - - private static void skipSpanEvent(MessageUnpacker unpacker, List stringTable) { - int fieldCount = unpacker.unpackMapHeader() - for (int i = 0; i < fieldCount; i++) { - int fieldId = unpacker.unpackInt() - switch (fieldId) { - case 1: - unpacker.unpackLong() - break - case 2: - readStreamingString(unpacker, stringTable) - break - case 3: - readEventAttributes(unpacker, stringTable) - break - default: - Assertions.fail("Unexpected event field id while skipping: " + fieldId) - } - } - } - private static byte[] serializeMappedPayload( TraceMapperV1 mapper, List> traces) { @@ -1699,12 +1168,6 @@ class TraceMapperV1PayloadTest extends DDSpecification { processTagsAndBaggageCount++ super.processTagsAndBaggage(consumer) } - - @Override - void processTagsAndBaggage(MetadataConsumer consumer, boolean injectLinksAsTags, boolean injectBaggageAsTags) { - processTagsAndBaggageCount++ - super.processTagsAndBaggage(consumer, injectLinksAsTags, injectBaggageAsTags) - } } private static class ByteArrayChannel implements WritableByteChannel { diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/TraceGenerator.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/TraceGenerator.java index 00610ddbb61..c8fad4ab0ee 100644 --- a/dd-trace-core/src/test/java/datadog/trace/common/writer/TraceGenerator.java +++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/TraceGenerator.java @@ -402,12 +402,6 @@ public void processTagsAndBaggage(MetadataConsumer consumer) { consumer.accept(metadata); } - @Override - public void processTagsAndBaggage( - MetadataConsumer consumer, boolean injectLinksAsTags, boolean injectBaggageAsTags) { - consumer.accept(metadata); - } - @Override public PojoSpan setSamplingPriority(int samplingPriority, int samplingMechanism) { return this; diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/V1PayloadReader.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/V1PayloadReader.java new file mode 100644 index 00000000000..4d1af7bbfca --- /dev/null +++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/V1PayloadReader.java @@ -0,0 +1,558 @@ +package datadog.trace.common.writer.ddagent; + +import static datadog.trace.common.writer.ddagent.TraceMapperV1.VALUE_TYPE_ARRAY; +import static datadog.trace.common.writer.ddagent.TraceMapperV1.VALUE_TYPE_BOOLEAN; +import static datadog.trace.common.writer.ddagent.TraceMapperV1.VALUE_TYPE_BYTES; +import static datadog.trace.common.writer.ddagent.TraceMapperV1.VALUE_TYPE_FLOAT; +import static datadog.trace.common.writer.ddagent.TraceMapperV1.VALUE_TYPE_INT; +import static datadog.trace.common.writer.ddagent.TraceMapperV1.VALUE_TYPE_STRING; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import datadog.trace.api.DDSpanId; +import datadog.trace.api.DDTraceId; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.msgpack.core.MessageFormat; +import org.msgpack.core.MessagePack; +import org.msgpack.core.MessageUnpacker; +import org.msgpack.core.buffer.ArrayBufferInput; +import org.msgpack.value.ValueType; + +/** + * Shared decoder for the msgpack V1 trace payload wire format produced by {@link TraceMapperV1}. + * + *

    This is the single source of truth for the low-level parse primitives used by the V1 payload + * tests (both {@code TraceMapperV1PayloadTest} and {@code DDSpanSerializationTest}). Methods take + * an explicit {@link MessageUnpacker} and {@code stringTable} so callers that need to assert on + * wire-level details can interleave their own reads while keeping the streaming-string table in + * sync. The string table must be seeded with the empty string at index 0, mirroring {@code + * TraceMapperV1}. + */ +public final class V1PayloadReader { + + /** msgpack field ids of the top-level payload (header) map, mirroring {@code buildHeader}. */ + private static final class PayloadField { + static final int CONTAINER_ID = 2; + static final int LANGUAGE_NAME = 3; + static final int LANGUAGE_VERSION = 4; + static final int TRACER_VERSION = 5; + static final int RUNTIME_ID = 6; + static final int ENV = 7; + static final int HOSTNAME = 8; + static final int APP_VERSION = 9; + static final int ATTRIBUTES = 10; + static final int CHUNKS = 11; + + private PayloadField() {} + } + + /** msgpack field ids of a trace chunk map, mirroring {@code TraceMapperV1.map} (no field 5). */ + private static final class ChunkField { + static final int PRIORITY = 1; + static final int ORIGIN = 2; + static final int ATTRIBUTES = 3; + static final int SPANS = 4; + static final int TRACE_ID = 6; + static final int SAMPLING_MECHANISM = 7; + + private ChunkField() {} + } + + /** msgpack field ids of a span map, mirroring {@code encodeSpans} (16 fields). */ + private static final class SpanField { + static final int SERVICE = 1; + static final int NAME = 2; + static final int RESOURCE = 3; + static final int SPAN_ID = 4; + static final int PARENT_ID = 5; + static final int START = 6; + static final int DURATION = 7; + static final int ERROR = 8; + static final int ATTRIBUTES = 9; + static final int TYPE = 10; + static final int LINKS = 11; + static final int EVENTS = 12; + static final int ENV = 13; + static final int VERSION = 14; + static final int COMPONENT = 15; + static final int KIND = 16; + + private SpanField() {} + } + + /** msgpack field ids of a span link map, mirroring {@code encodeSpanLinks} (5 fields). */ + private static final class LinkField { + static final int TRACE_ID = 1; + static final int SPAN_ID = 2; + static final int ATTRIBUTES = 3; + static final int TRACE_STATE = 4; + static final int TRACE_FLAGS = 5; + + private LinkField() {} + } + + /** msgpack field ids of a span event map, mirroring {@code encodeSpanEvents} (3 fields). */ + private static final class EventField { + static final int TIME_UNIX_NANO = 1; + static final int NAME = 2; + static final int ATTRIBUTES = 3; + + private EventField() {} + } + + private V1PayloadReader() {} + + /** Decodes the first span of the first chunk of an encoded V1 payload. */ + public static V1Span readFirstSpan(byte[] encoded) throws IOException { + MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(new ArrayBufferInput(encoded)); + List stringTable = newStringTable(); + return readFirstSpan(unpacker, stringTable); + } + + /** Creates a string table seeded with the empty string at index 0, as the writer expects. */ + public static List newStringTable() { + List stringTable = new ArrayList<>(); + stringTable.add(""); + return stringTable; + } + + public static V1Span readFirstSpan(MessageUnpacker unpacker, List stringTable) + throws IOException { + int payloadFieldCount = unpacker.unpackMapHeader(); + for (int i = 0; i < payloadFieldCount; i++) { + int payloadFieldId = unpacker.unpackInt(); + if (payloadFieldId != PayloadField.CHUNKS) { + skipPayloadField(unpacker, payloadFieldId, stringTable); + continue; + } + int chunkCount = unpacker.unpackArrayHeader(); + assertEquals(1, chunkCount); + int chunkFieldCount = unpacker.unpackMapHeader(); + for (int j = 0; j < chunkFieldCount; j++) { + int chunkFieldId = unpacker.unpackInt(); + if (chunkFieldId != ChunkField.SPANS) { + skipChunkField(unpacker, chunkFieldId, stringTable); + continue; + } + int spanCount = unpacker.unpackArrayHeader(); + assertEquals(1, spanCount); + return decodeSpan(unpacker, stringTable); + } + } + throw new AssertionError("Could not find first span in v1 payload"); + } + + private static V1Span decodeSpan(MessageUnpacker unpacker, List stringTable) + throws IOException { + int spanFieldCount = unpacker.unpackMapHeader(); + Map attributes = Collections.emptyMap(); + List links = Collections.emptyList(); + List events = Collections.emptyList(); + for (int i = 0; i < spanFieldCount; i++) { + int spanFieldId = unpacker.unpackInt(); + switch (spanFieldId) { + case SpanField.ATTRIBUTES: + attributes = readAttributes(unpacker, stringTable); + break; + case SpanField.LINKS: + links = readSpanLinks(unpacker, stringTable); + break; + case SpanField.EVENTS: + events = readSpanEvents(unpacker, stringTable); + break; + default: + skipSpanField(unpacker, spanFieldId, stringTable); + } + } + return new V1Span(attributes, links, events); + } + + public static Map readAttributes( + MessageUnpacker unpacker, List stringTable) throws IOException { + int arraySize = unpacker.unpackArrayHeader(); + assertEquals(0, arraySize % 3); + int attributeCount = arraySize / 3; + Map attributes = new HashMap<>(); + for (int i = 0; i < attributeCount; i++) { + String key = readStreamingString(unpacker, stringTable); + int valueType = unpacker.unpackInt(); + attributes.put(key, readAttributeValue(unpacker, stringTable, valueType)); + } + return attributes; + } + + private static Object readAttributeValue( + MessageUnpacker unpacker, List stringTable, int valueType) throws IOException { + switch (valueType) { + case VALUE_TYPE_STRING: + return readStreamingString(unpacker, stringTable); + case VALUE_TYPE_BOOLEAN: + return unpacker.unpackBoolean(); + case VALUE_TYPE_FLOAT: + return unpacker.unpackDouble(); + case VALUE_TYPE_BYTES: + return readBinary(unpacker); + default: + throw new IllegalArgumentException("Unknown v1 attribute value type: " + valueType); + } + } + + public static List readSpanLinks(MessageUnpacker unpacker, List stringTable) + throws IOException { + int linkCount = unpacker.unpackArrayHeader(); + List links = new ArrayList<>(linkCount); + for (int i = 0; i < linkCount; i++) { + int linkFieldCount = unpacker.unpackMapHeader(); + byte[] traceId = null; + long spanId = 0; + Map attributes = Collections.emptyMap(); + String traceState = ""; + long traceFlags = 0; + for (int j = 0; j < linkFieldCount; j++) { + int linkFieldId = unpacker.unpackInt(); + switch (linkFieldId) { + case LinkField.TRACE_ID: + traceId = readBinary(unpacker); + break; + case LinkField.SPAN_ID: + spanId = unpackUnsignedLong(unpacker); + break; + case LinkField.ATTRIBUTES: + attributes = readAttributes(unpacker, stringTable); + break; + case LinkField.TRACE_STATE: + traceState = readStreamingString(unpacker, stringTable); + break; + case LinkField.TRACE_FLAGS: + traceFlags = unpackUnsignedLong(unpacker); + break; + default: + throw new IllegalArgumentException("Unexpected v1 span link field id: " + linkFieldId); + } + } + links.add(new V1SpanLink(traceId, spanId, attributes, traceState, traceFlags)); + } + return links; + } + + public static List readSpanEvents(MessageUnpacker unpacker, List stringTable) + throws IOException { + int eventCount = unpacker.unpackArrayHeader(); + List events = new ArrayList<>(eventCount); + for (int i = 0; i < eventCount; i++) { + int eventFieldCount = unpacker.unpackMapHeader(); + long timeUnixNano = 0; + String name = null; + Map attributes = Collections.emptyMap(); + for (int j = 0; j < eventFieldCount; j++) { + int eventFieldId = unpacker.unpackInt(); + switch (eventFieldId) { + case EventField.TIME_UNIX_NANO: + timeUnixNano = unpacker.unpackLong(); + break; + case EventField.NAME: + name = readStreamingString(unpacker, stringTable); + break; + case EventField.ATTRIBUTES: + attributes = readEventAttributes(unpacker, stringTable); + break; + default: + throw new IllegalArgumentException( + "Unexpected v1 span event field id: " + eventFieldId); + } + } + events.add(new V1SpanEvent(timeUnixNano, name, attributes)); + } + return events; + } + + private static Map readEventAttributes( + MessageUnpacker unpacker, List stringTable) throws IOException { + int arraySize = unpacker.unpackArrayHeader(); + assertEquals(0, arraySize % 3); + int attributeCount = arraySize / 3; + Map attributes = new HashMap<>(); + for (int i = 0; i < attributeCount; i++) { + String key = readStreamingString(unpacker, stringTable); + int valueType = unpacker.unpackInt(); + Object value; + switch (valueType) { + case VALUE_TYPE_STRING: + value = readStreamingString(unpacker, stringTable); + break; + case VALUE_TYPE_BOOLEAN: + value = unpacker.unpackBoolean(); + break; + case VALUE_TYPE_FLOAT: + value = unpacker.unpackDouble(); + break; + case VALUE_TYPE_INT: + value = unpacker.unpackLong(); + break; + case VALUE_TYPE_ARRAY: + value = readEventArrayValue(unpacker, stringTable); + break; + default: + throw new IllegalArgumentException("Unknown v1 event attribute value type: " + valueType); + } + attributes.put(key, value); + } + return attributes; + } + + private static List readEventArrayValue( + MessageUnpacker unpacker, List stringTable) throws IOException { + int arraySize = unpacker.unpackArrayHeader(); + assertEquals(0, arraySize % 2); + int itemCount = arraySize / 2; + List values = new ArrayList<>(itemCount); + for (int i = 0; i < itemCount; i++) { + int itemType = unpacker.unpackInt(); + switch (itemType) { + case VALUE_TYPE_STRING: + values.add(readStreamingString(unpacker, stringTable)); + break; + case VALUE_TYPE_BOOLEAN: + values.add(unpacker.unpackBoolean()); + break; + case VALUE_TYPE_FLOAT: + values.add(unpacker.unpackDouble()); + break; + case VALUE_TYPE_INT: + values.add(unpacker.unpackLong()); + break; + default: + throw new IllegalArgumentException("Unknown v1 event array item type: " + itemType); + } + } + return values; + } + + public static void skipPayloadField( + MessageUnpacker unpacker, int fieldId, List stringTable) throws IOException { + switch (fieldId) { + case PayloadField.CONTAINER_ID: + case PayloadField.LANGUAGE_NAME: + case PayloadField.LANGUAGE_VERSION: + case PayloadField.TRACER_VERSION: + case PayloadField.RUNTIME_ID: + case PayloadField.ENV: + case PayloadField.HOSTNAME: + case PayloadField.APP_VERSION: + readStreamingString(unpacker, stringTable); + break; + case PayloadField.ATTRIBUTES: + readAttributes(unpacker, stringTable); + break; + default: + throw new IllegalArgumentException("Unexpected v1 payload field id: " + fieldId); + } + } + + public static void skipChunkField(MessageUnpacker unpacker, int fieldId, List stringTable) + throws IOException { + switch (fieldId) { + case ChunkField.PRIORITY: + case ChunkField.SAMPLING_MECHANISM: + unpacker.unpackInt(); + break; + case ChunkField.ORIGIN: + readStreamingString(unpacker, stringTable); + break; + case ChunkField.ATTRIBUTES: + readAttributes(unpacker, stringTable); + break; + case ChunkField.SPANS: + int spanCount = unpacker.unpackArrayHeader(); + for (int i = 0; i < spanCount; i++) { + decodeSpan(unpacker, stringTable); + } + break; + case ChunkField.TRACE_ID: + readBinary(unpacker); + break; + default: + throw new IllegalArgumentException("Unexpected v1 chunk field id: " + fieldId); + } + } + + public static void skipSpanField(MessageUnpacker unpacker, int fieldId, List stringTable) + throws IOException { + switch (fieldId) { + case SpanField.SERVICE: + case SpanField.NAME: + case SpanField.RESOURCE: + case SpanField.TYPE: + case SpanField.ENV: + case SpanField.VERSION: + case SpanField.COMPONENT: + readStreamingString(unpacker, stringTable); + break; + case SpanField.SPAN_ID: + case SpanField.PARENT_ID: + unpackUnsignedLong(unpacker); + break; + case SpanField.START: + case SpanField.DURATION: + unpacker.unpackLong(); + break; + case SpanField.ERROR: + unpacker.unpackBoolean(); + break; + case SpanField.ATTRIBUTES: + readAttributes(unpacker, stringTable); + break; + case SpanField.LINKS: + readSpanLinks(unpacker, stringTable); + break; + case SpanField.EVENTS: + readSpanEvents(unpacker, stringTable); + break; + case SpanField.KIND: + unpacker.unpackInt(); + break; + default: + throw new IllegalArgumentException("Unexpected v1 span field id: " + fieldId); + } + } + + /** + * Reads a streaming string: either an inline literal (which is appended to the table) or an + * integer index into the table populated by earlier literals. + */ + public static String readStreamingString(MessageUnpacker unpacker, List stringTable) + throws IOException { + ValueType valueType = unpacker.getNextFormat().getValueType(); + if (valueType == ValueType.STRING) { + String value = unpacker.unpackString(); + stringTable.add(value); + return value; + } + if (valueType == ValueType.INTEGER) { + int index = unpacker.unpackInt(); + assertTrue(index >= 0 && index < stringTable.size(), "Invalid string-table index: " + index); + return stringTable.get(index); + } + throw new IllegalArgumentException("Expected v1 streaming string, got: " + valueType); + } + + public static long unpackUnsignedLong(MessageUnpacker unpacker) throws IOException { + if (unpacker.getNextFormat() == MessageFormat.UINT64) { + return DDSpanId.from(unpacker.unpackBigInteger().toString()); + } + return unpacker.unpackLong(); + } + + public static byte[] readBinary(MessageUnpacker unpacker) throws IOException { + byte[] bytes = new byte[unpacker.unpackBinaryHeader()]; + unpacker.readPayload(bytes); + return bytes; + } + + /** Encodes a trace id the same way {@link TraceMapperV1} serializes it (16 big-endian bytes). */ + public static byte[] traceIdBytes(DDTraceId traceId) { + return ByteBuffer.allocate(16) + .putLong(traceId.toHighOrderLong()) + .putLong(traceId.toLong()) + .array(); + } + + /** A decoded V1 span, exposing only the fields the tests assert on. */ + public static final class V1Span { + private final Map attributes; + private final List links; + private final List events; + + private V1Span( + Map attributes, List links, List events) { + this.attributes = attributes; + this.links = links; + this.events = events; + } + + public Map getAttributes() { + return attributes; + } + + public List getLinks() { + return links; + } + + public List getEvents() { + return events; + } + } + + /** A decoded V1 structured span link. */ + public static final class V1SpanLink { + private final byte[] traceId; + private final long spanId; + private final Map attributes; + private final String traceState; + private final long traceFlags; + + private V1SpanLink( + byte[] traceId, + long spanId, + Map attributes, + String traceState, + long traceFlags) { + this.traceId = traceId; + this.spanId = spanId; + this.attributes = attributes; + this.traceState = traceState; + this.traceFlags = traceFlags; + } + + public byte[] getTraceId() { + return traceId; + } + + public long getSpanId() { + return spanId; + } + + public Map getAttributes() { + return attributes; + } + + public String getTraceState() { + return traceState; + } + + public long getTraceFlags() { + return traceFlags; + } + } + + /** A decoded V1 structured span event. */ + public static final class V1SpanEvent { + private final long timeUnixNano; + private final String name; + private final Map attributes; + + private V1SpanEvent(long timeUnixNano, String name, Map attributes) { + this.timeUnixNano = timeUnixNano; + this.name = name; + this.attributes = attributes; + } + + public long getTimeUnixNano() { + return timeUnixNano; + } + + public String getName() { + return name; + } + + public Map getAttributes() { + return attributes; + } + } +} diff --git a/dd-trace-core/src/test/java/datadog/trace/core/DDSpanSerializationTest.java b/dd-trace-core/src/test/java/datadog/trace/core/DDSpanSerializationTest.java index cc27763caa3..f6f8f774ecf 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/DDSpanSerializationTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/DDSpanSerializationTest.java @@ -1,7 +1,12 @@ package datadog.trace.core; +import static datadog.trace.api.DDTags.SPAN_LINKS; import static datadog.trace.api.config.GeneralConfig.EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED; +import static datadog.trace.api.config.TracerConfig.TRACE_BAGGAGE_TAG_KEYS; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; import datadog.communication.serialization.ByteBufferConsumer; import datadog.communication.serialization.FlushingBuffer; @@ -13,12 +18,21 @@ import datadog.trace.api.ProcessTags; import datadog.trace.api.datastreams.NoopPathwayContext; import datadog.trace.api.sampling.PrioritySampling; +import datadog.trace.bootstrap.instrumentation.api.Baggage; +import datadog.trace.bootstrap.instrumentation.api.ProfilingContextIntegration; +import datadog.trace.bootstrap.instrumentation.api.SpanAttributes; import datadog.trace.common.writer.ListWriter; +import datadog.trace.common.writer.Payload; import datadog.trace.common.writer.ddagent.TraceMapperTestBridge; import datadog.trace.common.writer.ddagent.TraceMapperV0_4; import datadog.trace.common.writer.ddagent.TraceMapperV0_5; +import datadog.trace.common.writer.ddagent.TraceMapperV1; +import datadog.trace.common.writer.ddagent.V1PayloadReader; import datadog.trace.junit.utils.config.WithConfig; +import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.nio.ByteBuffer; +import java.nio.channels.Channels; import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -310,6 +324,75 @@ void serializeTraceWithBaggageAndTagsCorrectlyV05( tracer.close(); } + @TableTest({ + "scenario | injectBaggage", + "baggage enabled | true ", + "baggage disabled | false " + }) + @WithConfig(key = TRACE_BAGGAGE_TAG_KEYS, value = "user.id,custom") + void serializeTraceWithConfiguredBaggageAndTagsCorrectlyV1(String scenario, boolean injectBaggage) + throws Exception { + CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build(); + Map baggage = new HashMap<>(); + baggage.put("legacy-baggage", "legacy-value"); + + Map w3cBaggageItems = new HashMap<>(); + w3cBaggageItems.put("user.id", "user-1"); + w3cBaggageItems.put("custom", "custom-value"); + w3cBaggageItems.put("ignored", "ignored-value"); + + DDSpanContext context = + createSpanContext(tracer, baggage, Baggage.create(w3cBaggageItems), injectBaggage, true, 1); + context.setTag("span-tag", "span-value"); + DDSpan span = DDSpan.create("test", 0, context, null); + + V1PayloadReader.V1Span payload = V1PayloadReader.readFirstSpan(serializeV1Payload(span)); + Map attributes = payload.getAttributes(); + + assertEquals("span-value", attributes.get("span-tag")); + if (injectBaggage) { + assertEquals("legacy-value", attributes.get("legacy-baggage")); + assertEquals("user-1", attributes.get("baggage.user.id")); + assertEquals("custom-value", attributes.get("baggage.custom")); + } else { + assertFalse(attributes.containsKey("legacy-baggage")); + assertFalse(attributes.containsKey("baggage.user.id")); + assertFalse(attributes.containsKey("baggage.custom")); + } + assertFalse(attributes.containsKey("baggage.ignored")); + tracer.close(); + } + + @Test + void serializeTraceWithSpanLinksAsStructuredLinksOnlyV1() throws Exception { + CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build(); + DDSpanContext context = createSpanContext(tracer, Collections.emptyMap(), null, true, true, 0); + DDSpan span = DDSpan.create("test", 0, context, null); + + Map linkAttributes = new HashMap<>(); + linkAttributes.put("link.source", "unit-test"); + DDSpanLink link = + new DDSpanLink( + DDTraceId.fromHex("11223344556677889900aabbccddeeff"), + DDSpanId.fromHex("123456789abcdef0"), + (byte) 1, + "dd=s:1", + SpanAttributes.fromMap(linkAttributes)); + span.addLink(link); + + V1PayloadReader.V1Span payload = V1PayloadReader.readFirstSpan(serializeV1Payload(span)); + + assertFalse(payload.getAttributes().containsKey(SPAN_LINKS)); + assertEquals(1, payload.getLinks().size()); + V1PayloadReader.V1SpanLink actualLink = payload.getLinks().get(0); + assertArrayEquals(V1PayloadReader.traceIdBytes(link.traceId()), actualLink.getTraceId()); + assertEquals(link.spanId(), actualLink.getSpanId()); + assertEquals(link.traceState(), actualLink.getTraceState()); + assertEquals((long) (link.traceFlags() & 0xFF), actualLink.getTraceFlags()); + assertEquals("unit-test", actualLink.getAttributes().get("link.source")); + tracer.close(); + } + @Test void serializeTraceWithFlatMapTagV04() throws Exception { CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build(); @@ -486,6 +569,51 @@ private DDSpanContext createSpanContext( return ctx; } + private DDSpanContext createSpanContext( + CoreTracer tracer, + Map baggage, + Baggage w3cBaggage, + boolean injectBaggage, + boolean injectLinks, + int tagsSize) { + return new DDSpanContext( + DDTraceId.ONE, + 1, + DDSpanId.ZERO, + null, + null, + "fakeService", + "fakeOperation", + "fakeResource", + PrioritySampling.UNSET, + null, + baggage, + w3cBaggage, + false, + "fakeType", + tagsSize, + tracer.createTraceCollector(DDTraceId.ONE), + null, + null, + null, + NoopPathwayContext.INSTANCE, + false, + null, + ProfilingContextIntegration.NoOp.INSTANCE, + injectBaggage, + injectLinks); + } + + private static byte[] serializeV1Payload(DDSpan span) throws Exception { + TraceMapperV1 mapper = new TraceMapperV1(); + CapturePayloadBuffer capture = new CapturePayloadBuffer(mapper); + MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(1024, capture)); + packer.format(Collections.singletonList(span), mapper); + packer.flush(); + assertNotNull(capture.bytes); + return capture.bytes; + } + private static String[] buildDictionary(TraceMapperV0_5 mapper) throws Exception { GrowableBuffer dictionaryBuffer = TraceMapperTestBridge.getDictionary(mapper); Map encoding = TraceMapperTestBridge.getEncoding(mapper); @@ -497,4 +625,27 @@ private static String[] buildDictionary(TraceMapperV0_5 mapper) throws Exception } return dictionary; } + + private static final class CapturePayloadBuffer implements ByteBufferConsumer { + private final TraceMapperV1 mapper; + private byte[] bytes; + + private CapturePayloadBuffer(TraceMapperV1 mapper) { + this.mapper = mapper; + } + + @Override + public void accept(int messageCount, ByteBuffer buffer) { + ByteArrayOutputStream out = new ByteArrayOutputStream(); + try { + Payload payload = mapper.newPayload().withBody(messageCount, buffer); + payload.writeTo(Channels.newChannel(out)); + bytes = out.toByteArray(); + } catch (IOException e) { + throw new IllegalStateException(e); + } finally { + mapper.reset(); + } + } + } } diff --git a/dd-trace-core/src/traceAgentTest/groovy/TraceGenerator.groovy b/dd-trace-core/src/traceAgentTest/groovy/TraceGenerator.groovy index 8477ad00df3..a0c81cbd0cb 100644 --- a/dd-trace-core/src/traceAgentTest/groovy/TraceGenerator.groovy +++ b/dd-trace-core/src/traceAgentTest/groovy/TraceGenerator.groovy @@ -332,11 +332,6 @@ class TraceGenerator { consumer.accept(metadata) } - @Override - void processTagsAndBaggage(MetadataConsumer consumer, boolean injectLinksAsTags, boolean injectBaggageAsTags) { - consumer.accept(metadata) - } - @Override PojoSpan setSamplingPriority(int samplingPriority, int samplingMechanism) { return this From fe1861dda15d491193539b32cc4a4b18c1513e8a Mon Sep 17 00:00:00 2001 From: Jean-Philippe Bempel Date: Thu, 2 Jul 2026 18:02:15 +0200 Subject: [PATCH 126/139] mark flaky (#11842) mark flaky Co-authored-by: devflow.devflow-routing-intake --- .../datadog/smoketest/SpanDecorationProbesIntegrationTests.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanDecorationProbesIntegrationTests.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanDecorationProbesIntegrationTests.java index 93009c1a929..194000bccb1 100644 --- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanDecorationProbesIntegrationTests.java +++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanDecorationProbesIntegrationTests.java @@ -18,6 +18,7 @@ import com.datadog.debugger.probe.SpanDecorationProbe; import datadog.trace.bootstrap.debugger.EvaluationError; import datadog.trace.test.agent.decoder.DecodedSpan; +import datadog.trace.test.util.Flaky; import datadog.trace.test.util.NonRetryable; import java.nio.file.Path; import java.util.Arrays; @@ -79,6 +80,7 @@ void testMethodSimpleTagNoCondition() throws Exception { traceReceived::get, () -> String.format("timeout traceReceived=%s", traceReceived.get())); } + @Flaky @Test @DisplayName("testMethodMultiTagsMultiConditions") @DisabledIf( From 4190a5aada3c018f098572a75f068c7c2ac94e38 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Bempel Date: Thu, 2 Jul 2026 21:05:41 +0200 Subject: [PATCH 127/139] Add evalution timeout for expressions (#11741) Add evalution timeout for expressions Conditions and expression values (log templates and span decorations) are not capped by a timeout to avoid spending too much time for complex expressions. Refactor TimeoutChecker to be an interface. The former concrete class is now an interface with a static create(Config, Duration) factory that returns either CpuTimeoutChecker or WallTimeoutChecker based on a new config flag (DD_INTERNAL_DYNAMIC_INSTRUMENTATION_TIMEOUT_CHECKER_MODE). Wall clock time can be problematic in case of long GC pauses or sleep or constraint resource (container with less than a CPU). A cpu time driven timeout is more resilient for this. But by default we are using wall clock time for the time being and the cpu time is just an alternative. Refactor Expression evaluation API: All Expression/BooleanExpression implementations now accept a new EvalContext class that bundles ValueReferenceResolver + TimeoutChecker into a single context object. That way we can check the timeout in any expression. NB: for some special expressions (contains on strings or List) we have a per item count limit as we cannot introduce the timeout check for those invocations new config option for the evaluation timeout (DD_DYNAMIC_INSTRUMENTATION_EVALUATION_TIMEOUT), default is 50ms The ValueScript json serialization used for tests was revisited to use a visitor. Tests updated/added across all expression tests, plus new smoke test (LogProbesIntegrationTest) and a configurable TimeoutCheckerTest. fix CpuTimeoutChecker fix config options fix supported config update supported config Co-authored-by: jean-philippe.bempel --- .../debugger-bootstrap/build.gradle | 1 + .../bootstrap/debugger/DebuggerContext.java | 9 +- .../bootstrap/debugger/el/DebuggerScript.java | 4 +- .../debugger/util/CpuTimeoutChecker.java | 26 ++ .../debugger/util/TimeoutChecker.java | 34 +- .../debugger/util/WallTimeoutChecker.java | 37 +++ .../debugger/util/TimeoutCheckerTest.java | 53 ++- .../el/BooleanValueExpressionAdapter.java | 5 +- .../com/datadog/debugger/el/EvalContext.java | 23 ++ .../com/datadog/debugger/el/Expression.java | 4 +- .../java/com/datadog/debugger/el/Literal.java | 3 +- .../datadog/debugger/el/ProbeCondition.java | 7 +- .../com/datadog/debugger/el/ValueScript.java | 301 +++++++++++++++--- .../el/expressions/BinaryExpression.java | 6 +- .../el/expressions/BinaryOperator.java | 14 +- .../el/expressions/BooleanExpression.java | 6 +- .../CollectionExpressionHelper.java | 8 +- .../el/expressions/ComparisonExpression.java | 14 +- .../el/expressions/ContainsExpression.java | 21 +- .../el/expressions/ExpressionHelper.java | 41 +++ .../FilterCollectionExpression.java | 16 +- .../el/expressions/GetMemberExpression.java | 11 +- .../el/expressions/HasAllExpression.java | 16 +- .../el/expressions/HasAnyExpression.java | 16 +- .../el/expressions/IfElseExpression.java | 13 +- .../debugger/el/expressions/IfExpression.java | 11 +- .../el/expressions/IndexExpression.java | 10 +- .../el/expressions/IsDefinedExpression.java | 10 +- .../el/expressions/IsEmptyExpression.java | 16 +- .../el/expressions/LenExpression.java | 20 +- .../el/expressions/NotExpression.java | 10 +- .../StringPredicateExpression.java | 10 +- .../el/expressions/SubStringExpression.java | 12 +- .../el/expressions/ThenExpression.java | 4 +- .../el/expressions/ValueExpression.java | 6 +- .../el/expressions/ValueRefExpression.java | 11 +- .../el/expressions/WhenExpression.java | 6 +- .../datadog/debugger/el/values/ListValue.java | 14 +- .../datadog/debugger/el/values/MapValue.java | 4 +- .../datadog/debugger/el/values/SetValue.java | 4 +- .../el/BooleanValueExpressionAdapterTest.java | 12 +- ...lverHelper.java => EvalContextHelper.java} | 18 +- .../datadog/debugger/el/ExpressionTest.java | 16 +- .../debugger/el/ProbeConditionTest.java | 107 +++++-- .../datadog/debugger/el/ValueScriptTest.java | 37 ++- .../el/expressions/BinaryExpressionTest.java | 13 +- .../expressions/ComparisonExpressionTest.java | 24 +- .../expressions/ContainsExpressionTest.java | 81 +++-- .../expressions/EndsWithExpressionTest.java | 16 +- .../FilterCollectionExpressionTest.java | 126 +++++--- .../expressions/GetMemberExpressionTest.java | 21 +- .../el/expressions/HasAllExpressionTest.java | 147 ++++++--- .../el/expressions/HasAnyExpressionTest.java | 159 +++++---- .../el/expressions/IfElseExpressionTest.java | 12 +- .../el/expressions/IfExpressionTest.java | 13 +- .../el/expressions/IndexExpressionTest.java | 52 ++- .../expressions/IsDefinedExpressionTest.java | 51 ++- .../el/expressions/IsEmptyExpressionTest.java | 59 ++-- .../el/expressions/LenExpressionTest.java | 18 +- .../el/expressions/MatchesExpressionTest.java | 20 +- .../el/expressions/NotExpressionTest.java | 4 +- .../expressions/StartsWithExpressionTest.java | 16 +- .../expressions/SubStringExpressionTest.java | 18 +- .../expressions/ValueRefExpressionTest.java | 53 +-- .../test/resources/test_conditional_14.json | 3 +- .../test/resources/test_value_expr_01.json | 5 +- .../agent/JsonSnapshotSerializer.java | 4 +- .../debugger/agent/StringTemplateBuilder.java | 8 +- .../com/datadog/debugger/probe/LogProbe.java | 14 +- .../debugger/probe/SpanDecorationProbe.java | 8 +- .../datadog/debugger/probe/TriggerProbe.java | 6 +- .../debugger/util/MoshiSnapshotHelper.java | 14 +- .../debugger/util/SerializerWithLimits.java | 2 +- .../debugger/util/ValueScriptHelper.java | 6 +- .../agent/SnapshotSerializationTest.java | 9 +- .../debugger/el/ELIntegrationSanityTest.java | 9 +- .../debugger/util/StringTokenWriterTest.java | 4 +- .../debugger/DebuggerTestApplication.java | 17 + .../smoketest/LogProbesIntegrationTest.java | 71 +++++ .../smoketest/MoshiConfigTestHelper.java | 15 +- .../SpanDecorationProbesIntegrationTests.java | 2 + .../smoketest/SpanProbesIntegrationTest.java | 6 +- .../datadog/trace/api/ConfigDefaults.java | 2 + .../trace/api/config/DebuggerConfig.java | 6 + .../main/java/datadog/trace/api/Config.java | 25 +- metadata/supported-configurations.json | 18 +- 86 files changed, 1519 insertions(+), 665 deletions(-) create mode 100644 dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/CpuTimeoutChecker.java create mode 100644 dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/WallTimeoutChecker.java create mode 100644 dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/EvalContext.java rename dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/{RefResolverHelper.java => EvalContextHelper.java} (72%) diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/build.gradle b/dd-java-agent/agent-debugger/debugger-bootstrap/build.gradle index 3968a161e35..272c7b26f6f 100644 --- a/dd-java-agent/agent-debugger/debugger-bootstrap/build.gradle +++ b/dd-java-agent/agent-debugger/debugger-bootstrap/build.gradle @@ -14,4 +14,5 @@ dependencies { implementation libs.slf4j implementation libs.instrument.java implementation project(':internal-api') + testImplementation libs.bundles.mockito } diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/DebuggerContext.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/DebuggerContext.java index 70f1f8c0347..77ad82b864a 100644 --- a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/DebuggerContext.java +++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/DebuggerContext.java @@ -6,7 +6,6 @@ import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.lang.reflect.Method; import java.time.Duration; -import java.time.temporal.ChronoUnit; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -324,8 +323,8 @@ public static void evalContext( // snapshot if (needFreeze) { Duration timeout = - Duration.of(Config.get().getDynamicInstrumentationCaptureTimeout(), ChronoUnit.MILLIS); - context.freeze(new TimeoutChecker(timeout)); + Duration.ofMillis(Config.get().getDynamicInstrumentationCaptureTimeout()); + context.freeze(TimeoutChecker.create(Config.get(), timeout)); } } catch (Exception ex) { LOGGER.debug("Error in evalContext: ", ex); @@ -359,8 +358,8 @@ public static void evalContext( // snapshot if (needFreeze) { Duration timeout = - Duration.of(Config.get().getDynamicInstrumentationCaptureTimeout(), ChronoUnit.MILLIS); - context.freeze(new TimeoutChecker(timeout)); + Duration.ofMillis(Config.get().getDynamicInstrumentationCaptureTimeout()); + context.freeze(TimeoutChecker.create(Config.get(), timeout)); } } catch (Exception ex) { LOGGER.debug("Error in evalContext: ", ex); diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/el/DebuggerScript.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/el/DebuggerScript.java index c4949ef0cb6..b248b440ba4 100644 --- a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/el/DebuggerScript.java +++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/el/DebuggerScript.java @@ -1,10 +1,12 @@ package datadog.trace.bootstrap.debugger.el; +import datadog.trace.bootstrap.debugger.util.TimeoutChecker; + /** * A debugger EL script interface used for communication between the instrumented code and the * debugger EL.
    * Because it must be reachable from the instrumented code it must be placed in bootstrap. */ public interface DebuggerScript { - R execute(ValueReferenceResolver valueRefResolver); + R execute(ValueReferenceResolver valueRefResolver, TimeoutChecker timeoutChecker); } diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/CpuTimeoutChecker.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/CpuTimeoutChecker.java new file mode 100644 index 00000000000..42d082ee675 --- /dev/null +++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/CpuTimeoutChecker.java @@ -0,0 +1,26 @@ +package datadog.trace.bootstrap.debugger.util; + +import java.lang.management.ManagementFactory; +import java.lang.management.ThreadMXBean; +import java.time.Duration; + +public class CpuTimeoutChecker implements TimeoutChecker { + private final Duration timeOut; + private final ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean(); + private final long startCpuTime; + + public CpuTimeoutChecker(Duration timeout) { + this.timeOut = timeout; + startCpuTime = threadMXBean.getCurrentThreadCpuTime(); + } + + @Override + public boolean isTimedOut() { + return threadMXBean.getCurrentThreadCpuTime() - startCpuTime >= timeOut.toNanos(); + } + + @Override + public Duration getTimeOut() { + return timeOut; + } +} diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/TimeoutChecker.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/TimeoutChecker.java index f6451afe8c0..a49bb9d3208 100644 --- a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/TimeoutChecker.java +++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/TimeoutChecker.java @@ -1,33 +1,21 @@ package datadog.trace.bootstrap.debugger.util; +import datadog.trace.api.Config; import java.time.Duration; -import java.time.temporal.ChronoUnit; -public class TimeoutChecker { - public static final Duration DEFAULT_TIME_OUT = Duration.of(100, ChronoUnit.MILLIS); +public interface TimeoutChecker { - private final long start; - private final Duration timeOut; + String CPU = "CPU"; + String WALL = "WALL"; - public TimeoutChecker(Duration timeOut) { - this.start = System.currentTimeMillis(); - this.timeOut = timeOut; - } - - public TimeoutChecker(long start, Duration timeOut) { - this.start = start; - this.timeOut = timeOut; - } + boolean isTimedOut(); - public boolean isTimedOut(long currentTimeMillis) { - return (currentTimeMillis - start) > timeOut.toMillis(); - } - - public long getStart() { - return start; - } + Duration getTimeOut(); - public Duration getTimeOut() { - return timeOut; + static TimeoutChecker create(Config config, Duration timeout) { + if (config.getDynamicInstrumentationTimeoutCheckerMode().equals(CPU)) { + return new CpuTimeoutChecker(timeout); + } + return new WallTimeoutChecker(timeout); } } diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/WallTimeoutChecker.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/WallTimeoutChecker.java new file mode 100644 index 00000000000..1bc72b69c45 --- /dev/null +++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/WallTimeoutChecker.java @@ -0,0 +1,37 @@ +package datadog.trace.bootstrap.debugger.util; + +import java.time.Duration; + +public class WallTimeoutChecker implements TimeoutChecker { + + private final long start; + private final Duration timeOut; + + public WallTimeoutChecker(Duration timeOut) { + this.start = System.currentTimeMillis(); + this.timeOut = timeOut; + } + + public WallTimeoutChecker(long start, Duration timeOut) { + this.start = start; + this.timeOut = timeOut; + } + + public boolean isTimedOut(long currentTimeMillis) { + return (currentTimeMillis - start) > timeOut.toMillis(); + } + + @Override + public boolean isTimedOut() { + return isTimedOut(System.currentTimeMillis()); + } + + public long getStart() { + return start; + } + + @Override + public Duration getTimeOut() { + return timeOut; + } +} diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/test/java/datadog/trace/bootstrap/debugger/util/TimeoutCheckerTest.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/test/java/datadog/trace/bootstrap/debugger/util/TimeoutCheckerTest.java index 10cd94f9042..c3d23678da6 100644 --- a/dd-java-agent/agent-debugger/debugger-bootstrap/src/test/java/datadog/trace/bootstrap/debugger/util/TimeoutCheckerTest.java +++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/test/java/datadog/trace/bootstrap/debugger/util/TimeoutCheckerTest.java @@ -1,20 +1,55 @@ package datadog.trace.bootstrap.debugger.util; -import static datadog.trace.bootstrap.debugger.util.TimeoutChecker.DEFAULT_TIME_OUT; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; -import org.junit.jupiter.api.Assertions; +import datadog.trace.api.Config; +import java.time.Duration; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.locks.LockSupport; import org.junit.jupiter.api.Test; public class TimeoutCheckerTest { @Test - public void timedOut() { + public void wallTimedOut() { long start = System.currentTimeMillis(); + Duration timeout = Duration.ofMillis(100); // assume that start & timestamp captured in instance below are very close - TimeoutChecker timeoutChecker = new TimeoutChecker(DEFAULT_TIME_OUT); - Assertions.assertFalse(timeoutChecker.isTimedOut(start + 1)); - Assertions.assertTrue(timeoutChecker.isTimedOut(start + DEFAULT_TIME_OUT.toMillis() * 2)); - timeoutChecker = new TimeoutChecker(start, DEFAULT_TIME_OUT); - Assertions.assertFalse(timeoutChecker.isTimedOut(start + 1)); - Assertions.assertTrue(timeoutChecker.isTimedOut(start + DEFAULT_TIME_OUT.toMillis() * 2)); + WallTimeoutChecker timeoutChecker = new WallTimeoutChecker(timeout); + assertFalse(timeoutChecker.isTimedOut(start + 1)); + assertTrue(timeoutChecker.isTimedOut(start + timeout.toMillis() * 2)); + timeoutChecker = new WallTimeoutChecker(start, timeout); + assertFalse(timeoutChecker.isTimedOut(start + 1)); + assertTrue(timeoutChecker.isTimedOut(start + timeout.toMillis() * 2)); + } + + @Test + public void cpuTimedOut() { + CpuTimeoutChecker cpuTimeoutChecker = new CpuTimeoutChecker(Duration.ofMillis(1)); + LockSupport.parkNanos(TimeUnit.MILLISECONDS.toNanos(10)); // not consume cpu + assertFalse(cpuTimeoutChecker.isTimedOut()); + burnCpu(5_000_000); + assertTrue(cpuTimeoutChecker.isTimedOut()); + } + + static volatile int counter; + + private static void burnCpu(int iterations) { + for (int i = 0; i < iterations; i++) { + counter++; + } + } + + @Test + public void configTimeout() { + Config config = mock(Config.class); + when(config.getDynamicInstrumentationTimeoutCheckerMode()).thenReturn(TimeoutChecker.CPU); + assertInstanceOf(CpuTimeoutChecker.class, TimeoutChecker.create(config, Duration.ofMillis(50))); + when(config.getDynamicInstrumentationTimeoutCheckerMode()).thenReturn(TimeoutChecker.WALL); + assertInstanceOf( + WallTimeoutChecker.class, TimeoutChecker.create(config, Duration.ofMillis(50))); } } diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/BooleanValueExpressionAdapter.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/BooleanValueExpressionAdapter.java index c71c1b9b8de..e7986715e24 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/BooleanValueExpressionAdapter.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/BooleanValueExpressionAdapter.java @@ -3,7 +3,6 @@ import com.datadog.debugger.el.expressions.BooleanExpression; import com.datadog.debugger.el.expressions.ValueExpression; import com.datadog.debugger.el.values.BooleanValue; -import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver; public class BooleanValueExpressionAdapter implements ValueExpression { @@ -14,8 +13,8 @@ public BooleanValueExpressionAdapter(BooleanExpression booleanExpression) { } @Override - public BooleanValue evaluate(ValueReferenceResolver valueRefResolver) { - Boolean result = booleanExpression.evaluate(valueRefResolver); + public BooleanValue evaluate(EvalContext evalContext) { + Boolean result = booleanExpression.evaluate(evalContext); if (result == null) { throw new EvaluationException( "Boolean expression returning null", PrettyPrintVisitor.print(this)); diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/EvalContext.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/EvalContext.java new file mode 100644 index 00000000000..bd0ece583f2 --- /dev/null +++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/EvalContext.java @@ -0,0 +1,23 @@ +package com.datadog.debugger.el; + +import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver; +import datadog.trace.bootstrap.debugger.util.TimeoutChecker; + +public class EvalContext { + private final ValueReferenceResolver valueRefResolver; + private final TimeoutChecker timeoutChecker; + + public EvalContext( + final ValueReferenceResolver valueRefResolver, final TimeoutChecker timeoutChecker) { + this.valueRefResolver = valueRefResolver; + this.timeoutChecker = timeoutChecker; + } + + public ValueReferenceResolver getValueRefResolver() { + return valueRefResolver; + } + + public TimeoutChecker getTimeoutChecker() { + return timeoutChecker; + } +} diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/Expression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/Expression.java index f9d29f0687a..d9b7b2e766f 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/Expression.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/Expression.java @@ -1,11 +1,9 @@ package com.datadog.debugger.el; -import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver; - /** Represents any evaluable expression */ @FunctionalInterface public interface Expression { - ReturnType evaluate(ValueReferenceResolver valueRefResolver); + ReturnType evaluate(EvalContext evalContext); default R accept(Visitor visitor) { return null; diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/Literal.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/Literal.java index 6d5c8d2fca1..cfc3b9971d9 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/Literal.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/Literal.java @@ -1,7 +1,6 @@ package com.datadog.debugger.el; import com.datadog.debugger.el.expressions.ValueExpression; -import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver; import datadog.trace.bootstrap.debugger.el.Values; import java.util.Objects; @@ -27,7 +26,7 @@ public boolean isUndefined() { } @Override - public Value evaluate(ValueReferenceResolver valueRefResolver) { + public Value evaluate(EvalContext evalContext) { return this; } diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/ProbeCondition.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/ProbeCondition.java index f81c92a8b19..7ca052c2cab 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/ProbeCondition.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/ProbeCondition.java @@ -9,6 +9,7 @@ import com.squareup.moshi.JsonWriter; import datadog.trace.bootstrap.debugger.el.DebuggerScript; import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver; +import datadog.trace.bootstrap.debugger.util.TimeoutChecker; import java.io.IOException; import javax.annotation.Nonnull; @@ -99,12 +100,12 @@ public static ProbeCondition load(JsonReader reader) throws IOException { } @Override - public Boolean execute(ValueReferenceResolver valueRefResolver) { + public Boolean execute(ValueReferenceResolver valueRefResolver, TimeoutChecker timeoutChecker) { if (when == null) { return true; } - if (when.evaluate(valueRefResolver)) { - then.evaluate(valueRefResolver); + if (when.evaluate(new EvalContext(valueRefResolver, timeoutChecker))) { + then.evaluate(new EvalContext(valueRefResolver, timeoutChecker)); return true; } return false; diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/ValueScript.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/ValueScript.java index bcc940e1d5d..c446e0b12e5 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/ValueScript.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/ValueScript.java @@ -1,16 +1,43 @@ package com.datadog.debugger.el; +import com.datadog.debugger.el.expressions.BinaryExpression; +import com.datadog.debugger.el.expressions.BinaryOperator; +import com.datadog.debugger.el.expressions.BooleanExpression; +import com.datadog.debugger.el.expressions.ComparisonExpression; +import com.datadog.debugger.el.expressions.ComparisonOperator; +import com.datadog.debugger.el.expressions.ContainsExpression; +import com.datadog.debugger.el.expressions.EndsWithExpression; +import com.datadog.debugger.el.expressions.FilterCollectionExpression; import com.datadog.debugger.el.expressions.GetMemberExpression; +import com.datadog.debugger.el.expressions.HasAllExpression; +import com.datadog.debugger.el.expressions.HasAnyExpression; +import com.datadog.debugger.el.expressions.IfElseExpression; +import com.datadog.debugger.el.expressions.IfExpression; import com.datadog.debugger.el.expressions.IndexExpression; +import com.datadog.debugger.el.expressions.IsDefinedExpression; +import com.datadog.debugger.el.expressions.IsEmptyExpression; import com.datadog.debugger.el.expressions.LenExpression; +import com.datadog.debugger.el.expressions.MatchesExpression; +import com.datadog.debugger.el.expressions.NotExpression; +import com.datadog.debugger.el.expressions.StartsWithExpression; +import com.datadog.debugger.el.expressions.SubStringExpression; import com.datadog.debugger.el.expressions.ValueExpression; import com.datadog.debugger.el.expressions.ValueRefExpression; +import com.datadog.debugger.el.expressions.WhenExpression; +import com.datadog.debugger.el.values.BooleanValue; +import com.datadog.debugger.el.values.ListValue; +import com.datadog.debugger.el.values.MapValue; +import com.datadog.debugger.el.values.NullValue; +import com.datadog.debugger.el.values.NumericValue; +import com.datadog.debugger.el.values.ObjectValue; +import com.datadog.debugger.el.values.SetValue; import com.datadog.debugger.el.values.StringValue; import com.squareup.moshi.JsonAdapter; import com.squareup.moshi.JsonReader; import com.squareup.moshi.JsonWriter; import datadog.trace.bootstrap.debugger.el.DebuggerScript; import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver; +import datadog.trace.bootstrap.debugger.util.TimeoutChecker; import java.io.IOException; import java.util.Objects; import java.util.regex.Matcher; @@ -37,8 +64,8 @@ public ValueExpression getExpr() { } @Override - public Value execute(ValueReferenceResolver valueRefResolver) { - return expr.evaluate(valueRefResolver); + public Value execute(ValueReferenceResolver valueRefResolver, TimeoutChecker timeoutChecker) { + return expr.evaluate(new EvalContext(valueRefResolver, timeoutChecker)); } @Override @@ -127,46 +154,248 @@ public void toJson(JsonWriter jsonWriter, ValueScript value) throws IOException jsonWriter.name("dsl"); jsonWriter.value(value.dsl); jsonWriter.name("json"); - writeValueExpression(jsonWriter, value.expr); + ToJsonVisitor toJsonVisitor = new ToJsonVisitor(jsonWriter); + value.expr.accept(toJsonVisitor); jsonWriter.endObject(); } - private void writeValueExpression(JsonWriter jsonWriter, ValueExpression expr) - throws IOException { - if (expr instanceof Value) { - if (expr instanceof StringValue) { - jsonWriter.value(((StringValue) expr).getValue()); - } else { - throw new IOException("Unsupported operation: " + expr.getClass().getTypeName()); + private static class ToJsonVisitor implements Visitor { + private final JsonWriter jsonWriter; + + public ToJsonVisitor(JsonWriter jsonWriter) { + this.jsonWriter = jsonWriter; + } + + @Override + public Void visit(BinaryExpression binaryExpression) { + throw new UnsupportedOperationException("BinaryExpression is not supported"); + } + + @Override + public Void visit(BinaryOperator operator) { + throw new UnsupportedOperationException("BinaryOperator is not supported"); + } + + @Override + public Void visit(ComparisonExpression comparisonExpression) { + try { + jsonWriter.beginObject(); + comparisonExpression.getOperator().accept(this); + jsonWriter.beginArray(); + comparisonExpression.getLeft().accept(this); + comparisonExpression.getRight().accept(this); + jsonWriter.endArray(); + jsonWriter.endObject(); + } catch (IOException e) { + throw new RuntimeException(e); } - return; + return null; } - jsonWriter.beginObject(); - if (expr instanceof ValueRefExpression) { - ValueRefExpression valueRefExpr = (ValueRefExpression) expr; - jsonWriter.name("ref"); - jsonWriter.value(valueRefExpr.getSymbolName()); - } else if (expr instanceof GetMemberExpression) { - GetMemberExpression getMemberExpr = (GetMemberExpression) expr; - jsonWriter.name("getmember"); - jsonWriter.beginArray(); - writeValueExpression(jsonWriter, getMemberExpr.getTarget()); - jsonWriter.value(getMemberExpr.getMemberName()); - jsonWriter.endArray(); - } else if (expr instanceof LenExpression) { - jsonWriter.name("count"); - writeValueExpression(jsonWriter, ((LenExpression) expr).getSource()); - } else if (expr instanceof IndexExpression) { - IndexExpression idxExpr = (IndexExpression) expr; - jsonWriter.name("index"); - jsonWriter.beginArray(); - writeValueExpression(jsonWriter, idxExpr.getTarget()); - writeValueExpression(jsonWriter, idxExpr.getKey()); - jsonWriter.endArray(); - } else { - throw new IOException("Unsupported operation: " + expr.getClass().getTypeName()); + + @Override + public Void visit(ComparisonOperator operator) { + try { + jsonWriter.name(operator.name().toLowerCase()); + } catch (IOException e) { + throw new RuntimeException(e); + } + return null; + } + + @Override + public Void visit(ContainsExpression containsExpression) { + throw new UnsupportedOperationException("ContainsExpression is not supported"); + } + + @Override + public Void visit(EndsWithExpression endsWithExpression) { + throw new UnsupportedOperationException("EndsWithExpression is not supported"); + } + + @Override + public Void visit(FilterCollectionExpression filterCollectionExpression) { + try { + jsonWriter.beginObject(); + jsonWriter.name("filter"); + jsonWriter.beginArray(); + filterCollectionExpression.getSource().accept(this); + filterCollectionExpression.getFilterExpression().accept(this); + jsonWriter.endArray(); + jsonWriter.endObject(); + } catch (IOException e) { + throw new RuntimeException(e); + } + return null; + } + + @Override + public Void visit(HasAllExpression hasAllExpression) { + throw new UnsupportedOperationException("HasAllExpression is not supported"); + } + + @Override + public Void visit(HasAnyExpression hasAnyExpression) { + throw new UnsupportedOperationException("HasAnyExpression is not supported"); + } + + @Override + public Void visit(IfElseExpression ifElseExpression) { + throw new UnsupportedOperationException("IfElseExpression is not supported"); + } + + @Override + public Void visit(IfExpression ifExpression) { + throw new UnsupportedOperationException("IfExpression is not supported"); + } + + @Override + public Void visit(IsEmptyExpression isEmptyExpression) { + throw new UnsupportedOperationException("IsEmptyExpression is not supported"); + } + + @Override + public Void visit(IsDefinedExpression isDefinedExpression) { + throw new UnsupportedOperationException("IsDefinedExpression is not supported"); + } + + @Override + public Void visit(LenExpression lenExpression) { + try { + jsonWriter.beginObject(); + jsonWriter.name("count"); + lenExpression.getSource().accept(this); + jsonWriter.endObject(); + } catch (IOException e) { + throw new RuntimeException(e); + } + return null; + } + + @Override + public Void visit(MatchesExpression matchesExpression) { + throw new UnsupportedOperationException("MatchesExpression is not supported"); + } + + @Override + public Void visit(NotExpression notExpression) { + throw new UnsupportedOperationException("NotExpression is not supported"); + } + + @Override + public Void visit(StartsWithExpression startsWithExpression) { + throw new UnsupportedOperationException("StartsWithExpression is not supported"); + } + + @Override + public Void visit(SubStringExpression subStringExpression) { + throw new UnsupportedOperationException("SubStringExpression is not supported"); + } + + @Override + public Void visit(ValueRefExpression valueRefExpression) { + try { + jsonWriter.beginObject(); + jsonWriter.name("ref"); + jsonWriter.value(valueRefExpression.getSymbolName()); + jsonWriter.endObject(); + } catch (IOException e) { + throw new RuntimeException(e); + } + return null; + } + + @Override + public Void visit(GetMemberExpression getMemberExpression) { + try { + jsonWriter.beginObject(); + jsonWriter.name("getmember"); + jsonWriter.beginArray(); + getMemberExpression.getTarget().accept(this); + jsonWriter.value(getMemberExpression.getMemberName()); + jsonWriter.endArray(); + jsonWriter.endObject(); + } catch (IOException e) { + throw new RuntimeException(e); + } + return null; + } + + @Override + public Void visit(IndexExpression indexExpression) { + try { + jsonWriter.beginObject(); + jsonWriter.name("index"); + jsonWriter.beginArray(); + indexExpression.getTarget().accept(this); + indexExpression.getKey().accept(this); + jsonWriter.endArray(); + jsonWriter.endObject(); + } catch (IOException e) { + throw new RuntimeException(e); + } + return null; + } + + @Override + public Void visit(WhenExpression whenExpression) { + throw new UnsupportedOperationException("WhenExpression is not supported"); + } + + @Override + public Void visit(BooleanExpression booleanExpression) { + throw new UnsupportedOperationException("BooleanExpression is not supported"); + } + + @Override + public Void visit(ObjectValue objectValue) { + throw new UnsupportedOperationException("ObjectValue is not supported"); + } + + @Override + public Void visit(StringValue stringValue) { + try { + jsonWriter.value(stringValue.getValue()); + } catch (IOException e) { + throw new RuntimeException(e); + } + return null; + } + + @Override + public Void visit(NumericValue numericValue) { + try { + // TODO handle double + jsonWriter.value(numericValue.getValue().longValue()); + } catch (IOException e) { + throw new RuntimeException(e); + } + return null; + } + + @Override + public Void visit(BooleanValue booleanValue) { + throw new UnsupportedOperationException("BooleanValue is not supported"); + } + + @Override + public Void visit(NullValue nullValue) { + throw new UnsupportedOperationException("NullValue is not supported"); + } + + @Override + public Void visit(ListValue listValue) { + throw new UnsupportedOperationException("ListValue is not supported"); + } + + @Override + public Void visit(MapValue mapValue) { + throw new UnsupportedOperationException("MapValue is not supported"); + } + + @Override + public Void visit(SetValue setValue) { + throw new UnsupportedOperationException("SetValue is not supported"); } - jsonWriter.endObject(); } } } diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/BinaryExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/BinaryExpression.java index d4063ec5cd2..3c955d21b74 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/BinaryExpression.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/BinaryExpression.java @@ -1,7 +1,7 @@ package com.datadog.debugger.el.expressions; +import com.datadog.debugger.el.EvalContext; import com.datadog.debugger.el.Visitor; -import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver; /** * Takes two {@linkplain BooleanExpression} instances and combines them with the given {@link @@ -20,8 +20,8 @@ public BinaryExpression( } @Override - public Boolean evaluate(ValueReferenceResolver valueRefResolver) { - return operator.apply(left, right, valueRefResolver); + public Boolean evaluate(EvalContext evalContext) { + return operator.apply(left, right, evalContext); } @Override diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/BinaryOperator.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/BinaryOperator.java index ce5784b918b..3a1a7391d17 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/BinaryOperator.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/BinaryOperator.java @@ -1,21 +1,19 @@ package com.datadog.debugger.el.expressions; +import com.datadog.debugger.el.EvalContext; import com.datadog.debugger.el.Visitor; -import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver; public enum BinaryOperator { AND("&&") { @Override - public Boolean apply( - BooleanExpression left, BooleanExpression right, ValueReferenceResolver resolver) { - return left.evaluate(resolver) && right.evaluate(resolver); + public Boolean apply(BooleanExpression left, BooleanExpression right, EvalContext evalContext) { + return left.evaluate(evalContext) && right.evaluate(evalContext); } }, OR("||") { @Override - public Boolean apply( - BooleanExpression left, BooleanExpression right, ValueReferenceResolver resolver) { - return left.evaluate(resolver) || right.evaluate(resolver); + public Boolean apply(BooleanExpression left, BooleanExpression right, EvalContext evalContext) { + return left.evaluate(evalContext) || right.evaluate(evalContext); } }; @@ -26,7 +24,7 @@ public Boolean apply( } public abstract Boolean apply( - BooleanExpression left, BooleanExpression right, ValueReferenceResolver resolver); + BooleanExpression left, BooleanExpression right, EvalContext evalContext); public R accept(Visitor visitor) { return visitor.visit(this); diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/BooleanExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/BooleanExpression.java index 3ff97e2d890..2f98571f03b 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/BooleanExpression.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/BooleanExpression.java @@ -1,15 +1,15 @@ package com.datadog.debugger.el.expressions; +import com.datadog.debugger.el.EvalContext; import com.datadog.debugger.el.Expression; import com.datadog.debugger.el.Visitor; -import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver; /** A generic interface for expressions resolving to {@linkplain Boolean} */ public interface BooleanExpression extends Expression { BooleanExpression TRUE = new BooleanExpression() { @Override - public Boolean evaluate(ValueReferenceResolver valueRefResolver) { + public Boolean evaluate(EvalContext evalContext) { return Boolean.TRUE; } @@ -26,7 +26,7 @@ public R accept(Visitor visitor) { BooleanExpression FALSE = new BooleanExpression() { @Override - public Boolean evaluate(ValueReferenceResolver valueRefResolver) { + public Boolean evaluate(EvalContext evalContext) { return Boolean.FALSE; } diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/CollectionExpressionHelper.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/CollectionExpressionHelper.java index c811c82fa73..540008c6ea1 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/CollectionExpressionHelper.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/CollectionExpressionHelper.java @@ -2,13 +2,13 @@ import static com.datadog.debugger.el.PrettyPrintVisitor.print; +import com.datadog.debugger.el.EvalContext; import com.datadog.debugger.el.EvaluationException; import com.datadog.debugger.el.Expression; import com.datadog.debugger.el.Value; import com.datadog.debugger.el.values.ListValue; import com.datadog.debugger.el.values.MapValue; import com.datadog.debugger.el.values.SetValue; -import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver; import datadog.trace.bootstrap.debugger.util.WellKnownClasses; import java.util.List; import java.util.Map; @@ -34,14 +34,12 @@ public static void checkSupportedList(ListValue collection, Expression expres } public static Value evaluateTargetCollection( - ValueExpression collectionTarget, - Expression expression, - ValueReferenceResolver valueRefResolver) { + ValueExpression collectionTarget, Expression expression, EvalContext evalContext) { if (collectionTarget == null) { throw new EvaluationException( "Cannot evaluate the expression for null value", print(expression)); } - Value value = collectionTarget.evaluate(valueRefResolver); + Value value = collectionTarget.evaluate(evalContext); if (value.isUndefined()) { throw new EvaluationException( "Cannot evaluate the expression for undefined value", print(expression)); diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ComparisonExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ComparisonExpression.java index b595921d928..8a13febaad2 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ComparisonExpression.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ComparisonExpression.java @@ -1,10 +1,12 @@ package com.datadog.debugger.el.expressions; +import static com.datadog.debugger.el.expressions.ExpressionHelper.checkTimeout; + +import com.datadog.debugger.el.EvalContext; import com.datadog.debugger.el.EvaluationException; import com.datadog.debugger.el.PrettyPrintVisitor; import com.datadog.debugger.el.Value; import com.datadog.debugger.el.Visitor; -import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver; /** * Takes two {@linkplain ValueExpression} instances and compares them using the given {@link @@ -23,17 +25,19 @@ public ComparisonExpression( } @Override - public Boolean evaluate(ValueReferenceResolver valueRefResolver) { - Value leftValue = left.evaluate(valueRefResolver); + public Boolean evaluate(EvalContext evalContext) { + Value leftValue = left.evaluate(evalContext); if (leftValue.isUndefined()) { return Boolean.FALSE; } - Value rightValue = right.evaluate(valueRefResolver); + Value rightValue = right.evaluate(evalContext); if (rightValue.isUndefined()) { return Boolean.FALSE; } try { - return operator.apply(leftValue, rightValue); + boolean result = operator.apply(leftValue, rightValue); + checkTimeout(evalContext.getTimeoutChecker(), this); + return result; } catch (EvaluationException e) { throw new EvaluationException(e.getMessage(), PrettyPrintVisitor.print(this)); } diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ContainsExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ContainsExpression.java index d2fc6a62bbf..bde8654b551 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ContainsExpression.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ContainsExpression.java @@ -1,11 +1,14 @@ package com.datadog.debugger.el.expressions; +import static com.datadog.debugger.el.expressions.ExpressionHelper.checkStringLength; +import static com.datadog.debugger.el.expressions.ExpressionHelper.checkTimeout; + +import com.datadog.debugger.el.EvalContext; import com.datadog.debugger.el.EvaluationException; import com.datadog.debugger.el.PrettyPrintVisitor; import com.datadog.debugger.el.Value; import com.datadog.debugger.el.Visitor; import com.datadog.debugger.el.values.CollectionValue; -import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver; public class ContainsExpression implements BooleanExpression { private final ValueExpression target; @@ -17,8 +20,8 @@ public ContainsExpression(ValueExpression target, ValueExpression value) { } @Override - public Boolean evaluate(ValueReferenceResolver valueRefResolver) { - Value targetValue = target.evaluate(valueRefResolver); + public Boolean evaluate(EvalContext evalContext) { + Value targetValue = target.evaluate(evalContext); if (targetValue.isUndefined()) { throw new EvaluationException( "Cannot evaluate the expression for undefined value", PrettyPrintVisitor.print(this)); @@ -27,22 +30,28 @@ public Boolean evaluate(ValueReferenceResolver valueRefResolver) { throw new EvaluationException( "Cannot evaluate the expression for null value", PrettyPrintVisitor.print(this)); } - Value val = value.evaluate(valueRefResolver); + Value val = value.evaluate(evalContext); if (val.isUndefined()) { return false; } + boolean result; if (targetValue.getValue() instanceof String) { String targetStr = (String) targetValue.getValue(); if (val.getValue() instanceof String) { String valStr = (String) val.getValue(); - return targetStr.contains(valStr); + checkStringLength(valStr, this); + result = targetStr.contains(valStr); + checkTimeout(evalContext.getTimeoutChecker(), this); + return result; } throw new EvaluationException( "Cannot evaluate the expression for non-string value", PrettyPrintVisitor.print(this)); } if (targetValue instanceof CollectionValue) { try { - return ((CollectionValue) targetValue).contains(val); + result = ((CollectionValue) targetValue).contains(val); + checkTimeout(evalContext.getTimeoutChecker(), this); + return result; } catch (RuntimeException ex) { throw new EvaluationException(ex.getMessage(), PrettyPrintVisitor.print(this)); } diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ExpressionHelper.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ExpressionHelper.java index 43d5930dcb6..10b7a73911c 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ExpressionHelper.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ExpressionHelper.java @@ -1,13 +1,54 @@ package com.datadog.debugger.el.expressions; +import com.datadog.debugger.el.EvaluationException; import com.datadog.debugger.el.Expression; import com.datadog.debugger.el.PrettyPrintVisitor; import com.datadog.debugger.el.RedactedException; +import datadog.trace.bootstrap.debugger.util.TimeoutChecker; +import java.util.Collection; public class ExpressionHelper { + public static final int MAX_COLLECTION_ITEMS = 1_000_000; + public static final int MAX_ARRAY_ITEMS = 1_000_000; + public static final int MAX_STRING_LENGTH = 100_000_000; + public static void throwRedactedException(Expression expr) { String strExpr = PrettyPrintVisitor.print(expr); throw new RedactedException( "Could not evaluate the expression because '" + strExpr + "' was redacted", strExpr); } + + public static void checkTimeout(TimeoutChecker checker, Expression expr) { + if (checker.isTimedOut()) { + throw new EvaluationException( + "timeout (" + checker.getTimeOut().toMillis() + "ms)", PrettyPrintVisitor.print(expr)); + } + } + + public static void checkStringLength(String val, Expression expr) { + if (val == null) { + return; + } + if (val.length() > MAX_STRING_LENGTH) { + throw new EvaluationException( + "string too large (>" + MAX_STRING_LENGTH + ")", PrettyPrintVisitor.print(expr)); + } + } + + public static void checkCollectionSize(Collection collection, Expression expr) { + if (collection == null) { + return; + } + if (collection.size() > MAX_COLLECTION_ITEMS) { + throw new EvaluationException( + "Collection too large (>" + MAX_COLLECTION_ITEMS + ")", PrettyPrintVisitor.print(expr)); + } + } + + public static void checkArrayLength(int arrayLength, Expression expr) { + if (arrayLength > MAX_ARRAY_ITEMS) { + throw new EvaluationException( + "Array too large (>" + MAX_ARRAY_ITEMS + ")", PrettyPrintVisitor.print(expr)); + } + } } diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/FilterCollectionExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/FilterCollectionExpression.java index 5c3e27ee173..cd4c8ef1c89 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/FilterCollectionExpression.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/FilterCollectionExpression.java @@ -5,7 +5,9 @@ import static com.datadog.debugger.el.expressions.CollectionExpressionHelper.checkSupportedMap; import static com.datadog.debugger.el.expressions.CollectionExpressionHelper.checkSupportedSet; import static com.datadog.debugger.el.expressions.CollectionExpressionHelper.evaluateTargetCollection; +import static com.datadog.debugger.el.expressions.ExpressionHelper.checkTimeout; +import com.datadog.debugger.el.EvalContext; import com.datadog.debugger.el.EvaluationException; import com.datadog.debugger.el.Value; import com.datadog.debugger.el.Visitor; @@ -41,8 +43,9 @@ public FilterCollectionExpression(ValueExpression source, BooleanExpression f } @Override - public CollectionValue evaluate(ValueReferenceResolver valueRefResolver) { - Value collectionValue = evaluateTargetCollection(source, filterExpression, valueRefResolver); + public CollectionValue evaluate(EvalContext evalContext) { + Value collectionValue = evaluateTargetCollection(source, filterExpression, evalContext); + ValueReferenceResolver valueRefResolver = evalContext.getValueRefResolver(); if (collectionValue instanceof ListValue) { ListValue materialized = (ListValue) collectionValue; checkSupportedList(materialized, this); @@ -53,9 +56,10 @@ public CollectionValue evaluate(ValueReferenceResolver valueRefResolver) { Object value = materialized.get(i).getValue(); valueRefResolver.addExtension( ValueReferences.ITERATOR_EXTENSION_NAME, CapturedValue.of(value)); - if (filterExpression.evaluate(valueRefResolver)) { + if (filterExpression.evaluate(evalContext)) { filtered.add(value); } + checkTimeout(evalContext.getTimeoutChecker(), this); } } finally { valueRefResolver.removeExtension(ValueReferences.ITERATOR_EXTENSION_NAME); @@ -74,9 +78,10 @@ public CollectionValue evaluate(ValueReferenceResolver valueRefResolver) { valueRefResolver.addExtension( ValueReferences.ITERATOR_EXTENSION_NAME, CapturedValue.of(new MapValue.Entry(key, value))); - if (filterExpression.evaluate(valueRefResolver)) { + if (filterExpression.evaluate(evalContext)) { filtered.put(key.getValue(), value.getValue()); } + checkTimeout(evalContext.getTimeoutChecker(), this); } } finally { valueRefResolver.removeExtension(ValueReferences.KEY_EXTENSION_NAME); @@ -92,9 +97,10 @@ public CollectionValue evaluate(ValueReferenceResolver valueRefResolver) { for (Object value : setHolder) { valueRefResolver.addExtension( ValueReferences.ITERATOR_EXTENSION_NAME, CapturedValue.of(value)); - if (filterExpression.evaluate(valueRefResolver)) { + if (filterExpression.evaluate(evalContext)) { filtered.add(value); } + checkTimeout(evalContext.getTimeoutChecker(), this); } } finally { valueRefResolver.removeExtension(ValueReferences.ITERATOR_EXTENSION_NAME); diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/GetMemberExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/GetMemberExpression.java index 45609979894..bfcfe6ee826 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/GetMemberExpression.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/GetMemberExpression.java @@ -1,5 +1,8 @@ package com.datadog.debugger.el.expressions; +import static com.datadog.debugger.el.expressions.ExpressionHelper.checkTimeout; + +import com.datadog.debugger.el.EvalContext; import com.datadog.debugger.el.EvaluationException; import com.datadog.debugger.el.Generated; import com.datadog.debugger.el.PrettyPrintVisitor; @@ -7,7 +10,6 @@ import com.datadog.debugger.el.ValueType; import com.datadog.debugger.el.Visitor; import datadog.trace.bootstrap.debugger.CapturedContext; -import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver; import datadog.trace.bootstrap.debugger.util.Redaction; import java.util.Objects; @@ -21,14 +23,14 @@ public GetMemberExpression(ValueExpression target, String memberName) { } @Override - public Value evaluate(ValueReferenceResolver valueRefResolver) { - Value targetValue = target.evaluate(valueRefResolver); + public Value evaluate(EvalContext evalContext) { + Value targetValue = target.evaluate(evalContext); if (targetValue == Value.undefined()) { return targetValue; } CapturedContext.CapturedValue member; try { - member = valueRefResolver.getMember(targetValue.getValue(), memberName); + member = evalContext.getValueRefResolver().getMember(targetValue.getValue(), memberName); } catch (RuntimeException ex) { throw new EvaluationException(ex.getMessage(), PrettyPrintVisitor.print(this), ex); } @@ -41,6 +43,7 @@ public Value evaluate(ValueReferenceResolver valueRefResolver) { || Redaction.isRedactedType(memberValue.getClass().getTypeName()))) { ExpressionHelper.throwRedactedException(this); } + checkTimeout(evalContext.getTimeoutChecker(), this); return Value.of(member.getValue(), ValueType.of(member.getType())); } diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/HasAllExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/HasAllExpression.java index 6e2c449343f..90bba2f6165 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/HasAllExpression.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/HasAllExpression.java @@ -5,7 +5,9 @@ import static com.datadog.debugger.el.expressions.CollectionExpressionHelper.checkSupportedMap; import static com.datadog.debugger.el.expressions.CollectionExpressionHelper.checkSupportedSet; import static com.datadog.debugger.el.expressions.CollectionExpressionHelper.evaluateTargetCollection; +import static com.datadog.debugger.el.expressions.ExpressionHelper.checkTimeout; +import com.datadog.debugger.el.EvalContext; import com.datadog.debugger.el.EvaluationException; import com.datadog.debugger.el.Value; import com.datadog.debugger.el.Visitor; @@ -30,8 +32,9 @@ public HasAllExpression(ValueExpression valueExpression, BooleanExpression fi } @Override - public Boolean evaluate(ValueReferenceResolver valueRefResolver) { - Value value = evaluateTargetCollection(valueExpression, this, valueRefResolver); + public Boolean evaluate(EvalContext evalContext) { + Value value = evaluateTargetCollection(valueExpression, this, evalContext); + ValueReferenceResolver valueRefResolver = evalContext.getValueRefResolver(); if (value instanceof ListValue) { ListValue collection = (ListValue) value; checkSupportedList(collection, this); @@ -44,9 +47,10 @@ public Boolean evaluate(ValueReferenceResolver valueRefResolver) { for (int i = 0; i < len; i++) { valueRefResolver.addExtension( ValueReferences.ITERATOR_EXTENSION_NAME, CapturedValue.of(collection.get(i))); - if (!filterPredicateExpression.evaluate(valueRefResolver)) { + if (!filterPredicateExpression.evaluate(evalContext)) { return Boolean.FALSE; } + checkTimeout(evalContext.getTimeoutChecker(), this); } return Boolean.TRUE; } finally { @@ -69,9 +73,10 @@ public Boolean evaluate(ValueReferenceResolver valueRefResolver) { valueRefResolver.addExtension( ValueReferences.ITERATOR_EXTENSION_NAME, CapturedValue.of(new MapValue.Entry(key, val))); - if (!filterPredicateExpression.evaluate(valueRefResolver)) { + if (!filterPredicateExpression.evaluate(evalContext)) { return Boolean.FALSE; } + checkTimeout(evalContext.getTimeoutChecker(), this); } return Boolean.TRUE; } finally { @@ -91,9 +96,10 @@ public Boolean evaluate(ValueReferenceResolver valueRefResolver) { for (Object val : setHolder) { valueRefResolver.addExtension( ValueReferences.ITERATOR_EXTENSION_NAME, CapturedValue.of(val)); - if (!filterPredicateExpression.evaluate(valueRefResolver)) { + if (!filterPredicateExpression.evaluate(evalContext)) { return Boolean.FALSE; } + checkTimeout(evalContext.getTimeoutChecker(), this); } return Boolean.TRUE; } finally { diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/HasAnyExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/HasAnyExpression.java index 23c3dea831f..7de0e110dfa 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/HasAnyExpression.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/HasAnyExpression.java @@ -5,7 +5,9 @@ import static com.datadog.debugger.el.expressions.CollectionExpressionHelper.checkSupportedMap; import static com.datadog.debugger.el.expressions.CollectionExpressionHelper.checkSupportedSet; import static com.datadog.debugger.el.expressions.CollectionExpressionHelper.evaluateTargetCollection; +import static com.datadog.debugger.el.expressions.ExpressionHelper.checkTimeout; +import com.datadog.debugger.el.EvalContext; import com.datadog.debugger.el.EvaluationException; import com.datadog.debugger.el.Value; import com.datadog.debugger.el.Visitor; @@ -31,8 +33,9 @@ public HasAnyExpression( } @Override - public Boolean evaluate(ValueReferenceResolver valueRefResolver) { - Value value = evaluateTargetCollection(valueExpression, this, valueRefResolver); + public Boolean evaluate(EvalContext evalContext) { + Value value = evaluateTargetCollection(valueExpression, this, evalContext); + ValueReferenceResolver valueRefResolver = evalContext.getValueRefResolver(); if (value instanceof ListValue) { ListValue collection = (ListValue) value; checkSupportedList(collection, this); @@ -45,9 +48,10 @@ public Boolean evaluate(ValueReferenceResolver valueRefResolver) { for (int i = 0; i < len; i++) { valueRefResolver.addExtension( ValueReferences.ITERATOR_EXTENSION_NAME, CapturedValue.of(collection.get(i))); - if (filterPredicateExpression.evaluate(valueRefResolver)) { + if (filterPredicateExpression.evaluate(evalContext)) { return Boolean.TRUE; } + checkTimeout(evalContext.getTimeoutChecker(), this); } return Boolean.FALSE; @@ -72,9 +76,10 @@ public Boolean evaluate(ValueReferenceResolver valueRefResolver) { valueRefResolver.addExtension( ValueReferences.ITERATOR_EXTENSION_NAME, CapturedValue.of(new MapValue.Entry(key, val))); - if (filterPredicateExpression.evaluate(valueRefResolver)) { + if (filterPredicateExpression.evaluate(evalContext)) { return Boolean.TRUE; } + checkTimeout(evalContext.getTimeoutChecker(), this); } return Boolean.FALSE; } catch (IllegalArgumentException | UnsupportedOperationException ex) { @@ -95,9 +100,10 @@ public Boolean evaluate(ValueReferenceResolver valueRefResolver) { for (Object val : setHolder) { valueRefResolver.addExtension( ValueReferences.ITERATOR_EXTENSION_NAME, CapturedValue.of(val)); - if (filterPredicateExpression.evaluate(valueRefResolver)) { + if (filterPredicateExpression.evaluate(evalContext)) { return Boolean.TRUE; } + checkTimeout(evalContext.getTimeoutChecker(), this); } return Boolean.FALSE; } catch (IllegalArgumentException | UnsupportedOperationException ex) { diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/IfElseExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/IfElseExpression.java index cdd18689b11..1914b3a9a47 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/IfElseExpression.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/IfElseExpression.java @@ -1,8 +1,10 @@ package com.datadog.debugger.el.expressions; +import static com.datadog.debugger.el.expressions.ExpressionHelper.checkTimeout; + +import com.datadog.debugger.el.EvalContext; import com.datadog.debugger.el.Expression; import com.datadog.debugger.el.Visitor; -import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver; /** TODO: Primordial support for 'debugger watches' support */ public final class IfElseExpression implements Expression { @@ -18,12 +20,13 @@ public IfElseExpression( } @Override - public Void evaluate(ValueReferenceResolver valueRefResolver) { - if (test.evaluate(valueRefResolver)) { - thenExpression.evaluate(valueRefResolver); + public Void evaluate(EvalContext evalContext) { + if (test.evaluate(evalContext)) { + thenExpression.evaluate(evalContext); } else { - elseExpression.evaluate(valueRefResolver); + elseExpression.evaluate(evalContext); } + checkTimeout(evalContext.getTimeoutChecker(), this); return null; } diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/IfExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/IfExpression.java index d799b01c3b5..cce1e53aedd 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/IfExpression.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/IfExpression.java @@ -1,8 +1,10 @@ package com.datadog.debugger.el.expressions; +import static com.datadog.debugger.el.expressions.ExpressionHelper.checkTimeout; + +import com.datadog.debugger.el.EvalContext; import com.datadog.debugger.el.Expression; import com.datadog.debugger.el.Visitor; -import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver; /** TODO: Primordial support for 'debugger watches' support */ public final class IfExpression implements Expression { @@ -15,10 +17,11 @@ public IfExpression(BooleanExpression test, Expression expression) { } @Override - public Void evaluate(ValueReferenceResolver valueRefResolver) { - if (test.evaluate(valueRefResolver)) { - expression.evaluate(valueRefResolver); + public Void evaluate(EvalContext evalContext) { + if (test.evaluate(evalContext)) { + expression.evaluate(evalContext); } + checkTimeout(evalContext.getTimeoutChecker(), this); return null; } diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/IndexExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/IndexExpression.java index 9992286b0fa..8c718eb282d 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/IndexExpression.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/IndexExpression.java @@ -2,14 +2,15 @@ import static com.datadog.debugger.el.expressions.CollectionExpressionHelper.checkSupportedList; import static com.datadog.debugger.el.expressions.CollectionExpressionHelper.checkSupportedMap; +import static com.datadog.debugger.el.expressions.ExpressionHelper.checkTimeout; +import com.datadog.debugger.el.EvalContext; import com.datadog.debugger.el.EvaluationException; import com.datadog.debugger.el.PrettyPrintVisitor; import com.datadog.debugger.el.Value; import com.datadog.debugger.el.Visitor; import com.datadog.debugger.el.values.ListValue; import com.datadog.debugger.el.values.MapValue; -import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver; import datadog.trace.bootstrap.debugger.util.Redaction; public class IndexExpression implements ValueExpression> { @@ -23,8 +24,8 @@ public IndexExpression(ValueExpression target, ValueExpression key) { } @Override - public Value evaluate(ValueReferenceResolver valueRefResolver) { - Value targetValue = target.evaluate(valueRefResolver); + public Value evaluate(EvalContext evalContext) { + Value targetValue = target.evaluate(evalContext); if (targetValue.isUndefined()) { throw new EvaluationException( "Cannot evaluate the expression for undefined value", PrettyPrintVisitor.print(this)); @@ -34,7 +35,7 @@ public Value evaluate(ValueReferenceResolver valueRefResolver) { "Cannot evaluate the expression for null value", PrettyPrintVisitor.print(this)); } Value result = Value.undefinedValue(); - Value keyValue = key.evaluate(valueRefResolver); + Value keyValue = key.evaluate(evalContext); if (keyValue == Value.undefined()) { return result; } @@ -65,6 +66,7 @@ public Value evaluate(ValueReferenceResolver valueRefResolver) { if (obj != null && Redaction.isRedactedType(obj.getClass().getTypeName())) { ExpressionHelper.throwRedactedException(this); } + checkTimeout(evalContext.getTimeoutChecker(), this); return Value.of(result.getValue(), result.getType()); } diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/IsDefinedExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/IsDefinedExpression.java index 5bada175eb4..27da03e06ae 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/IsDefinedExpression.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/IsDefinedExpression.java @@ -1,9 +1,11 @@ package com.datadog.debugger.el.expressions; +import static com.datadog.debugger.el.expressions.ExpressionHelper.checkTimeout; + +import com.datadog.debugger.el.EvalContext; import com.datadog.debugger.el.EvaluationException; import com.datadog.debugger.el.Value; import com.datadog.debugger.el.Visitor; -import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver; /** Check whether a {@linkplain Value} was resolved correctly or symbol exists.
    */ public class IsDefinedExpression implements BooleanExpression { @@ -14,15 +16,17 @@ public IsDefinedExpression(ValueExpression valueExpression) { } @Override - public Boolean evaluate(ValueReferenceResolver valueRefResolver) { + public Boolean evaluate(EvalContext evalContext) { if (valueExpression == null) { return Boolean.FALSE; } try { - Value value = valueExpression.evaluate(valueRefResolver); + Value value = valueExpression.evaluate(evalContext); return value.isUndefined() ? Boolean.FALSE : Boolean.TRUE; } catch (EvaluationException ex) { return Boolean.FALSE; + } finally { + checkTimeout(evalContext.getTimeoutChecker(), this); } } diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/IsEmptyExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/IsEmptyExpression.java index 066aee72abc..1c4b43eef51 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/IsEmptyExpression.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/IsEmptyExpression.java @@ -1,12 +1,14 @@ package com.datadog.debugger.el.expressions; +import static com.datadog.debugger.el.expressions.ExpressionHelper.checkTimeout; + +import com.datadog.debugger.el.EvalContext; import com.datadog.debugger.el.EvaluationException; import com.datadog.debugger.el.PrettyPrintVisitor; import com.datadog.debugger.el.Value; import com.datadog.debugger.el.Visitor; import com.datadog.debugger.el.values.CollectionValue; import com.datadog.debugger.el.values.StringValue; -import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver; /** * Checks whether a {@linkplain Value} is empty.
    @@ -20,8 +22,8 @@ public IsEmptyExpression(ValueExpression valueExpression) { } @Override - public Boolean evaluate(ValueReferenceResolver valueRefResolver) { - Value value = valueExpression.evaluate(valueRefResolver); + public Boolean evaluate(EvalContext evalContext) { + Value value = valueExpression.evaluate(evalContext); if (value.isUndefined()) { throw new EvaluationException( "Cannot evaluate the expression for undefined value", PrettyPrintVisitor.print(this)); @@ -30,12 +32,14 @@ public Boolean evaluate(ValueReferenceResolver valueRefResolver) { throw new EvaluationException( "Cannot evaluate the expression for null value", PrettyPrintVisitor.print(this)); } + boolean result = false; if (value instanceof CollectionValue) { - return ((CollectionValue) value).isEmpty(); + result = ((CollectionValue) value).isEmpty(); } else if (value instanceof StringValue) { - return ((StringValue) value).isEmpty(); + result = ((StringValue) value).isEmpty(); } - return Boolean.FALSE; + checkTimeout(evalContext.getTimeoutChecker(), this); + return result; } @Override diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/LenExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/LenExpression.java index aee603c4779..3033d693cf1 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/LenExpression.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/LenExpression.java @@ -1,5 +1,8 @@ package com.datadog.debugger.el.expressions; +import static com.datadog.debugger.el.expressions.ExpressionHelper.checkTimeout; + +import com.datadog.debugger.el.EvalContext; import com.datadog.debugger.el.EvaluationException; import com.datadog.debugger.el.PrettyPrintVisitor; import com.datadog.debugger.el.Value; @@ -8,7 +11,6 @@ import com.datadog.debugger.el.values.CollectionValue; import com.datadog.debugger.el.values.NumericValue; import com.datadog.debugger.el.values.StringValue; -import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,23 +30,27 @@ public LenExpression(ValueExpression source) { } @Override - public Value evaluate(ValueReferenceResolver valueRefResolver) { - Value materialized = source == null ? Value.nullValue() : source.evaluate(valueRefResolver); + public Value evaluate(EvalContext evalContext) { + Value materialized = source == null ? Value.nullValue() : source.evaluate(evalContext); + Value result = Value.undefined(); try { if (materialized.isNull()) { throw new RuntimeException("Cannot evaluate the expression for null value"); } else if (materialized.isUndefined()) { throw new RuntimeException("Cannot evaluate the expression for undefined value"); } else if (materialized instanceof StringValue) { - return (NumericValue) Value.of(((StringValue) materialized).length(), ValueType.INT); + result = (NumericValue) Value.of(((StringValue) materialized).length(), ValueType.INT); } else if (materialized instanceof CollectionValue) { - return (NumericValue) Value.of(((CollectionValue) materialized).count(), ValueType.INT); + result = (NumericValue) Value.of(((CollectionValue) materialized).count(), ValueType.INT); + } else { + throw new RuntimeException( + "Cannot evaluate the expression for " + materialized.getClass().getTypeName()); } } catch (RuntimeException ex) { throw new EvaluationException(ex.getMessage(), PrettyPrintVisitor.print(this)); } - log.warn("Can not compute length for {}", materialized); - return Value.undefined(); + checkTimeout(evalContext.getTimeoutChecker(), this); + return result; } public ValueExpression getSource() { diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/NotExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/NotExpression.java index 6c71a7cc240..5cf8fad7607 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/NotExpression.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/NotExpression.java @@ -1,7 +1,9 @@ package com.datadog.debugger.el.expressions; +import static com.datadog.debugger.el.expressions.ExpressionHelper.checkTimeout; + +import com.datadog.debugger.el.EvalContext; import com.datadog.debugger.el.Visitor; -import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver; /** Will negate the resolved {@linkplain BooleanExpression} */ public final class NotExpression implements BooleanExpression { @@ -12,8 +14,10 @@ public NotExpression(BooleanExpression predicate) { } @Override - public Boolean evaluate(ValueReferenceResolver valueRefResolver) { - return !predicate.evaluate(valueRefResolver); + public Boolean evaluate(EvalContext evalContext) { + boolean result = !predicate.evaluate(evalContext); + checkTimeout(evalContext.getTimeoutChecker(), this); + return result; } @Override diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/StringPredicateExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/StringPredicateExpression.java index 05d59b50b3c..efb1a4f3269 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/StringPredicateExpression.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/StringPredicateExpression.java @@ -1,10 +1,10 @@ package com.datadog.debugger.el.expressions; +import com.datadog.debugger.el.EvalContext; import com.datadog.debugger.el.EvaluationException; import com.datadog.debugger.el.PrettyPrintVisitor; import com.datadog.debugger.el.Value; import com.datadog.debugger.el.values.StringValue; -import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver; import java.util.function.BiPredicate; public class StringPredicateExpression implements BooleanExpression { @@ -25,9 +25,9 @@ public StringPredicateExpression( } @Override - public Boolean evaluate(ValueReferenceResolver valueRefResolver) { + public Boolean evaluate(EvalContext evalContext) { Value sourceValue = - sourceString != null ? sourceString.evaluate(valueRefResolver) : Value.nullValue(); + sourceString != null ? sourceString.evaluate(evalContext) : Value.nullValue(); if (sourceValue.isUndefined()) { throw new EvaluationException( "Cannot evaluate the expression for undefined value", PrettyPrintVisitor.print(this)); @@ -38,7 +38,9 @@ public Boolean evaluate(ValueReferenceResolver valueRefResolver) { } if (sourceValue.getValue() instanceof String) { String sourceStr = (String) sourceValue.getValue(); - return predicate.test(sourceStr, str.getValue()); + boolean result = predicate.test(sourceStr, str.getValue()); + ExpressionHelper.checkTimeout(evalContext.getTimeoutChecker(), this); + return result; } return Boolean.FALSE; } diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/SubStringExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/SubStringExpression.java index c50e01271c9..40e7d258e33 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/SubStringExpression.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/SubStringExpression.java @@ -1,11 +1,13 @@ package com.datadog.debugger.el.expressions; +import static com.datadog.debugger.el.expressions.ExpressionHelper.checkTimeout; + +import com.datadog.debugger.el.EvalContext; import com.datadog.debugger.el.EvaluationException; import com.datadog.debugger.el.PrettyPrintVisitor; import com.datadog.debugger.el.Value; import com.datadog.debugger.el.ValueType; import com.datadog.debugger.el.Visitor; -import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver; public class SubStringExpression implements ValueExpression> { private final ValueExpression source; @@ -19,8 +21,8 @@ public SubStringExpression(ValueExpression source, int startIndex, int endInd } @Override - public Value evaluate(ValueReferenceResolver valueRefResolver) { - Value sourceValue = source != null ? source.evaluate(valueRefResolver) : Value.nullValue(); + public Value evaluate(EvalContext evalContext) { + Value sourceValue = source != null ? source.evaluate(evalContext) : Value.nullValue(); if (sourceValue.isUndefined()) { throw new EvaluationException( "Cannot evaluate the expression for undefined value", PrettyPrintVisitor.print(this)); @@ -31,7 +33,9 @@ public Value evaluate(ValueReferenceResolver valueRefResolver) { } if (sourceValue.getValue() instanceof String) { String sourceStr = (String) sourceValue.getValue(); - return internalEvaluate(sourceStr); + Value result = internalEvaluate(sourceStr); + checkTimeout(evalContext.getTimeoutChecker(), this); + return result; } return Value.undefined(); } diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ThenExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ThenExpression.java index 024109a5f58..e75b02fc701 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ThenExpression.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ThenExpression.java @@ -1,12 +1,12 @@ package com.datadog.debugger.el.expressions; +import com.datadog.debugger.el.EvalContext; import com.datadog.debugger.el.Value; -import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver; /** TODO: Primordial support for 'debugger watches' support */ public final class ThenExpression implements ValueExpression> { @Override - public Value evaluate(ValueReferenceResolver valueRefResolver) { + public Value evaluate(EvalContext evalContext) { // TODO: This can be used to implement 'add watch' functionality where the script can amend the // collected snapshot return null; diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ValueExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ValueExpression.java index 22d8e782a7d..5c43935555c 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ValueExpression.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ValueExpression.java @@ -1,8 +1,8 @@ package com.datadog.debugger.el.expressions; +import com.datadog.debugger.el.EvalContext; import com.datadog.debugger.el.Expression; import com.datadog.debugger.el.Value; -import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver; /** * A generic interface for expressions resolving to {@linkplain Value} @@ -13,7 +13,7 @@ public interface ValueExpression> extends Expression { ValueExpression NULL = new ValueExpression>() { @Override - public Value evaluate(ValueReferenceResolver valueRefResolver) { + public Value evaluate(EvalContext evalContext) { return Value.nullValue(); } @@ -26,7 +26,7 @@ public String toString() { ValueExpression UNDEFINED = new ValueExpression>() { @Override - public Value evaluate(ValueReferenceResolver valueRefResolver) { + public Value evaluate(EvalContext evalContext) { return Value.undefinedValue(); } diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ValueRefExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ValueRefExpression.java index fa36ef9f15f..1b14838e167 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ValueRefExpression.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/ValueRefExpression.java @@ -1,7 +1,10 @@ package com.datadog.debugger.el.expressions; +import static com.datadog.debugger.el.expressions.ExpressionHelper.checkTimeout; +import static com.datadog.debugger.el.expressions.ExpressionHelper.throwRedactedException; import static datadog.trace.bootstrap.debugger.util.Redaction.REDACTED_VALUE; +import com.datadog.debugger.el.EvalContext; import com.datadog.debugger.el.EvaluationException; import com.datadog.debugger.el.Generated; import com.datadog.debugger.el.PrettyPrintVisitor; @@ -9,7 +12,6 @@ import com.datadog.debugger.el.ValueType; import com.datadog.debugger.el.Visitor; import datadog.trace.bootstrap.debugger.CapturedContext; -import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver; import datadog.trace.bootstrap.debugger.util.Redaction; import java.util.Objects; @@ -22,18 +24,19 @@ public ValueRefExpression(String symbolName) { } @Override - public Value evaluate(ValueReferenceResolver valueRefResolver) { + public Value evaluate(EvalContext evalContext) { CapturedContext.CapturedValue symbol; try { - symbol = valueRefResolver.lookup(symbolName); + symbol = evalContext.getValueRefResolver().lookup(symbolName); } catch (RuntimeException ex) { throw new EvaluationException(ex.getMessage(), PrettyPrintVisitor.print(this)); } if (symbol != null) { String typeName = symbol.getType(); if (symbol.getValue() == REDACTED_VALUE || (Redaction.isRedactedType(typeName))) { - ExpressionHelper.throwRedactedException(this); + throwRedactedException(this); } + checkTimeout(evalContext.getTimeoutChecker(), this); return Value.of(symbol.getValue(), ValueType.of(symbol.getType())); } return Value.nullValue(); diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/WhenExpression.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/WhenExpression.java index 8ad9b0ad491..60f0b3cfb77 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/WhenExpression.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/WhenExpression.java @@ -1,7 +1,7 @@ package com.datadog.debugger.el.expressions; +import com.datadog.debugger.el.EvalContext; import com.datadog.debugger.el.Visitor; -import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver; /** The entry-point expression for the debugger EL */ public final class WhenExpression implements BooleanExpression { @@ -12,8 +12,8 @@ public WhenExpression(BooleanExpression expression) { } @Override - public Boolean evaluate(ValueReferenceResolver valueRefResolver) { - return expression.evaluate(valueRefResolver); + public Boolean evaluate(EvalContext evalContext) { + return expression.evaluate(evalContext); } @Override diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/ListValue.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/ListValue.java index d0c3dcffc63..8c9ce5fbb87 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/ListValue.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/ListValue.java @@ -1,10 +1,13 @@ package com.datadog.debugger.el.values; +import static com.datadog.debugger.el.expressions.ExpressionHelper.checkArrayLength; +import static com.datadog.debugger.el.expressions.ExpressionHelper.checkCollectionSize; + +import com.datadog.debugger.el.EvalContext; import com.datadog.debugger.el.Value; import com.datadog.debugger.el.ValueType; import com.datadog.debugger.el.Visitor; import com.datadog.debugger.el.expressions.ValueExpression; -import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver; import datadog.trace.bootstrap.debugger.el.Values; import datadog.trace.bootstrap.debugger.util.WellKnownClasses; import java.lang.reflect.Array; @@ -134,14 +137,17 @@ public Value get(int index) { @Override public boolean contains(Value val) { if (listHolder instanceof Collection) { - if (WellKnownClasses.isSafe((Collection) listHolder)) { - return ((Collection) listHolder).contains(val.isNull() ? null : val.getValue()); + Collection collection = (Collection) listHolder; + if (WellKnownClasses.isSafe(collection)) { + checkCollectionSize(collection, this); + return collection.contains(val.isNull() ? null : val.getValue()); } throw new UnsupportedOperationException( "Unsupported Collection class: " + listHolder.getClass().getTypeName()); } if (arrayHolder != null) { int count = Array.getLength(arrayHolder); + checkArrayLength(count, this); if (arrayType.isPrimitive()) { if (val.getValue() == null || val.isNull()) { throw new IllegalArgumentException("Cannot compare null with primitive array"); @@ -255,7 +261,7 @@ public Object getValue() { } @Override - public ListValue evaluate(ValueReferenceResolver valueRefResolver) { + public ListValue evaluate(EvalContext evalContext) { return this; } diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/MapValue.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/MapValue.java index c06680aa56e..05778531c82 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/MapValue.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/MapValue.java @@ -1,10 +1,10 @@ package com.datadog.debugger.el.values; +import com.datadog.debugger.el.EvalContext; import com.datadog.debugger.el.Value; import com.datadog.debugger.el.ValueType; import com.datadog.debugger.el.Visitor; import com.datadog.debugger.el.expressions.ValueExpression; -import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver; import datadog.trace.bootstrap.debugger.el.Values; import datadog.trace.bootstrap.debugger.util.WellKnownClasses; import java.util.Collections; @@ -144,7 +144,7 @@ public Object getValue() { } @Override - public MapValue evaluate(ValueReferenceResolver valueRefResolver) { + public MapValue evaluate(EvalContext evalContext) { return this; } diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/SetValue.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/SetValue.java index 07651471858..9654c1b99c8 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/SetValue.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/values/SetValue.java @@ -1,10 +1,10 @@ package com.datadog.debugger.el.values; +import com.datadog.debugger.el.EvalContext; import com.datadog.debugger.el.Value; import com.datadog.debugger.el.ValueType; import com.datadog.debugger.el.Visitor; import com.datadog.debugger.el.expressions.ValueExpression; -import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver; import datadog.trace.bootstrap.debugger.el.Values; import datadog.trace.bootstrap.debugger.util.WellKnownClasses; import java.util.Collection; @@ -25,7 +25,7 @@ public SetValue(Object object) { } @Override - public SetValue evaluate(ValueReferenceResolver valueRefResolver) { + public SetValue evaluate(EvalContext evalContext) { return this; } diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/BooleanValueExpressionAdapterTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/BooleanValueExpressionAdapterTest.java index 3b793ecb1d6..01a09dd6569 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/BooleanValueExpressionAdapterTest.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/BooleanValueExpressionAdapterTest.java @@ -1,10 +1,10 @@ package com.datadog.debugger.el; +import static com.datadog.debugger.el.EvalContextHelper.createEvalContext; import static org.junit.jupiter.api.Assertions.*; import com.datadog.debugger.el.expressions.BooleanExpression; import com.datadog.debugger.el.values.BooleanValue; -import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver; import org.junit.jupiter.api.Test; class BooleanValueExpressionAdapterTest { @@ -29,20 +29,14 @@ public void testLiteral() { public void testExpression() { BooleanValueExpressionAdapter booleanValueExpressionAdapter = new BooleanValueExpressionAdapter(DSL.eq(DSL.value(1), DSL.value(1))); - BooleanValue resultValue = booleanValueExpressionAdapter.evaluate(null); + BooleanValue resultValue = booleanValueExpressionAdapter.evaluate(createEvalContext(this)); assertTrue(resultValue.getValue()); } @Test public void testNull() { BooleanValueExpressionAdapter booleanValueExpressionAdapter = - new BooleanValueExpressionAdapter( - new BooleanExpression() { - @Override - public Boolean evaluate(ValueReferenceResolver valueRefResolver) { - return null; - } - }); + new BooleanValueExpressionAdapter(evalContext -> null); EvaluationException ex = assertThrows(EvaluationException.class, () -> booleanValueExpressionAdapter.evaluate(null)); assertEquals("Boolean expression returning null", ex.getMessage()); diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/RefResolverHelper.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/EvalContextHelper.java similarity index 72% rename from dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/RefResolverHelper.java rename to dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/EvalContextHelper.java index 88b33231c3f..9df06537c7e 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/RefResolverHelper.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/EvalContextHelper.java @@ -1,11 +1,27 @@ package com.datadog.debugger.el; +import datadog.trace.api.Config; import datadog.trace.bootstrap.debugger.CapturedContext; import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver; import datadog.trace.bootstrap.debugger.util.Redaction; +import datadog.trace.bootstrap.debugger.util.TimeoutChecker; +import java.time.Duration; import java.util.*; -public class RefResolverHelper { +public class EvalContextHelper { + + public static final Duration TEST_TIMEOUT = Duration.ofMillis(1000); + + public static EvalContext createEvalContext(Object instance) { + // create a higher timeout for test to avoid flakiness + return new EvalContext( + createResolver(instance), TimeoutChecker.create(Config.get(), TEST_TIMEOUT)); + } + + // specify lower timeout to test timeout checker + public static EvalContext createEvalContext(Object instance, Duration timeout) { + return new EvalContext(createResolver(instance), TimeoutChecker.create(Config.get(), timeout)); + } public static ValueReferenceResolver createResolver(Object instance) { CapturedContext.CapturedValue thisValue = diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/ExpressionTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/ExpressionTest.java index f88cf81e472..de75a00713f 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/ExpressionTest.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/ExpressionTest.java @@ -1,6 +1,7 @@ package com.datadog.debugger.el; import static com.datadog.debugger.el.DSL.*; +import static com.datadog.debugger.el.EvalContextHelper.createEvalContext; import static com.datadog.debugger.el.PrettyPrintVisitor.print; import static org.junit.jupiter.api.Assertions.*; @@ -9,7 +10,6 @@ import com.datadog.debugger.el.values.NumericValue; import com.datadog.debugger.el.values.StringValue; import datadog.trace.bootstrap.debugger.CapturedContext; -import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver; import java.util.stream.Stream; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -21,7 +21,7 @@ class ExpressionTest { @MethodSource("literalExpressions") void testLiteralExpressions(Literal literal, Object expectedValue) { Value value1 = literal.evaluate(null); - Value value2 = literal.evaluate(new CapturedContext()); + Value value2 = literal.evaluate(new EvalContext(new CapturedContext(), null)); assertNotNull(value1); assertNotNull(value2); @@ -43,16 +43,16 @@ void testPredicateExpression() { StringValue string = new StringValue("Hello World"); StringValue emptyString = new StringValue(""); - ValueReferenceResolver resolver = new CapturedContext(); + EvalContext evalContext = createEvalContext(this); IsEmptyExpression isEmpty1 = new IsEmptyExpression(string); IsEmptyExpression isEmpty2 = new IsEmptyExpression(emptyString); - assertFalse(isEmpty1.evaluate(resolver)); - assertTrue(isEmpty2.evaluate(resolver)); + assertFalse(isEmpty1.evaluate(evalContext)); + assertTrue(isEmpty2.evaluate(evalContext)); - assertTrue(not(isEmpty1).evaluate(resolver)); - assertTrue(or(isEmpty1, isEmpty2).evaluate(resolver)); - assertFalse(and(isEmpty1, isEmpty2).evaluate(resolver)); + assertTrue(not(isEmpty1).evaluate(evalContext)); + assertTrue(or(isEmpty1, isEmpty2).evaluate(evalContext)); + assertFalse(and(isEmpty1, isEmpty2).evaluate(evalContext)); } @Test diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/ProbeConditionTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/ProbeConditionTest.java index 8d6f8a3eae3..50ba2590b2a 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/ProbeConditionTest.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/ProbeConditionTest.java @@ -10,7 +10,11 @@ import com.squareup.moshi.JsonAdapter; import com.squareup.moshi.Moshi; +import datadog.trace.api.Config; +import datadog.trace.bootstrap.debugger.el.ReflectiveFieldValueResolver; import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver; +import datadog.trace.bootstrap.debugger.util.Redaction; +import datadog.trace.bootstrap.debugger.util.TimeoutChecker; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; @@ -28,12 +32,22 @@ import java.util.UUID; import java.util.stream.Collectors; import okio.Okio; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; public class ProbeConditionTest { + private static final Duration TEST_TIMEOUT = Duration.ofMillis(500); // used in testExecuteCondition private int field = 10; + @BeforeAll + static void beforeAll() { + // Warming up here for first call, to avoid reaching timeout when evaluating + Redaction.isRedactedKeyword("strList"); + ReflectiveFieldValueResolver.getFieldAsCapturedValue( + ProbeConditionTest.class, new ProbeConditionTest(), "field"); + } + @Test void testExecuteCondition() throws Exception { ProbeCondition probeCondition = loadFromResource("/test_conditional_01.json"); @@ -42,17 +56,17 @@ class Obj1 { private int field = 10; List field2 = new ArrayList<>(); } - ValueReferenceResolver ctx = RefResolverHelper.createResolver(new Obj1()); + ValueReferenceResolver ctx = EvalContextHelper.createResolver(new Obj1()); - assertTrue(probeCondition.execute(ctx)); + assertTrue(probeCondition.execute(ctx, TimeoutChecker.create(Config.get(), TEST_TIMEOUT))); class Obj2 { Collection tags = Arrays.asList("hey", "world", "ko"); private int field = 10; List field2 = new ArrayList<>(); } - ValueReferenceResolver ctx2 = RefResolverHelper.createResolver(new Obj2()); - assertFalse(probeCondition.execute(ctx2)); + ValueReferenceResolver ctx2 = EvalContextHelper.createResolver(new Obj2()); + assertFalse(probeCondition.execute(ctx2, TimeoutChecker.create(Config.get(), TEST_TIMEOUT))); } @Test @@ -62,18 +76,20 @@ class Obj { Container container = new Container("hello"); } ValueReferenceResolver ctx = - RefResolverHelper.createResolver( + EvalContextHelper.createResolver( singletonMap("this", new Obj()), singletonMap("container", new Container("world"))); - assertTrue(probeCondition.execute(ctx)); + assertTrue(probeCondition.execute(ctx, TimeoutChecker.create(Config.get(), TEST_TIMEOUT))); class Obj2 { Container obj = new Container("hello"); } ValueReferenceResolver ctx2 = - RefResolverHelper.createResolver( + EvalContextHelper.createResolver( singletonMap("this", new Obj2()), singletonMap("container", new Container("world"))); RuntimeException runtimeException = - assertThrows(RuntimeException.class, () -> probeCondition.execute(ctx2)); + assertThrows( + RuntimeException.class, + () -> probeCondition.execute(ctx2, TimeoutChecker.create(Config.get(), TEST_TIMEOUT))); assertEquals("Cannot dereference field: container", runtimeException.getMessage()); } @@ -84,8 +100,8 @@ class Obj { int intField1 = 42; String strField = "foo"; } - ValueReferenceResolver ctx = RefResolverHelper.createResolver(new Obj()); - assertTrue(probeCondition.execute(ctx)); + ValueReferenceResolver ctx = EvalContextHelper.createResolver(new Obj()); + assertTrue(probeCondition.execute(ctx, TimeoutChecker.create(Config.get(), TEST_TIMEOUT))); } @Test @@ -95,9 +111,9 @@ class Obj { Object objField = new Object(); } ValueReferenceResolver ctx = - RefResolverHelper.createResolver( + EvalContextHelper.createResolver( singletonMap("this", new Obj()), singletonMap("nullField", null)); - assertTrue(probeCondition.execute(ctx)); + assertTrue(probeCondition.execute(ctx, TimeoutChecker.create(Config.get(), TEST_TIMEOUT))); } @Test @@ -116,8 +132,8 @@ class Obj { int idx = 1; } - ValueReferenceResolver ctx = RefResolverHelper.createResolver(new Obj()); - assertTrue(probeCondition.execute(ctx)); + ValueReferenceResolver ctx = EvalContextHelper.createResolver(new Obj()); + assertTrue(probeCondition.execute(ctx, TimeoutChecker.create(Config.get(), TEST_TIMEOUT))); } @Test @@ -126,8 +142,8 @@ void testStringOperation() throws Exception { class Obj { String strField = "foobar"; } - ValueReferenceResolver ctx = RefResolverHelper.createResolver(new Obj()); - assertTrue(probeCondition.execute(ctx)); + ValueReferenceResolver ctx = EvalContextHelper.createResolver(new Obj()); + assertTrue(probeCondition.execute(ctx, TimeoutChecker.create(Config.get(), TEST_TIMEOUT))); } @Test @@ -148,10 +164,10 @@ void testJsonParsing() throws IOException { class Obj { Collection vets = Arrays.asList("vet1", "vet2", "vet3"); } - ValueReferenceResolver ctx = RefResolverHelper.createResolver(new Obj()); + ValueReferenceResolver ctx = EvalContextHelper.createResolver(new Obj()); // the condition checks if length of vets > 2 - assertTrue(probeCondition.execute(ctx)); + assertTrue(probeCondition.execute(ctx, TimeoutChecker.create(Config.get(), TEST_TIMEOUT))); } @Test @@ -191,9 +207,11 @@ void redaction() throws IOException { ProbeCondition probeCondition = loadFromResource("/test_conditional_09.json"); Map args = new HashMap<>(); args.put("password", "secret123"); - ValueReferenceResolver ctx = RefResolverHelper.createResolver(args, null); + ValueReferenceResolver ctx = EvalContextHelper.createResolver(args, null); EvaluationException evaluationException = - assertThrows(EvaluationException.class, () -> probeCondition.execute(ctx)); + assertThrows( + EvaluationException.class, + () -> probeCondition.execute(ctx, TimeoutChecker.create(Config.get(), TEST_TIMEOUT))); assertEquals( "Could not evaluate the expression because 'password' was redacted", evaluationException.getMessage()); @@ -207,8 +225,8 @@ void primitives() throws IOException { args.put("duration", Duration.ofSeconds(42)); args.put("clazz", "foo".getClass()); args.put("now", new Date(1700000000000L)); // 2023-11-14T00:00:00Z - ValueReferenceResolver ctx = RefResolverHelper.createResolver(args, null); - assertTrue(probeCondition.execute(ctx)); + ValueReferenceResolver ctx = EvalContextHelper.createResolver(args, null); + assertTrue(probeCondition.execute(ctx, TimeoutChecker.create(Config.get(), TEST_TIMEOUT))); } @Test @@ -222,8 +240,8 @@ class Obj { Set emptySet = new HashSet<>(); Object[] emptyArray = new Object[0]; } - ValueReferenceResolver ctx = RefResolverHelper.createResolver(new Obj()); - assertTrue(probeCondition.execute(ctx)); + ValueReferenceResolver ctx = EvalContextHelper.createResolver(new Obj()); + assertTrue(probeCondition.execute(ctx, TimeoutChecker.create(Config.get(), TEST_TIMEOUT))); } @Test @@ -238,16 +256,24 @@ class Obj { Object objVal = null; char charVal = 'a'; } - ValueReferenceResolver ctx = RefResolverHelper.createResolver(new Obj()); - assertTrue(probeCondition.execute(ctx)); + ValueReferenceResolver ctx = EvalContextHelper.createResolver(new Obj()); + assertTrue(probeCondition.execute(ctx, TimeoutChecker.create(Config.get(), TEST_TIMEOUT))); } @Test - void testLenCount() throws Exception { + void testTimeoutAndLenCount() throws Exception { ProbeCondition probeCondition = loadFromResource("/test_conditional_14.json"); class Obj { int[] intArray = new int[] {1, 1, 1}; String[] strArray = new String[] {"foo", "bar"}; + List largeList = new ArrayList<>(); + + { + for (int i = 0; i < 1_000; i++) { + largeList.add("foobar" + i); + } + } + Map strMap = new HashMap<>(); { @@ -267,8 +293,18 @@ class Obj { strList.add("foo"); } } - ValueReferenceResolver ctx = RefResolverHelper.createResolver(new Obj()); - assertTrue(probeCondition.execute(ctx)); + Obj obj = new Obj(); + ValueReferenceResolver ctx = EvalContextHelper.createResolver(obj); + // first call is longer so ideal to test timeout + EvaluationException evaluationException = + assertThrows( + EvaluationException.class, + () -> + probeCondition.execute( + ctx, TimeoutChecker.create(Config.get(), Duration.ofMillis(1)))); + assertEquals("timeout (1ms)", evaluationException.getMessage()); + // test good execution + assertTrue(probeCondition.execute(ctx, TimeoutChecker.create(Config.get(), TEST_TIMEOUT))); } @Test @@ -278,9 +314,11 @@ class Obj { } List lines = loadLinesFromResource("/null_expressions.txt"); for (String line : lines) { - ValueReferenceResolver ctx = RefResolverHelper.createResolver(new Obj()); + ValueReferenceResolver ctx = EvalContextHelper.createResolver(new Obj()); EvaluationException ex = - assertThrows(EvaluationException.class, () -> load(line).execute(ctx)); + assertThrows( + EvaluationException.class, + () -> load(line).execute(ctx, TimeoutChecker.create(Config.get(), TEST_TIMEOUT))); assertEquals("Cannot evaluate the expression for null value", ex.getMessage(), line); } } @@ -299,11 +337,14 @@ class Obj { } List lines = loadLinesFromResource("/contains_expressions.txt"); for (String line : lines) { - ValueReferenceResolver ctx = RefResolverHelper.createResolver(new Obj()); - assertTrue(load(line).execute(ctx)); + ValueReferenceResolver ctx = EvalContextHelper.createResolver(new Obj()); + assertTrue(load(line).execute(ctx, TimeoutChecker.create(Config.get(), TEST_TIMEOUT))); } } + @Test + public void timeoutExpressions() {} + private static ProbeCondition loadFromResource(String resourcePath) throws IOException { InputStream input = ProbeConditionTest.class.getResourceAsStream(resourcePath); Moshi moshi = diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/ValueScriptTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/ValueScriptTest.java index eefbca9956a..fccf05ffeb7 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/ValueScriptTest.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/ValueScriptTest.java @@ -1,13 +1,19 @@ package com.datadog.debugger.el; +import static com.datadog.debugger.el.EvalContextHelper.createResolver; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import com.squareup.moshi.Moshi; +import datadog.trace.api.Config; import datadog.trace.bootstrap.debugger.el.Values; +import datadog.trace.bootstrap.debugger.util.TimeoutChecker; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import java.time.Duration; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -15,22 +21,43 @@ import org.junit.jupiter.api.Test; public class ValueScriptTest { + private static final Duration TEST_TIMEOUT = Duration.ofMinutes(500); static class Obj { String str = "hello"; int i = 10; List list = Arrays.asList("a", "b", "c"); + List largeList = new ArrayList<>(); long l = 100_000_000_000L; float f = 2.5F; double d = 3.14D; char c = 'a'; + + { + for (int i = 0; i < 5_000; i++) { + largeList.add("hello" + i); + } + } } @Test public void predicates() { ValueScript valueScript = loadFromResource("/test_value_expr_01.json"); + // first call is longer so ideal to test timeout + EvaluationException evaluationException = + assertThrows( + EvaluationException.class, + () -> + valueScript.execute( + createResolver(new Obj()), + TimeoutChecker.create(Config.get(), Duration.ofMillis(1)))); + assertEquals("timeout (1ms)", evaluationException.getMessage()); + // test good execution assertEquals( - Boolean.TRUE, valueScript.execute(RefResolverHelper.createResolver(new Obj())).getValue()); + Boolean.TRUE, + valueScript + .execute(createResolver(new Obj()), TimeoutChecker.create(Config.get(), TEST_TIMEOUT)) + .getValue()); } @Test @@ -40,7 +67,9 @@ public void topLevelPredicates() { ValueScript valueScript = load(line); assertEquals( Boolean.TRUE, - valueScript.execute(RefResolverHelper.createResolver(new Obj())).getValue(), + valueScript + .execute(createResolver(new Obj()), TimeoutChecker.create(Config.get(), TEST_TIMEOUT)) + .getValue(), line); } } @@ -77,7 +106,9 @@ public void topLevelPrimitives() { ValueScript valueScript = load(line); assertEquals( expectedValues[i], - valueScript.execute(RefResolverHelper.createResolver(new Obj())).getValue(), + valueScript + .execute(createResolver(new Obj()), TimeoutChecker.create(Config.get(), TEST_TIMEOUT)) + .getValue(), line); i++; } diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/BinaryExpressionTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/BinaryExpressionTest.java index 8faaf61d48a..ef6de51409f 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/BinaryExpressionTest.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/BinaryExpressionTest.java @@ -1,20 +1,23 @@ package com.datadog.debugger.el.expressions; +import static com.datadog.debugger.el.EvalContextHelper.createEvalContext; import static com.datadog.debugger.el.PrettyPrintVisitor.print; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import com.datadog.debugger.el.RefResolverHelper; +import com.datadog.debugger.el.EvalContext; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; class BinaryExpressionTest { + EvalContext evalContext = createEvalContext(this); + @Test void testLeftNull() { BinaryExpression expression = new BinaryExpression(null, BooleanExpression.TRUE, BinaryOperator.AND); - assertFalse(expression.evaluate(RefResolverHelper.createResolver(this))); + assertFalse(expression.evaluate(evalContext)); assertEquals("false && true", print(expression)); } @@ -22,7 +25,7 @@ void testLeftNull() { void testRightNull() { BinaryExpression expression = new BinaryExpression(BooleanExpression.TRUE, null, BinaryOperator.AND); - assertFalse(expression.evaluate(RefResolverHelper.createResolver(this))); + assertFalse(expression.evaluate(evalContext)); assertEquals("true && false", print(expression)); } @@ -33,7 +36,7 @@ void testShortCircuitAnd() { BooleanExpression.FALSE, valueRefResolver -> Assertions.fail("should not reach"), BinaryOperator.AND); - assertFalse(expression.evaluate(RefResolverHelper.createResolver(this))); + assertFalse(expression.evaluate(evalContext)); assertEquals("false && null", print(expression)); } @@ -44,7 +47,7 @@ void testShortCircuitOr() { BooleanExpression.TRUE, valueRefResolver -> Assertions.fail("should not reach"), BinaryOperator.OR); - assertTrue(expression.evaluate(RefResolverHelper.createResolver(this))); + assertTrue(expression.evaluate(evalContext)); assertEquals("true || null", print(expression)); } } diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/ComparisonExpressionTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/ComparisonExpressionTest.java index d2b2e1cd8c4..28ac3425f3e 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/ComparisonExpressionTest.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/ComparisonExpressionTest.java @@ -1,5 +1,6 @@ package com.datadog.debugger.el.expressions; +import static com.datadog.debugger.el.EvalContextHelper.createEvalContext; import static com.datadog.debugger.el.PrettyPrintVisitor.print; import static com.datadog.debugger.el.ValueType.DOUBLE; import static com.datadog.debugger.el.ValueType.FLOAT; @@ -14,6 +15,7 @@ import static com.datadog.debugger.el.expressions.ComparisonOperator.LT; import static org.junit.jupiter.api.Assertions.*; +import com.datadog.debugger.el.EvalContext; import com.datadog.debugger.el.EvaluationException; import com.datadog.debugger.el.values.NumericValue; import com.datadog.debugger.el.values.ObjectValue; @@ -41,7 +43,7 @@ void evaluateOperator( boolean expected, String prettyPrint) { ComparisonExpression expression = new ComparisonExpression(left, right, operator); - assertEquals(expected, expression.evaluate(NoopResolver.INSTANCE)); + assertEquals(expected, expression.evaluate(createEvalContext(NoopResolver.INSTANCE))); assertEquals(prettyPrint, print(expression)); } @@ -243,7 +245,7 @@ void evaluateOperatorStrings( boolean expected, String prettyPrint) { ComparisonExpression expression = new ComparisonExpression(left, right, operator); - assertEquals(expected, expression.evaluate(NoopResolver.INSTANCE)); + assertEquals(expected, expression.evaluate(createEvalContext(NoopResolver.INSTANCE))); assertEquals(prettyPrint, print(expression)); } @@ -273,35 +275,35 @@ private static Stream expressionStrs() { void evaluateSecondUndefined() { ComparisonExpression expression = new ComparisonExpression(new NumericValue(1, INT), ValueExpression.UNDEFINED, EQ); - assertFalse(expression.evaluate(NoopResolver.INSTANCE)); + assertFalse(expression.evaluate(new EvalContext(NoopResolver.INSTANCE, null))); } @Test void evaluateBothUndefined() { ComparisonExpression expression = new ComparisonExpression(ValueExpression.UNDEFINED, ValueExpression.UNDEFINED, EQ); - assertFalse(expression.evaluate(NoopResolver.INSTANCE)); + assertFalse(expression.evaluate(new EvalContext(NoopResolver.INSTANCE, null))); } @Test void evaluateFirstNull() { ComparisonExpression expression = new ComparisonExpression(ValueExpression.NULL, new NumericValue(2, INT), EQ); - assertFalse(expression.evaluate(NoopResolver.INSTANCE)); + assertFalse(expression.evaluate(createEvalContext(NoopResolver.INSTANCE))); } @Test void evaluateSecondNull() { ComparisonExpression expression = new ComparisonExpression(new NumericValue(1, INT), ValueExpression.NULL, EQ); - assertFalse(expression.evaluate(NoopResolver.INSTANCE)); + assertFalse(expression.evaluate(createEvalContext(NoopResolver.INSTANCE))); } @Test void evaluateBothNull() { ComparisonExpression expression = new ComparisonExpression(ValueExpression.NULL, ValueExpression.NULL, EQ); - assertTrue(expression.evaluate(NoopResolver.INSTANCE)); + assertTrue(expression.evaluate(createEvalContext(NoopResolver.INSTANCE))); } @Test @@ -309,7 +311,9 @@ void invalidInstanceofOperand() { ComparisonExpression expression = new ComparisonExpression(new StringValue("foo"), new NumericValue(1, INT), INSTANCEOF); EvaluationException evaluationException = - assertThrows(EvaluationException.class, () -> expression.evaluate(NoopResolver.INSTANCE)); + assertThrows( + EvaluationException.class, + () -> expression.evaluate(createEvalContext(NoopResolver.INSTANCE))); assertEquals( "Right operand of instanceof operator must be a string literal", evaluationException.getMessage()); @@ -321,7 +325,9 @@ void invalidInstanceofClassName() { ComparisonExpression expression = new ComparisonExpression(new StringValue("foo"), new StringValue("String"), INSTANCEOF); EvaluationException evaluationException = - assertThrows(EvaluationException.class, () -> expression.evaluate(NoopResolver.INSTANCE)); + assertThrows( + EvaluationException.class, + () -> expression.evaluate(createEvalContext(NoopResolver.INSTANCE))); assertEquals("Class not found: String", evaluationException.getMessage()); assertEquals("\"foo\" instanceof \"String\"", evaluationException.getExpr()); } diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/ContainsExpressionTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/ContainsExpressionTest.java index 88b08a94c3f..60cd3d9f5c6 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/ContainsExpressionTest.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/ContainsExpressionTest.java @@ -1,27 +1,46 @@ package com.datadog.debugger.el.expressions; +import static com.datadog.debugger.el.EvalContextHelper.createEvalContext; import static com.datadog.debugger.el.PrettyPrintVisitor.print; import static org.junit.jupiter.api.Assertions.*; import com.datadog.debugger.el.DSL; +import com.datadog.debugger.el.EvalContext; import com.datadog.debugger.el.EvaluationException; -import com.datadog.debugger.el.RefResolverHelper; import com.datadog.debugger.el.values.StringValue; -import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver; import datadog.trace.bootstrap.debugger.el.Values; +import java.time.Duration; +import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.concurrent.locks.LockSupport; import org.junit.jupiter.api.Test; class ContainsExpressionTest { - private final ValueReferenceResolver resolver = RefResolverHelper.createResolver(this); + private final EvalContext evalContext = createEvalContext(this); private List list = Arrays.asList("foo", "bar", "baz"); private List listWithNull = Arrays.asList("foo", null, "baz"); + private List largeList = new ArrayList<>(); + + { + for (int i = 0; i < 1_000_001; i++) { + largeList.add(i); + } + } + + private List slowList = new ArrayList<>(); + + { + for (int i = 0; i < 10_000; i++) { + slowList.add(String.valueOf(i)); + } + } + private String[] arrayStr = new String[] {"foo", "bar", "baz"}; private String[] arrayStrWithNull = new String[] {"foo", null, "bar"}; private int[] arrayInt = new int[] {1, 2, 3}; @@ -60,7 +79,7 @@ class ContainsExpressionTest { void nullExpression() { ContainsExpression expression = new ContainsExpression(null, null); EvaluationException exception = - assertThrows(EvaluationException.class, () -> expression.evaluate(resolver)); + assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext)); assertEquals("Cannot evaluate the expression for null value", exception.getMessage()); assertEquals("contains(null, null)", print(expression)); } @@ -70,7 +89,7 @@ void undefinedExpression() { ContainsExpression expression = new ContainsExpression(DSL.value(Values.UNDEFINED_OBJECT), new StringValue(null)); EvaluationException exception = - assertThrows(EvaluationException.class, () -> expression.evaluate(resolver)); + assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext)); assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage()); assertEquals("contains(UNDEFINED, \"null\")", print(expression)); } @@ -79,16 +98,16 @@ void undefinedExpression() { void stringExpression() { ContainsExpression expression = new ContainsExpression(DSL.value("abcd"), new StringValue("bc")); - assertTrue(expression.evaluate(resolver)); + assertTrue(expression.evaluate(evalContext)); assertEquals("contains(\"abcd\", \"bc\")", print(expression)); expression = new ContainsExpression(DSL.value("abc"), new StringValue("dc")); - assertFalse(expression.evaluate(resolver)); + assertFalse(expression.evaluate(evalContext)); assertEquals("contains(\"abc\", \"dc\")", print(expression)); ContainsExpression nullValExpression = new ContainsExpression(DSL.value("abcd"), null); EvaluationException exception = - assertThrows(EvaluationException.class, () -> nullValExpression.evaluate(resolver)); + assertThrows(EvaluationException.class, () -> nullValExpression.evaluate(evalContext)); assertEquals("Cannot evaluate the expression for non-string value", exception.getMessage()); assertEquals("contains(\"abcd\", null)", print(nullValExpression)); } @@ -96,43 +115,55 @@ void stringExpression() { @Test void listExpression() { ContainsExpression expression = new ContainsExpression(DSL.ref("list"), DSL.value("bar")); - assertTrue(expression.evaluate(resolver)); + assertTrue(expression.evaluate(evalContext)); assertEquals("contains(list, \"bar\")", print(expression)); expression = new ContainsExpression(DSL.ref("listWithNull"), null); - assertTrue(expression.evaluate(resolver)); + assertTrue(expression.evaluate(evalContext)); assertEquals("contains(listWithNull, null)", print(expression)); + + ContainsExpression largeExpression = new ContainsExpression(DSL.ref("largeList"), DSL.value(1)); + EvaluationException evaluationException = + assertThrows(EvaluationException.class, () -> largeExpression.evaluate(evalContext)); + assertEquals("Collection too large (>1000000)", evaluationException.getMessage()); + + ContainsExpression slowListExpression = + new ContainsExpression(DSL.ref("slowList"), DSL.value(new SlowObject())); + assertThrows( + EvaluationException.class, + () -> slowListExpression.evaluate(createEvalContext(this, Duration.ofMillis(1)))); } @Test void arrayExpression() { ContainsExpression expression = new ContainsExpression(DSL.ref("arrayStr"), DSL.value("bar")); - assertTrue(expression.evaluate(resolver)); + assertTrue(expression.evaluate(evalContext)); assertEquals("contains(arrayStr, \"bar\")", print(expression)); expression = new ContainsExpression(DSL.ref("arrayInt"), DSL.value(2)); - assertTrue(expression.evaluate(resolver)); + assertTrue(expression.evaluate(evalContext)); assertEquals("contains(arrayInt, 2)", print(expression)); expression = new ContainsExpression(DSL.ref("arrayChar"), DSL.value("b")); - assertTrue(expression.evaluate(resolver)); + assertTrue(expression.evaluate(evalContext)); assertEquals("contains(arrayChar, \"b\")", print(expression)); expression = new ContainsExpression(DSL.ref("arrayLong"), DSL.value(2)); - assertTrue(expression.evaluate(resolver)); + assertTrue(expression.evaluate(evalContext)); assertEquals("contains(arrayLong, 2)", print(expression)); expression = new ContainsExpression(DSL.ref("arrayDouble"), DSL.value(2.0)); - assertTrue(expression.evaluate(resolver)); + assertTrue(expression.evaluate(evalContext)); assertEquals("contains(arrayDouble, 2.0)", print(expression)); expression = new ContainsExpression(DSL.ref("arrayStrWithNull"), null); - assertTrue(expression.evaluate(resolver)); + assertTrue(expression.evaluate(evalContext)); assertEquals("contains(arrayStrWithNull, null)", print(expression)); ContainsExpression primitiveNullExpression = new ContainsExpression(DSL.ref("arrayInt"), null); EvaluationException exception = - assertThrows(EvaluationException.class, () -> primitiveNullExpression.evaluate(resolver)); + assertThrows( + EvaluationException.class, () -> primitiveNullExpression.evaluate(evalContext)); assertEquals("Cannot compare null with primitive array", exception.getMessage()); assertEquals("contains(arrayInt, null)", print(primitiveNullExpression)); } @@ -140,22 +171,30 @@ void arrayExpression() { @Test void mapExpression() { ContainsExpression expression = new ContainsExpression(DSL.ref("mapStr"), DSL.value("bar")); - assertTrue(expression.evaluate(resolver)); + assertTrue(expression.evaluate(evalContext)); assertEquals("contains(mapStr, \"bar\")", print(expression)); expression = new ContainsExpression(DSL.ref("mapStrWithNull"), null); - assertTrue(expression.evaluate(resolver)); + assertTrue(expression.evaluate(evalContext)); assertEquals("contains(mapStrWithNull, null)", print(expression)); } @Test void setExpression() { ContainsExpression expression = new ContainsExpression(DSL.ref("setStr"), DSL.value("bar")); - assertTrue(expression.evaluate(resolver)); + assertTrue(expression.evaluate(evalContext)); assertEquals("contains(setStr, \"bar\")", print(expression)); expression = new ContainsExpression(DSL.ref("setStrWithNull"), null); - assertTrue(expression.evaluate(resolver)); + assertTrue(expression.evaluate(evalContext)); assertEquals("contains(setStrWithNull, null)", print(expression)); } + + static class SlowObject { + @Override + public boolean equals(Object obj) { + LockSupport.parkNanos(1000); + return super.equals(obj); + } + } } diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/EndsWithExpressionTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/EndsWithExpressionTest.java index 17a6b1c07f1..1ac730564a7 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/EndsWithExpressionTest.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/EndsWithExpressionTest.java @@ -1,5 +1,6 @@ package com.datadog.debugger.el.expressions; +import static com.datadog.debugger.el.EvalContextHelper.createEvalContext; import static com.datadog.debugger.el.PrettyPrintVisitor.print; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -7,16 +8,15 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import com.datadog.debugger.el.DSL; +import com.datadog.debugger.el.EvalContext; import com.datadog.debugger.el.EvaluationException; -import com.datadog.debugger.el.RefResolverHelper; import com.datadog.debugger.el.values.StringValue; -import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver; import datadog.trace.bootstrap.debugger.el.Values; import java.net.URI; import org.junit.jupiter.api.Test; class EndsWithExpressionTest { - private final ValueReferenceResolver resolver = RefResolverHelper.createResolver(this); + private final EvalContext evalContext = createEvalContext(this); // used to ref lookup URI uri = URI.create("https://www.datadoghq.com"); @@ -24,7 +24,7 @@ class EndsWithExpressionTest { void nullExpression() { EndsWithExpression expression = new EndsWithExpression(null, null); EvaluationException exception = - assertThrows(EvaluationException.class, () -> expression.evaluate(resolver)); + assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext)); assertEquals("Cannot evaluate the expression for null value", exception.getMessage()); assertEquals("endsWith(null, null)", print(expression)); } @@ -34,7 +34,7 @@ void undefinedExpression() { EndsWithExpression expression = new EndsWithExpression(DSL.value(Values.UNDEFINED_OBJECT), new StringValue(null)); EvaluationException exception = - assertThrows(EvaluationException.class, () -> expression.evaluate(resolver)); + assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext)); assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage()); assertEquals("endsWith(UNDEFINED, \"null\")", print(expression)); } @@ -42,18 +42,18 @@ void undefinedExpression() { @Test void stringExpression() { EndsWithExpression expression = new EndsWithExpression(DSL.value("abc"), new StringValue("bc")); - assertTrue(expression.evaluate(resolver)); + assertTrue(expression.evaluate(evalContext)); assertEquals("endsWith(\"abc\", \"bc\")", print(expression)); expression = new EndsWithExpression(DSL.value("abc"), new StringValue("ab")); - assertFalse(expression.evaluate(resolver)); + assertFalse(expression.evaluate(evalContext)); assertEquals("endsWith(\"abc\", \"ab\")", print(expression)); } @Test void stringPrimitives() { EndsWithExpression expression = new EndsWithExpression(DSL.ref("uri"), new StringValue(".com")); - assertTrue(expression.evaluate(resolver)); + assertTrue(expression.evaluate(evalContext)); assertEquals("endsWith(uri, \".com\")", print(expression)); } } diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/FilterCollectionExpressionTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/FilterCollectionExpressionTest.java index 38b0ea7e692..6d2e80cebda 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/FilterCollectionExpressionTest.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/FilterCollectionExpressionTest.java @@ -1,32 +1,40 @@ package com.datadog.debugger.el.expressions; import static com.datadog.debugger.el.DSL.*; +import static com.datadog.debugger.el.EvalContextHelper.createEvalContext; import static com.datadog.debugger.el.PrettyPrintVisitor.print; import static org.junit.jupiter.api.Assertions.*; +import com.datadog.debugger.el.EvalContext; import com.datadog.debugger.el.EvaluationException; -import com.datadog.debugger.el.RefResolverHelper; import com.datadog.debugger.el.values.CollectionValue; import com.datadog.debugger.el.values.ListValue; import com.datadog.debugger.el.values.MapValue; import com.datadog.debugger.el.values.SetValue; import datadog.trace.bootstrap.debugger.el.ValueReferences; import datadog.trace.bootstrap.debugger.el.Values; +import java.time.Duration; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; +import java.util.List; import java.util.Map; +import java.util.Set; import org.junit.jupiter.api.Test; class FilterCollectionExpressionTest { + + private final EvalContext evalContext = createEvalContext(this); + @Test void testMatchingList() { ListValue collection = new ListValue(new int[] {1, 2, 3}); FilterCollectionExpression expression = new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(2))); - CollectionValue filtered = expression.evaluate(RefResolverHelper.createResolver(this)); + CollectionValue filtered = expression.evaluate(evalContext); assertNotEquals(collection, filtered); assertEquals(1, filtered.count()); assertFalse(filtered.isEmpty()); @@ -40,7 +48,7 @@ void testEmptyList() { ListValue collection = new ListValue(new int[0]); FilterCollectionExpression expression = new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(2))); - CollectionValue filtered = expression.evaluate(RefResolverHelper.createResolver(this)); + CollectionValue filtered = expression.evaluate(evalContext); assertNotEquals(collection, filtered); assertTrue(filtered.isEmpty()); assertFalse(filtered.isNull()); @@ -54,9 +62,7 @@ void testNullList() { FilterCollectionExpression expression = new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(2))); EvaluationException exception = - assertThrows( - EvaluationException.class, - () -> expression.evaluate(RefResolverHelper.createResolver(this))); + assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext)); assertEquals("Cannot evaluate the expression for null value", exception.getMessage()); assertEquals("filter(null, {@it < 2})", print(expression)); } @@ -67,9 +73,7 @@ void testNullObjectList() { FilterCollectionExpression expression = new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(2))); EvaluationException exception = - assertThrows( - EvaluationException.class, - () -> expression.evaluate(RefResolverHelper.createResolver(this))); + assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext)); assertEquals("Cannot evaluate the expression for null value", exception.getMessage()); assertEquals("filter(null, {@it < 2})", print(expression)); } @@ -80,13 +84,27 @@ void testUndefinedList() { FilterCollectionExpression expression = new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(2))); EvaluationException exception = - assertThrows( - EvaluationException.class, - () -> expression.evaluate(RefResolverHelper.createResolver(this))); + assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext)); assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage()); assertEquals("filter(null, {@it < 2})", print(expression)); } + @Test + void testLargeList() { + List largeList = new ArrayList<>(); + for (int i = 0; i < 1_000_000; i++) { + largeList.add(i); + } + ListValue collection = new ListValue(largeList); + FilterCollectionExpression expression = + new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(0))); + EvalContext timeoutEvalContext = createEvalContext(this, Duration.ofMillis(1)); + EvaluationException exception = + assertThrows(EvaluationException.class, () -> expression.evaluate(timeoutEvalContext)); + assertEquals("timeout (1ms)", exception.getMessage()); + assertEquals("filter(List, {@it < 0})", print(expression)); + } + @Test void testMatchingMap() { Map map = new HashMap<>(); @@ -98,7 +116,7 @@ void testMatchingMap() { FilterCollectionExpression expression = new FilterCollectionExpression( collection, eq(getMember(ref(ValueReferences.ITERATOR_REF), "key"), value("b"))); - CollectionValue filtered = expression.evaluate(RefResolverHelper.createResolver(this)); + CollectionValue filtered = expression.evaluate(evalContext); assertNotEquals(collection, filtered); assertEquals(1, filtered.count()); assertFalse(filtered.isEmpty()); @@ -108,7 +126,7 @@ void testMatchingMap() { expression = new FilterCollectionExpression( collection, lt(getMember(ref(ValueReferences.ITERATOR_REF), "value"), value(2))); - filtered = expression.evaluate(RefResolverHelper.createResolver(this)); + filtered = expression.evaluate(evalContext); assertNotEquals(collection, filtered); assertEquals(1, filtered.count()); assertFalse(filtered.isEmpty()); @@ -122,7 +140,7 @@ void testEmptyMap() { MapValue collection = new MapValue(Collections.emptyMap()); FilterCollectionExpression expression = new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(2))); - CollectionValue filtered = expression.evaluate(RefResolverHelper.createResolver(this)); + CollectionValue filtered = expression.evaluate(evalContext); assertNotEquals(collection, filtered); assertTrue(filtered.isEmpty()); assertFalse(filtered.isNull()); @@ -136,9 +154,7 @@ void testNullMap() { FilterCollectionExpression expression = new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(2))); EvaluationException exception = - assertThrows( - EvaluationException.class, - () -> expression.evaluate(RefResolverHelper.createResolver(this))); + assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext)); assertEquals("Cannot evaluate the expression for null value", exception.getMessage()); assertEquals("filter(null, {@it < 2})", print(expression)); } @@ -149,9 +165,7 @@ void testNullObjectMap() { FilterCollectionExpression expression = new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(2))); EvaluationException exception = - assertThrows( - EvaluationException.class, - () -> expression.evaluate(RefResolverHelper.createResolver(this))); + assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext)); assertEquals("Cannot evaluate the expression for null value", exception.getMessage()); assertEquals("filter(null, {@it < 2})", print(expression)); } @@ -162,9 +176,7 @@ void testUndefinedMap() { FilterCollectionExpression expression = new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(2))); EvaluationException exception = - assertThrows( - EvaluationException.class, - () -> expression.evaluate(RefResolverHelper.createResolver(this))); + assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext)); assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage()); assertEquals("filter(null, {@it < 2})", print(expression)); } @@ -179,25 +191,42 @@ void keyValueMap() { FilterCollectionExpression expression = new FilterCollectionExpression(collection, eq(ref(ValueReferences.KEY_REF), value("b"))); - CollectionValue filtered = expression.evaluate(RefResolverHelper.createResolver(this)); + CollectionValue filtered = expression.evaluate(evalContext); assertNotEquals(collection, filtered); assertEquals(1, filtered.count()); assertEquals("filter(Map, {@key == \"b\"})", print(expression)); expression = new FilterCollectionExpression(collection, eq(ref(ValueReferences.VALUE_REF), value(2))); - filtered = expression.evaluate(RefResolverHelper.createResolver(this)); + filtered = expression.evaluate(evalContext); assertNotEquals(collection, filtered); assertEquals(1, filtered.count()); assertEquals("filter(Map, {@value == 2})", print(expression)); } + @Test + void testLargeMap() { + Map map = new HashMap<>(); + for (int i = 0; i <= 1_000_000; i++) { + map.put(i, i); + } + MapValue collection = new MapValue(map); + + FilterCollectionExpression expression = + new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(0))); + EvalContext timeoutEvalContext = createEvalContext(this, Duration.ofMillis(1)); + EvaluationException exception = + assertThrows(EvaluationException.class, () -> expression.evaluate(timeoutEvalContext)); + assertEquals("timeout (1ms)", exception.getMessage()); + assertEquals("filter(Map, {@it < 0})", print(expression)); + } + @Test void testMatchingSet() { SetValue collection = new SetValue(new HashSet<>(Arrays.asList(1, 2, 3))); FilterCollectionExpression expression = new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(2))); - CollectionValue filtered = expression.evaluate(RefResolverHelper.createResolver(this)); + CollectionValue filtered = expression.evaluate(evalContext); assertNotEquals(collection, filtered); assertEquals(1, filtered.count()); assertFalse(filtered.isEmpty()); @@ -211,7 +240,7 @@ void testEmptySet() { SetValue collection = new SetValue(new HashSet<>()); FilterCollectionExpression expression = new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(2))); - CollectionValue filtered = expression.evaluate(RefResolverHelper.createResolver(this)); + CollectionValue filtered = expression.evaluate(evalContext); assertNotEquals(collection, filtered); assertTrue(filtered.isEmpty()); assertFalse(filtered.isNull()); @@ -225,9 +254,7 @@ void testNullSet() { FilterCollectionExpression expression = new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(2))); EvaluationException exception = - assertThrows( - EvaluationException.class, - () -> expression.evaluate(RefResolverHelper.createResolver(this))); + assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext)); assertEquals("Cannot evaluate the expression for null value", exception.getMessage()); assertEquals("filter(null, {@it < 2})", print(expression)); } @@ -238,9 +265,7 @@ void testNullObjectSet() { FilterCollectionExpression expression = new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(2))); EvaluationException exception = - assertThrows( - EvaluationException.class, - () -> expression.evaluate(RefResolverHelper.createResolver(this))); + assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext)); assertEquals("Cannot evaluate the expression for null value", exception.getMessage()); assertEquals("filter(null, {@it < 2})", print(expression)); } @@ -251,13 +276,28 @@ void testUndefinedSet() { FilterCollectionExpression expression = new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(2))); EvaluationException exception = - assertThrows( - EvaluationException.class, - () -> expression.evaluate(RefResolverHelper.createResolver(this))); + assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext)); assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage()); assertEquals("filter(null, {@it < 2})", print(expression)); } + @Test + void testLargeSet() { + Set set = new HashSet<>(); + for (int i = 0; i <= 1_000_000; i++) { + set.add(i); + } + SetValue collection = new SetValue(set); + + FilterCollectionExpression expression = + new FilterCollectionExpression(collection, lt(ref(ValueReferences.ITERATOR_REF), value(0))); + EvalContext timeoutEvalContext = createEvalContext(this, Duration.ofMillis(1)); + EvaluationException exception = + assertThrows(EvaluationException.class, () -> expression.evaluate(timeoutEvalContext)); + assertEquals("timeout (1ms)", exception.getMessage()); + assertEquals("filter(Set, {@it < 0})", print(expression)); + } + @Test void testUnsupportedList() { ListValue collection = new ListValue(new CustomList()); @@ -265,9 +305,7 @@ void testUnsupportedList() { new FilterCollectionExpression( collection, eq(ref(ValueReferences.ITERATOR_REF), value("foo"))); EvaluationException exception = - assertThrows( - EvaluationException.class, - () -> expression.evaluate(RefResolverHelper.createResolver(this))); + assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext)); assertEquals( "Unsupported List class: com.datadog.debugger.el.expressions.FilterCollectionExpressionTest$CustomList", exception.getMessage()); @@ -280,9 +318,7 @@ void testUnsupportedMap() { FilterCollectionExpression expression = new FilterCollectionExpression(collection, eq(ref(ValueReferences.VALUE_REF), value(2))); EvaluationException exception = - assertThrows( - EvaluationException.class, - () -> expression.evaluate(RefResolverHelper.createResolver(this))); + assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext)); assertEquals( "Unsupported Map class: com.datadog.debugger.el.expressions.FilterCollectionExpressionTest$CustomMap", exception.getMessage()); @@ -296,9 +332,7 @@ void testUnsupportedSet() { new FilterCollectionExpression( collection, eq(ref(ValueReferences.ITERATOR_REF), value("foo"))); EvaluationException exception = - assertThrows( - EvaluationException.class, - () -> expression.evaluate(RefResolverHelper.createResolver(this))); + assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext)); assertEquals( "Unsupported Set class: com.datadog.debugger.el.expressions.FilterCollectionExpressionTest$CustomSet", exception.getMessage()); diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/GetMemberExpressionTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/GetMemberExpressionTest.java index 088c6b7bae4..6d2263b67da 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/GetMemberExpressionTest.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/GetMemberExpressionTest.java @@ -1,5 +1,6 @@ package com.datadog.debugger.el.expressions; +import static com.datadog.debugger.el.EvalContextHelper.createEvalContext; import static com.datadog.debugger.el.PrettyPrintVisitor.print; import static com.datadog.debugger.el.TestHelper.setFieldInConfig; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -8,7 +9,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import com.datadog.debugger.el.RedactedException; -import com.datadog.debugger.el.RefResolverHelper; import com.datadog.debugger.el.Value; import datadog.trace.api.Config; import datadog.trace.bootstrap.debugger.util.Redaction; @@ -16,13 +16,12 @@ import org.junit.jupiter.api.Test; class GetMemberExpressionTest { - @Test void getMemberLevel1() { GetMemberExpression expr = new GetMemberExpression(new ValueRefExpression("ref"), "b"); ObjectWithRefAndValue parent = new ObjectWithRefAndValue(null, "hello"); ExObjectWithRefAndValue instance = new ExObjectWithRefAndValue(parent, "world"); - Value val = expr.evaluate(RefResolverHelper.createResolver(instance)); + Value val = expr.evaluate(createEvalContext(instance)); assertNotNull(val); assertFalse(val.isUndefined()); assertEquals(parent.getB(), val.getValue()); @@ -37,7 +36,7 @@ void getMemberLevel2() { ObjectWithRefAndValue root = new ObjectWithRefAndValue(null, "hello"); ObjectWithRefAndValue parent = new ObjectWithRefAndValue(root, ""); ExObjectWithRefAndValue instance = new ExObjectWithRefAndValue(parent, "world"); - Value val = expr.evaluate(RefResolverHelper.createResolver(instance)); + Value val = expr.evaluate(createEvalContext(instance)); assertNotNull(val); assertFalse(val.isUndefined()); assertEquals(root.getB(), val.getValue()); @@ -47,7 +46,7 @@ void getMemberLevel2() { @Test void getMemberUndefined() { GetMemberExpression expr = new GetMemberExpression(ValueExpression.UNDEFINED, "size"); - assertEquals(Value.undefined(), expr.evaluate(RefResolverHelper.createResolver(this))); + assertEquals(Value.undefined(), expr.evaluate(createEvalContext(this))); } class StoreSecret { @@ -73,9 +72,7 @@ void redacted() { GetMemberExpression expr = new GetMemberExpression(new ValueRefExpression("store"), "password"); Holder instance = new Holder(new StoreSecret("secret123")); RedactedException redactedException = - assertThrows( - RedactedException.class, - () -> expr.evaluate(RefResolverHelper.createResolver(instance))); + assertThrows(RedactedException.class, () -> expr.evaluate(createEvalContext(instance))); assertEquals( "Could not evaluate the expression because 'store.password' was redacted", redactedException.getMessage()); @@ -93,9 +90,7 @@ void redactedType() { GetMemberExpression expr = new GetMemberExpression(new ValueRefExpression("store"), "str"); Holder instance = new Holder(new StoreSecret("secret123")); RedactedException redactedException = - assertThrows( - RedactedException.class, - () -> expr.evaluate(RefResolverHelper.createResolver(instance))); + assertThrows(RedactedException.class, () -> expr.evaluate(createEvalContext(instance))); assertEquals( "Could not evaluate the expression because 'store' was redacted", redactedException.getMessage()); @@ -115,13 +110,13 @@ class Holder { } GetMemberExpression expr = new GetMemberExpression(new ValueRefExpression("strPrimitive"), "uuid"); - Value val = expr.evaluate(RefResolverHelper.createResolver(new Holder())); + Value val = expr.evaluate(createEvalContext(new Holder())); assertNotNull(val); assertFalse(val.isUndefined()); assertEquals("123e4567-e89b-12d3-a456-426655440000", val.getValue()); assertEquals("strPrimitive.uuid", print(expr)); expr = new GetMemberExpression(new ValueRefExpression("strPrimitive"), "clazz"); - val = expr.evaluate(RefResolverHelper.createResolver(new Holder())); + val = expr.evaluate(createEvalContext(new Holder())); assertNotNull(val); assertFalse(val.isUndefined()); assertEquals("java.lang.String", val.getValue()); diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/HasAllExpressionTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/HasAllExpressionTest.java index 3b4f69ef0b8..0566d3537aa 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/HasAllExpressionTest.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/HasAllExpressionTest.java @@ -1,24 +1,27 @@ package com.datadog.debugger.el.expressions; import static com.datadog.debugger.el.DSL.*; +import static com.datadog.debugger.el.EvalContextHelper.createEvalContext; import static com.datadog.debugger.el.PrettyPrintVisitor.print; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; +import com.datadog.debugger.el.EvalContext; import com.datadog.debugger.el.EvaluationException; -import com.datadog.debugger.el.RefResolverHelper; import com.datadog.debugger.el.values.ListValue; import com.datadog.debugger.el.values.MapValue; import com.datadog.debugger.el.values.SetValue; -import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver; import datadog.trace.bootstrap.debugger.el.ValueReferences; import datadog.trace.bootstrap.debugger.el.Values; +import java.time.Duration; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; +import java.util.List; import java.util.Map; import java.util.Set; import org.junit.jupiter.api.Test; @@ -26,83 +29,83 @@ class HasAllExpressionTest { private final int testField = 10; + EvalContext evalContext = createEvalContext(this); + @Test void testNullPredicate() { - ValueReferenceResolver resolver = RefResolverHelper.createResolver(this); HasAllExpression nullExpression = new HasAllExpression(null, null); EvaluationException exception = - assertThrows(EvaluationException.class, () -> nullExpression.evaluate(resolver)); + assertThrows(EvaluationException.class, () -> nullExpression.evaluate(evalContext)); assertEquals("Cannot evaluate the expression for null value", exception.getMessage()); assertEquals("all(null, {true})", print(nullExpression)); HasAllExpression undefinedExpression = new HasAllExpression(value(Values.UNDEFINED_OBJECT), null); exception = - assertThrows(EvaluationException.class, () -> undefinedExpression.evaluate(resolver)); + assertThrows(EvaluationException.class, () -> undefinedExpression.evaluate(evalContext)); assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage()); assertEquals("all(UNDEFINED, {true})", print(undefinedExpression)); HasAllExpression expression = new HasAllExpression(value(new Object[] {this}), null); - assertTrue(expression.evaluate(resolver)); + assertTrue(expression.evaluate(evalContext)); assertEquals("all(java.lang.Object[], {true})", print(expression)); expression = new HasAllExpression(value(Collections.singletonList(this)), null); - assertTrue(expression.evaluate(resolver)); + assertTrue(expression.evaluate(evalContext)); assertEquals("all(List, {true})", print(expression)); expression = new HasAllExpression(value(Collections.singletonMap(this, this)), null); - assertTrue(expression.evaluate(resolver)); + assertTrue(expression.evaluate(evalContext)); assertEquals("all(Map, {true})", print(expression)); } @Test void testNullHasAll() { - ValueReferenceResolver ctx = RefResolverHelper.createResolver(this); HasAllExpression nullExpression1 = all(null, TRUE); EvaluationException exception = - assertThrows(EvaluationException.class, () -> nullExpression1.evaluate(ctx)); + assertThrows(EvaluationException.class, () -> nullExpression1.evaluate(evalContext)); assertEquals("Cannot evaluate the expression for null value", exception.getMessage()); assertEquals("all(null, {true})", print(nullExpression1)); HasAllExpression nullExpression2 = all(null, FALSE); - exception = assertThrows(EvaluationException.class, () -> nullExpression2.evaluate(ctx)); + exception = + assertThrows(EvaluationException.class, () -> nullExpression2.evaluate(evalContext)); assertEquals("Cannot evaluate the expression for null value", exception.getMessage()); assertEquals("all(null, {false})", print(nullExpression2)); HasAllExpression nullExpression3 = all(null, eq(ref("testField"), value(10))); - exception = assertThrows(EvaluationException.class, () -> nullExpression3.evaluate(ctx)); + exception = + assertThrows(EvaluationException.class, () -> nullExpression3.evaluate(evalContext)); assertEquals("Cannot evaluate the expression for null value", exception.getMessage()); assertEquals("all(null, {testField == 10})", print(nullExpression3)); } @Test void testUndefinedHasAll() { - ValueReferenceResolver ctx = RefResolverHelper.createResolver(this); HasAllExpression undefinedExpression = all(value(Values.UNDEFINED_OBJECT), TRUE); EvaluationException exception = - assertThrows(EvaluationException.class, () -> undefinedExpression.evaluate(ctx)); + assertThrows(EvaluationException.class, () -> undefinedExpression.evaluate(evalContext)); assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage()); assertEquals("all(UNDEFINED, {true})", print(undefinedExpression)); HasAllExpression nullExpression = all(null, FALSE); - exception = assertThrows(EvaluationException.class, () -> nullExpression.evaluate(ctx)); + exception = assertThrows(EvaluationException.class, () -> nullExpression.evaluate(evalContext)); assertEquals("Cannot evaluate the expression for null value", exception.getMessage()); assertEquals("all(null, {false})", print(nullExpression)); HasAllExpression expression = all(value(Values.UNDEFINED_OBJECT), eq(ref("testField"), value(10))); - exception = assertThrows(EvaluationException.class, () -> expression.evaluate(ctx)); + exception = assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext)); assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage()); assertEquals("all(UNDEFINED, {testField == 10})", print(expression)); } @Test void testArrayHasAll() { - ValueReferenceResolver ctx = RefResolverHelper.createResolver(this); ValueExpression targetExpression = value(new Object[] {this, "hello"}); HasAllExpression expression = all(targetExpression, TRUE); - assertTrue(expression.evaluate(ctx)); + assertTrue(expression.evaluate(evalContext)); assertEquals("all(java.lang.Object[], {true})", print(expression)); expression = all(targetExpression, FALSE); - assertFalse(expression.evaluate(ctx)); + assertFalse(expression.evaluate(evalContext)); assertEquals("all(java.lang.Object[], {false})", print(expression)); GetMemberExpression fldRef = getMember(ref(ValueReferences.ITERATOR_REF), "testField"); @@ -111,29 +114,28 @@ void testArrayHasAll() { RuntimeException runtimeException = assertThrows( RuntimeException.class, - () -> all(targetExpression, eq(fldRef, value(10))).evaluate(ctx)); + () -> all(targetExpression, eq(fldRef, value(10))).evaluate(evalContext)); assertEquals("Cannot dereference field: testField", runtimeException.getMessage()); expression = all(targetExpression, eq(itRef, value("hello"))); - assertFalse(expression.evaluate(ctx)); + assertFalse(expression.evaluate(evalContext)); assertEquals("all(java.lang.Object[], {@it == \"hello\"})", print(expression)); expression = all(targetExpression, not(isEmpty(itRef))); - assertTrue(expression.evaluate(ctx)); + assertTrue(expression.evaluate(evalContext)); assertEquals("all(java.lang.Object[], {not(isEmpty(@it))})", print(expression)); } @Test void testListHasAll() { - ValueReferenceResolver ctx = RefResolverHelper.createResolver(this); ValueExpression targetExpression = value(Arrays.asList(this, "hello")); HasAllExpression expression = all(targetExpression, TRUE); - assertTrue(expression.evaluate(ctx)); + assertTrue(expression.evaluate(evalContext)); assertEquals("all(List, {true})", print(expression)); expression = all(targetExpression, FALSE); - assertFalse(expression.evaluate(ctx)); + assertFalse(expression.evaluate(evalContext)); assertEquals("all(List, {false})", print(expression)); ValueRefExpression fldRef = ref(ValueReferences.ITERATOR_REF + "testField"); @@ -142,21 +144,36 @@ void testListHasAll() { RuntimeException runtimeException = assertThrows( RuntimeException.class, - () -> all(targetExpression, eq(fldRef, value(10))).evaluate(ctx)); + () -> all(targetExpression, eq(fldRef, value(10))).evaluate(evalContext)); assertEquals("Cannot find synthetic var: ittestField", runtimeException.getMessage()); expression = all(targetExpression, eq(itRef, value("hello"))); - assertFalse(expression.evaluate(ctx)); + assertFalse(expression.evaluate(evalContext)); assertEquals("all(List, {@it == \"hello\"})", print(expression)); expression = all(targetExpression, not(isEmpty(itRef))); - assertTrue(expression.evaluate(ctx)); + assertTrue(expression.evaluate(evalContext)); assertEquals("all(List, {not(isEmpty(@it))})", print(expression)); } + @Test + void testLargeListHasAll() { + List largeList = new ArrayList<>(); + for (int i = 0; i < 1_000_000; i++) { + largeList.add(i); + } + ValueExpression targetExpression = value(largeList); + + HasAllExpression expression = all(targetExpression, TRUE); + EvalContext timeoutEvalContext = createEvalContext(this, Duration.ofMillis(1)); + EvaluationException evaluationException = + assertThrows(EvaluationException.class, () -> expression.evaluate(timeoutEvalContext)); + assertEquals("timeout (1ms)", evaluationException.getMessage()); + assertEquals("all(List, {true})", print(expression)); + } + @Test void testMapHasAll() { - ValueReferenceResolver ctx = RefResolverHelper.createResolver(null, null); Map valueMap = new HashMap<>(); valueMap.put("a", "a"); valueMap.put("b", "a"); @@ -164,29 +181,44 @@ void testMapHasAll() { ValueExpression targetExpression = value(valueMap); HasAllExpression expression = all(targetExpression, TRUE); - assertTrue(expression.evaluate(ctx)); + assertTrue(expression.evaluate(evalContext)); assertEquals("all(Map, {true})", print(expression)); expression = all(targetExpression, FALSE); - assertFalse(expression.evaluate(ctx)); + assertFalse(expression.evaluate(evalContext)); assertEquals("all(Map, {false})", print(expression)); expression = all(targetExpression, eq(getMember(ref(ValueReferences.ITERATOR_REF), "key"), value("a"))); - assertFalse(expression.evaluate(ctx)); + assertFalse(expression.evaluate(evalContext)); assertEquals("all(Map, {@it.key == \"a\"})", print(expression)); expression = all( targetExpression, eq(getMember(ref(ValueReferences.ITERATOR_REF), "value"), value("a"))); - assertTrue(expression.evaluate(ctx)); + assertTrue(expression.evaluate(evalContext)); assertEquals("all(Map, {@it.value == \"a\"})", print(expression)); } + @Test + void testLargeMapHasAll() { + Map largeMap = new HashMap<>(); + for (int i = 0; i < 1_000_000; i++) { + largeMap.put(i, i); + } + ValueExpression targetExpression = value(largeMap); + + HasAllExpression expression = all(targetExpression, TRUE); + EvalContext timeoutEvalContext = createEvalContext(this, Duration.ofMillis(1)); + EvaluationException evaluationException = + assertThrows(EvaluationException.class, () -> expression.evaluate(timeoutEvalContext)); + assertEquals("timeout (1ms)", evaluationException.getMessage()); + assertEquals("all(Map, {true})", print(expression)); + } + @Test void testSetHasAll() { - ValueReferenceResolver ctx = RefResolverHelper.createResolver(null, null); Set valueSet = new HashSet<>(); valueSet.add("foo"); valueSet.add("bar"); @@ -194,15 +226,15 @@ void testSetHasAll() { ValueExpression targetExpression = value(valueSet); HasAllExpression expression = all(targetExpression, TRUE); - assertTrue(expression.evaluate(ctx)); + assertTrue(expression.evaluate(evalContext)); assertEquals("all(Set, {true})", print(expression)); expression = all(targetExpression, FALSE); - assertFalse(expression.evaluate(ctx)); + assertFalse(expression.evaluate(evalContext)); assertEquals("all(Set, {false})", print(expression)); expression = all(targetExpression, eq(ref(ValueReferences.ITERATOR_REF), value("key"))); - assertFalse(expression.evaluate(ctx)); + assertFalse(expression.evaluate(evalContext)); assertEquals("all(Set, {@it == \"key\"})", print(expression)); expression = @@ -211,48 +243,61 @@ void testSetHasAll() { or( eq(ref(ValueReferences.ITERATOR_REF), value("foo")), eq(ref(ValueReferences.ITERATOR_REF), value("bar")))); - assertTrue(expression.evaluate(ctx)); + assertTrue(expression.evaluate(evalContext)); assertEquals("all(Set, {@it == \"foo\" || @it == \"bar\"})", print(expression)); } + @Test + void testLargeSetHasAll() { + Set largeSet = new HashSet<>(); + for (int i = 0; i < 1_000_000; i++) { + largeSet.add(i); + } + ValueExpression targetExpression = value(largeSet); + + HasAllExpression expression = all(targetExpression, TRUE); + EvalContext timeoutEvalContext = createEvalContext(this, Duration.ofMillis(1)); + EvaluationException evaluationException = + assertThrows(EvaluationException.class, () -> expression.evaluate(timeoutEvalContext)); + assertEquals("timeout (1ms)", evaluationException.getMessage()); + assertEquals("all(Set, {true})", print(expression)); + } + @Test void emptiness() { - ValueReferenceResolver ctx = RefResolverHelper.createResolver(null, null); HasAllExpression expression = all(value(new String[] {}), TRUE); - assertTrue(expression.evaluate(ctx)); + assertTrue(expression.evaluate(evalContext)); expression = all(value(Collections.emptyList()), TRUE); - assertTrue(expression.evaluate(ctx)); + assertTrue(expression.evaluate(evalContext)); expression = all(value(Collections.emptyMap()), TRUE); - assertTrue(expression.evaluate(ctx)); + assertTrue(expression.evaluate(evalContext)); expression = all(value(Collections.emptySet()), TRUE); - assertTrue(expression.evaluate(ctx)); + assertTrue(expression.evaluate(evalContext)); } @Test void keyValueMap() { - ValueReferenceResolver ctx = RefResolverHelper.createResolver(null, null); Map valueMap = new HashMap<>(); valueMap.put("a", "a"); valueMap.put("b", "a"); ValueExpression targetExpression = value(valueMap); HasAllExpression expression = all(targetExpression, eq(ref(ValueReferences.KEY_REF), value("a"))); - assertFalse(expression.evaluate(ctx)); + assertFalse(expression.evaluate(evalContext)); assertEquals("all(Map, {@key == \"a\"})", print(expression)); expression = all(targetExpression, eq(ref(ValueReferences.VALUE_REF), value("a"))); - assertTrue(expression.evaluate(ctx)); + assertTrue(expression.evaluate(evalContext)); assertEquals("all(Map, {@value == \"a\"})", print(expression)); } @Test void testUnsupportedList() { - ValueReferenceResolver ctx = RefResolverHelper.createResolver(null, null); ListValue collection = new ListValue(new CustomList()); HasAllExpression expression = all(collection, eq(ref(ValueReferences.ITERATOR_REF), value("foo"))); EvaluationException exception = - assertThrows(EvaluationException.class, () -> expression.evaluate(ctx)); + assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext)); assertEquals( "Unsupported List class: com.datadog.debugger.el.expressions.HasAllExpressionTest$CustomList", exception.getMessage()); @@ -261,11 +306,10 @@ void testUnsupportedList() { @Test void testUnsupportedMap() { - ValueReferenceResolver ctx = RefResolverHelper.createResolver(null, null); MapValue collection = new MapValue(new CustomMap()); HasAllExpression expression = all(collection, eq(ref(ValueReferences.VALUE_REF), value("foo"))); EvaluationException exception = - assertThrows(EvaluationException.class, () -> expression.evaluate(ctx)); + assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext)); assertEquals( "Unsupported Map class: com.datadog.debugger.el.expressions.HasAllExpressionTest$CustomMap", exception.getMessage()); @@ -274,12 +318,11 @@ void testUnsupportedMap() { @Test void testUnsupportedSet() { - ValueReferenceResolver ctx = RefResolverHelper.createResolver(null, null); SetValue collection = new SetValue(new CustomSet()); HasAllExpression expression = all(collection, eq(ref(ValueReferences.ITERATOR_REF), value("foo"))); EvaluationException exception = - assertThrows(EvaluationException.class, () -> expression.evaluate(ctx)); + assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext)); assertEquals( "Unsupported Set class: com.datadog.debugger.el.expressions.HasAllExpressionTest$CustomSet", exception.getMessage()); diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/HasAnyExpressionTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/HasAnyExpressionTest.java index 8a5ca4fa9cf..8d706b7b326 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/HasAnyExpressionTest.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/HasAnyExpressionTest.java @@ -1,255 +1,300 @@ package com.datadog.debugger.el.expressions; import static com.datadog.debugger.el.DSL.*; +import static com.datadog.debugger.el.DSL.value; +import static com.datadog.debugger.el.EvalContextHelper.createEvalContext; import static com.datadog.debugger.el.PrettyPrintVisitor.print; import static org.junit.jupiter.api.Assertions.*; -import com.datadog.debugger.el.DSL; +import com.datadog.debugger.el.EvalContext; import com.datadog.debugger.el.EvaluationException; -import com.datadog.debugger.el.RefResolverHelper; import com.datadog.debugger.el.values.ListValue; import com.datadog.debugger.el.values.MapValue; import com.datadog.debugger.el.values.SetValue; -import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver; import datadog.trace.bootstrap.debugger.el.ValueReferences; import datadog.trace.bootstrap.debugger.el.Values; +import java.time.Duration; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; +import java.util.List; import java.util.Map; import java.util.Set; import org.junit.jupiter.api.Test; class HasAnyExpressionTest { private final int testField = 10; + EvalContext evalContext = createEvalContext(this); @Test void testNullPredicate() { - ValueReferenceResolver resolver = RefResolverHelper.createResolver(this); HasAnyExpression nullExpression = new HasAnyExpression(null, null); EvaluationException exception = - assertThrows(EvaluationException.class, () -> nullExpression.evaluate(resolver)); + assertThrows(EvaluationException.class, () -> nullExpression.evaluate(evalContext)); assertEquals("Cannot evaluate the expression for null value", exception.getMessage()); assertEquals("any(null, {true})", print(nullExpression)); HasAnyExpression undefinedExpression = new HasAnyExpression(value(Values.UNDEFINED_OBJECT), null); exception = - assertThrows(EvaluationException.class, () -> undefinedExpression.evaluate(resolver)); + assertThrows(EvaluationException.class, () -> undefinedExpression.evaluate(evalContext)); assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage()); assertEquals("any(UNDEFINED, {true})", print(undefinedExpression)); HasAnyExpression expression = new HasAnyExpression(value(new Object[] {this}), null); - assertTrue(expression.evaluate(resolver)); + assertTrue(expression.evaluate(evalContext)); assertEquals("any(java.lang.Object[], {true})", print(expression)); expression = new HasAnyExpression(value(Collections.singletonList(this)), null); - assertTrue(expression.evaluate(resolver)); + assertTrue(expression.evaluate(evalContext)); assertEquals("any(List, {true})", print(expression)); expression = new HasAnyExpression(value(Collections.singletonMap(this, this)), null); - assertTrue(expression.evaluate(resolver)); + assertTrue(expression.evaluate(evalContext)); assertEquals("any(Map, {true})", print(expression)); } @Test void testNullHasAny() { - ValueReferenceResolver ctx = RefResolverHelper.createResolver(this); HasAnyExpression nullExpression1 = any(null, BooleanExpression.TRUE); EvaluationException exception = - assertThrows(EvaluationException.class, () -> nullExpression1.evaluate(ctx)); + assertThrows(EvaluationException.class, () -> nullExpression1.evaluate(evalContext)); assertEquals("Cannot evaluate the expression for null value", exception.getMessage()); assertEquals("any(null, {true})", print(nullExpression1)); HasAnyExpression nullExpression2 = any(null, BooleanExpression.FALSE); - exception = assertThrows(EvaluationException.class, () -> nullExpression2.evaluate(ctx)); + exception = + assertThrows(EvaluationException.class, () -> nullExpression2.evaluate(evalContext)); assertEquals("Cannot evaluate the expression for null value", exception.getMessage()); assertEquals("any(null, {false})", print(nullExpression2)); HasAnyExpression nullExpression3 = any(null, eq(ref("testField"), value(10))); - exception = assertThrows(EvaluationException.class, () -> nullExpression3.evaluate(ctx)); + exception = + assertThrows(EvaluationException.class, () -> nullExpression3.evaluate(evalContext)); assertEquals("Cannot evaluate the expression for null value", exception.getMessage()); assertEquals("any(null, {testField == 10})", print(nullExpression3)); } @Test void testUndefinedHasAny() { - ValueReferenceResolver ctx = RefResolverHelper.createResolver(this); HasAnyExpression undefinedExpression = any(value(Values.UNDEFINED_OBJECT), TRUE); EvaluationException exception = - assertThrows(EvaluationException.class, () -> undefinedExpression.evaluate(ctx)); + assertThrows(EvaluationException.class, () -> undefinedExpression.evaluate(evalContext)); assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage()); assertEquals("any(UNDEFINED, {true})", print(undefinedExpression)); HasAnyExpression nullExpression = any(null, FALSE); - exception = assertThrows(EvaluationException.class, () -> nullExpression.evaluate(ctx)); + exception = assertThrows(EvaluationException.class, () -> nullExpression.evaluate(evalContext)); assertEquals("Cannot evaluate the expression for null value", exception.getMessage()); assertEquals("any(null, {false})", print(nullExpression)); HasAnyExpression undefinedExpression2 = any(value(Values.UNDEFINED_OBJECT), eq(ref("testField"), value(10))); - exception = assertThrows(EvaluationException.class, () -> undefinedExpression2.evaluate(ctx)); + exception = + assertThrows(EvaluationException.class, () -> undefinedExpression2.evaluate(evalContext)); assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage()); assertEquals("any(UNDEFINED, {testField == 10})", print(undefinedExpression2)); } @Test void testArrayHasAny() { - ValueReferenceResolver ctx = RefResolverHelper.createResolver(null, null); - ValueExpression targetExpression = DSL.value(new Object[] {this, "hello"}); + ValueExpression targetExpression = value(new Object[] {this, "hello"}); HasAnyExpression expression = any(targetExpression, TRUE); - assertTrue(expression.evaluate(ctx)); + assertTrue(expression.evaluate(evalContext)); assertEquals("any(java.lang.Object[], {true})", print(expression)); expression = any(targetExpression, FALSE); - assertFalse(expression.evaluate(ctx)); + assertFalse(expression.evaluate(evalContext)); assertEquals("any(java.lang.Object[], {false})", print(expression)); expression = any( targetExpression, eq(getMember(ref(ValueReferences.ITERATOR_REF), "testField"), value(10))); - assertTrue(expression.evaluate(ctx)); + assertTrue(expression.evaluate(evalContext)); assertEquals("any(java.lang.Object[], {@it.testField == 10})", print(expression)); expression = any(targetExpression, eq(ref(ValueReferences.ITERATOR_REF), value("hello"))); - assertTrue(expression.evaluate(ctx)); + assertTrue(expression.evaluate(evalContext)); assertEquals("any(java.lang.Object[], {@it == \"hello\"})", print(expression)); } @Test void testListHasAny() { - ValueReferenceResolver ctx = RefResolverHelper.createResolver(null, null); - ValueExpression targetExpression = DSL.value(Arrays.asList(this, "hello")); + ValueExpression targetExpression = value(Arrays.asList(this, "hello")); HasAnyExpression expression = any(targetExpression, TRUE); - assertTrue(expression.evaluate(ctx)); + assertTrue(expression.evaluate(evalContext)); assertEquals("any(List, {true})", print(expression)); expression = any(targetExpression, FALSE); - assertFalse(expression.evaluate(ctx)); + assertFalse(expression.evaluate(evalContext)); assertEquals("any(List, {false})", print(expression)); expression = any( targetExpression, eq(getMember(ref(ValueReferences.ITERATOR_REF), "testField"), value(10))); - assertTrue(expression.evaluate(ctx)); + assertTrue(expression.evaluate(evalContext)); assertEquals("any(List, {@it.testField == 10})", print(expression)); expression = any(targetExpression, eq(ref(ValueReferences.ITERATOR_REF), value("hello"))); - assertTrue(expression.evaluate(ctx)); + assertTrue(expression.evaluate(evalContext)); assertEquals("any(List, {@it == \"hello\"})", print(expression)); } + @Test + void testLargeListHasAny() { + List largeList = new ArrayList<>(); + for (int i = 0; i < 1_000_000; i++) { + largeList.add(i); + } + ValueExpression targetExpression = value(largeList); + + HasAnyExpression expression = any(targetExpression, FALSE); + EvalContext timeoutEvalContext = createEvalContext(this, Duration.ofMillis(1)); + EvaluationException evaluationException = + assertThrows(EvaluationException.class, () -> expression.evaluate(timeoutEvalContext)); + assertEquals("timeout (1ms)", evaluationException.getMessage()); + assertEquals("any(List, {false})", print(expression)); + } + @Test void testMapHasAny() { - ValueReferenceResolver ctx = RefResolverHelper.createResolver(null, null); Map valueMap = new HashMap<>(); valueMap.put("a", "a"); valueMap.put("b", null); - ValueExpression targetExpression = DSL.value(valueMap); + ValueExpression targetExpression = value(valueMap); HasAnyExpression expression = any(targetExpression, TRUE); - assertTrue(expression.evaluate(ctx)); + assertTrue(expression.evaluate(evalContext)); assertEquals("any(Map, {true})", print(expression)); expression = any(targetExpression, FALSE); - assertFalse(expression.evaluate(ctx)); + assertFalse(expression.evaluate(evalContext)); assertEquals("any(Map, {false})", print(expression)); expression = any(targetExpression, eq(getMember(ref(ValueReferences.ITERATOR_REF), "key"), value("b"))); - assertTrue(expression.evaluate(ctx)); + assertTrue(expression.evaluate(evalContext)); assertEquals("any(Map, {@it.key == \"b\"})", print(expression)); expression = any( targetExpression, eq(getMember(ref(ValueReferences.ITERATOR_REF), "value"), value("a"))); - assertTrue(expression.evaluate(ctx)); + assertTrue(expression.evaluate(evalContext)); assertEquals("any(Map, {@it.value == \"a\"})", print(expression)); expression = any(targetExpression, eq(getMember(ref(ValueReferences.ITERATOR_REF), "key"), value("c"))); - assertFalse(expression.evaluate(ctx)); + assertFalse(expression.evaluate(evalContext)); assertEquals("any(Map, {@it.key == \"c\"})", print(expression)); expression = any( targetExpression, eq(getMember(ref(ValueReferences.ITERATOR_REF), "value"), value("c"))); - assertFalse(expression.evaluate(ctx)); + assertFalse(expression.evaluate(evalContext)); assertEquals("any(Map, {@it.value == \"c\"})", print(expression)); } + @Test + void testLargeMapHasAny() { + Map largeMap = new HashMap<>(); + for (int i = 0; i < 1_000_000; i++) { + largeMap.put(i, i); + } + ValueExpression targetExpression = value(largeMap); + + HasAnyExpression expression = any(targetExpression, FALSE); + EvalContext timeoutEvalContext = createEvalContext(this, Duration.ofMillis(1)); + EvaluationException evaluationException = + assertThrows(EvaluationException.class, () -> expression.evaluate(timeoutEvalContext)); + assertEquals("timeout (1ms)", evaluationException.getMessage()); + assertEquals("any(Map, {false})", print(expression)); + } + @Test void testSetHasAny() { - ValueReferenceResolver ctx = RefResolverHelper.createResolver(null, null); Set valueSet = new HashSet<>(); valueSet.add("foo"); valueSet.add("bar"); - ValueExpression targetExpression = DSL.value(valueSet); + ValueExpression targetExpression = value(valueSet); HasAnyExpression expression = any(targetExpression, TRUE); - assertTrue(expression.evaluate(ctx)); + assertTrue(expression.evaluate(evalContext)); assertEquals("any(Set, {true})", print(expression)); - targetExpression = DSL.value(valueSet); + targetExpression = value(valueSet); expression = any(targetExpression, FALSE); - assertFalse(expression.evaluate(ctx)); + assertFalse(expression.evaluate(evalContext)); assertEquals("any(Set, {false})", print(expression)); expression = any(targetExpression, eq(ref(ValueReferences.ITERATOR_REF), value("foo"))); - assertTrue(expression.evaluate(ctx)); + assertTrue(expression.evaluate(evalContext)); assertEquals("any(Set, {@it == \"foo\"})", print(expression)); expression = any(targetExpression, eq(ref(ValueReferences.ITERATOR_REF), value("key"))); - assertFalse(expression.evaluate(ctx)); + assertFalse(expression.evaluate(evalContext)); assertEquals("any(Set, {@it == \"key\"})", print(expression)); } + @Test + void testLargeSetHasAny() { + Set largeSet = new HashSet<>(); + for (int i = 0; i < 1_000_000; i++) { + largeSet.add(i); + } + ValueExpression targetExpression = value(largeSet); + + HasAnyExpression expression = any(targetExpression, FALSE); + EvalContext timeoutEvalContext = createEvalContext(this, Duration.ofMillis(1)); + EvaluationException evaluationException = + assertThrows(EvaluationException.class, () -> expression.evaluate(timeoutEvalContext)); + assertEquals("timeout (1ms)", evaluationException.getMessage()); + assertEquals("any(Set, {false})", print(expression)); + } + @Test void emptiness() { - ValueReferenceResolver ctx = RefResolverHelper.createResolver(null, null); HasAnyExpression expression = any(value(Collections.emptyList()), TRUE); - assertFalse(expression.evaluate(ctx)); + assertFalse(expression.evaluate(evalContext)); assertEquals("any(List, {true})", print(expression)); expression = any(value(Collections.emptyMap()), TRUE); - assertFalse(expression.evaluate(ctx)); + assertFalse(expression.evaluate(evalContext)); assertEquals("any(Map, {true})", print(expression)); expression = any(value(Collections.emptySet()), TRUE); - assertFalse(expression.evaluate(ctx)); + assertFalse(expression.evaluate(evalContext)); assertEquals("any(Set, {true})", print(expression)); } @Test void keyValueMap() { - ValueReferenceResolver ctx = RefResolverHelper.createResolver(null, null); Map valueMap = new HashMap<>(); valueMap.put("a", "a"); valueMap.put("b", null); - ValueExpression targetExpression = DSL.value(valueMap); + ValueExpression targetExpression = value(valueMap); HasAnyExpression expression = any(targetExpression, eq(ref(ValueReferences.KEY_REF), value("b"))); - assertTrue(expression.evaluate(ctx)); + assertTrue(expression.evaluate(evalContext)); assertEquals("any(Map, {@key == \"b\"})", print(expression)); expression = any(targetExpression, eq(ref(ValueReferences.VALUE_REF), value("a"))); - assertTrue(expression.evaluate(ctx)); + assertTrue(expression.evaluate(evalContext)); assertEquals("any(Map, {@value == \"a\"})", print(expression)); } @Test void testUnsupportedList() { - ValueReferenceResolver ctx = RefResolverHelper.createResolver(null, null); ListValue collection = new ListValue(new CustomList()); HasAnyExpression expression = any(collection, eq(ref(ValueReferences.ITERATOR_REF), value("foo"))); EvaluationException exception = - assertThrows(EvaluationException.class, () -> expression.evaluate(ctx)); + assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext)); assertEquals( "Unsupported List class: com.datadog.debugger.el.expressions.HasAnyExpressionTest$CustomList", exception.getMessage()); @@ -258,11 +303,10 @@ void testUnsupportedList() { @Test void testUnsupportedMap() { - ValueReferenceResolver ctx = RefResolverHelper.createResolver(null, null); MapValue collection = new MapValue(new CustomMap()); HasAnyExpression expression = any(collection, eq(ref(ValueReferences.VALUE_REF), value("foo"))); EvaluationException exception = - assertThrows(EvaluationException.class, () -> expression.evaluate(ctx)); + assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext)); assertEquals( "Unsupported Map class: com.datadog.debugger.el.expressions.HasAnyExpressionTest$CustomMap", exception.getMessage()); @@ -271,12 +315,11 @@ void testUnsupportedMap() { @Test void testUnsupportedSet() { - ValueReferenceResolver ctx = RefResolverHelper.createResolver(null, null); SetValue collection = new SetValue(new CustomSet()); HasAnyExpression expression = any(collection, eq(ref(ValueReferences.ITERATOR_REF), value("foo"))); EvaluationException exception = - assertThrows(EvaluationException.class, () -> expression.evaluate(ctx)); + assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext)); assertEquals( "Unsupported Set class: com.datadog.debugger.el.expressions.HasAnyExpressionTest$CustomSet", exception.getMessage()); diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/IfElseExpressionTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/IfElseExpressionTest.java index f71cd714ee5..04492d597ac 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/IfElseExpressionTest.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/IfElseExpressionTest.java @@ -1,15 +1,17 @@ package com.datadog.debugger.el.expressions; +import static com.datadog.debugger.el.EvalContextHelper.createEvalContext; import static org.junit.jupiter.api.Assertions.*; import com.datadog.debugger.el.DSL; +import com.datadog.debugger.el.EvalContext; import com.datadog.debugger.el.Expression; -import com.datadog.debugger.el.RefResolverHelper; import com.datadog.debugger.el.values.BooleanValue; import org.junit.jupiter.api.Test; class IfElseExpressionTest { private boolean guardFlag = false; + private EvalContext evalContext = createEvalContext(this); @Test void testIfTrue() { @@ -26,7 +28,7 @@ void testIfTrue() { return null; }; IfElseExpression expression = DSL.doif(test, thenExpression, elseExpression); - expression.evaluate(RefResolverHelper.createResolver(this)); + expression.evaluate(evalContext); assertTrue(executed[0]); assertFalse(executed[1]); } @@ -45,7 +47,7 @@ void testIfFalse() { executed[1] = true; return null; }; - DSL.doif(test, thenExpression, elseExpression).evaluate(RefResolverHelper.createResolver(this)); + DSL.doif(test, thenExpression, elseExpression).evaluate(evalContext); assertFalse(executed[0]); assertTrue(executed[1]); } @@ -65,14 +67,14 @@ void testFromContext() { return null; }; guardFlag = false; - DSL.doif(test, thenExpression, elseExpression).evaluate(RefResolverHelper.createResolver(this)); + DSL.doif(test, thenExpression, elseExpression).evaluate(evalContext); assertFalse(executed[0]); assertTrue(executed[1]); executed[1] = false; guardFlag = true; - DSL.doif(test, thenExpression, elseExpression).evaluate(RefResolverHelper.createResolver(this)); + DSL.doif(test, thenExpression, elseExpression).evaluate(evalContext); assertTrue(executed[0]); assertFalse(executed[1]); } diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/IfExpressionTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/IfExpressionTest.java index 59685f59690..cc009684627 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/IfExpressionTest.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/IfExpressionTest.java @@ -1,16 +1,19 @@ package com.datadog.debugger.el.expressions; +import static com.datadog.debugger.el.EvalContextHelper.createEvalContext; import static org.junit.jupiter.api.Assertions.*; import com.datadog.debugger.el.DSL; +import com.datadog.debugger.el.EvalContext; import com.datadog.debugger.el.Expression; -import com.datadog.debugger.el.RefResolverHelper; import com.datadog.debugger.el.values.BooleanValue; import org.junit.jupiter.api.Test; class IfExpressionTest { private boolean guardFlag = false; + private EvalContext evalContext = createEvalContext(this); + @Test void testIfTrue() { boolean[] executed = new boolean[] {false}; @@ -20,7 +23,7 @@ void testIfTrue() { executed[0] = true; return null; }; - DSL.doif(test, expression).evaluate(RefResolverHelper.createResolver(this)); + DSL.doif(test, expression).evaluate(evalContext); assertTrue(executed[0]); } @@ -33,7 +36,7 @@ void testIfFalse() { executed[0] = true; return null; }; - DSL.doif(test, expression).evaluate(RefResolverHelper.createResolver(this)); + DSL.doif(test, expression).evaluate(evalContext); assertFalse(executed[0]); } @@ -47,11 +50,11 @@ void testFromContext() { return null; }; guardFlag = false; - DSL.doif(test, expression).evaluate(RefResolverHelper.createResolver(this)); + DSL.doif(test, expression).evaluate(evalContext); assertFalse(executed[0]); guardFlag = true; - DSL.doif(test, expression).evaluate(RefResolverHelper.createResolver(this)); + DSL.doif(test, expression).evaluate(evalContext); assertTrue(executed[0]); } } diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/IndexExpressionTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/IndexExpressionTest.java index 4a6ea9ab2dd..9a36d2d054c 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/IndexExpressionTest.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/IndexExpressionTest.java @@ -1,12 +1,13 @@ package com.datadog.debugger.el.expressions; +import static com.datadog.debugger.el.EvalContextHelper.createEvalContext; import static com.datadog.debugger.el.PrettyPrintVisitor.print; import static com.datadog.debugger.el.TestHelper.setFieldInConfig; import static org.junit.jupiter.api.Assertions.*; +import com.datadog.debugger.el.EvalContext; import com.datadog.debugger.el.EvaluationException; import com.datadog.debugger.el.RedactedException; -import com.datadog.debugger.el.RefResolverHelper; import com.datadog.debugger.el.Value; import com.datadog.debugger.el.ValueType; import com.datadog.debugger.el.values.ListValue; @@ -46,11 +47,13 @@ class IndexExpressionTest { secretMap.put("foo", new StoreSecret("secret123")); } + EvalContext evalContext = createEvalContext(this); + @Test void testArray() { IndexExpression expr = new IndexExpression(new ValueRefExpression("strArray"), new NumericValue(1, ValueType.INT)); - Value val = expr.evaluate(RefResolverHelper.createResolver(this)); + Value val = expr.evaluate(evalContext); assertNotNull(val); assertFalse(val.isUndefined()); assertEquals("bar", val.getValue()); @@ -61,7 +64,7 @@ void testArray() { void testList() { IndexExpression expr = new IndexExpression(new ValueRefExpression("strList"), new NumericValue(1, ValueType.INT)); - Value val = expr.evaluate(RefResolverHelper.createResolver(this)); + Value val = expr.evaluate(evalContext); assertNotNull(val); assertFalse(val.isUndefined()); assertEquals("bar", val.getValue()); @@ -72,7 +75,7 @@ void testList() { void testMap() { IndexExpression expr = new IndexExpression(new ValueRefExpression("strMap"), new StringValue("foo")); - Value val = expr.evaluate(RefResolverHelper.createResolver(this)); + Value val = expr.evaluate(evalContext); assertNotNull(val); assertFalse(val.isUndefined()); assertEquals("bar", val.getValue()); @@ -84,8 +87,7 @@ void testUnsupportedSet() { IndexExpression expr = new IndexExpression(new SetValue(new HashSet<>()), new StringValue("foo")); EvaluationException evaluationException = - assertThrows( - EvaluationException.class, () -> expr.evaluate(RefResolverHelper.createResolver(this))); + assertThrows(EvaluationException.class, () -> expr.evaluate(evalContext)); assertEquals( "Cannot evaluate the expression for unsupported type: com.datadog.debugger.el.values.SetValue", evaluationException.getMessage()); @@ -97,8 +99,7 @@ void testUnsupportedList() { new IndexExpression( new ListValue(new ArrayList() {}), new NumericValue(0, ValueType.INT)); EvaluationException evaluationException = - assertThrows( - EvaluationException.class, () -> expr.evaluate(RefResolverHelper.createResolver(this))); + assertThrows(EvaluationException.class, () -> expr.evaluate(evalContext)); assertEquals( "Unsupported List class: com.datadog.debugger.el.expressions.IndexExpressionTest$1", evaluationException.getMessage()); @@ -110,8 +111,7 @@ void testOutOfBoundsList() { new IndexExpression( new ListValue(new ArrayList()), new NumericValue(42, ValueType.INT)); EvaluationException evaluationException = - assertThrows( - EvaluationException.class, () -> expr.evaluate(RefResolverHelper.createResolver(this))); + assertThrows(EvaluationException.class, () -> expr.evaluate(evalContext)); assertEquals("index[42] out of bounds: [0-0]", evaluationException.getMessage()); } @@ -120,8 +120,7 @@ void testUnsupportedMap() { IndexExpression expr = new IndexExpression(new MapValue(new HashMap() {}), new StringValue("foo")); EvaluationException evaluationException = - assertThrows( - EvaluationException.class, () -> expr.evaluate(RefResolverHelper.createResolver(this))); + assertThrows(EvaluationException.class, () -> expr.evaluate(evalContext)); assertEquals( "Unsupported Map class: com.datadog.debugger.el.expressions.IndexExpressionTest$2", evaluationException.getMessage()); @@ -132,8 +131,7 @@ void undefined() { IndexExpression expr = new IndexExpression(ValueExpression.UNDEFINED, new NumericValue(1, ValueType.INT)); EvaluationException exception = - assertThrows( - EvaluationException.class, () -> expr.evaluate(RefResolverHelper.createResolver(this))); + assertThrows(EvaluationException.class, () -> expr.evaluate(evalContext)); assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage()); } @@ -142,18 +140,14 @@ void redacted() { IndexExpression expr1 = new IndexExpression(new ValueRefExpression("strMap"), new StringValue("password")); RedactedException redactedException = - assertThrows( - RedactedException.class, - () -> expr1.evaluate(RefResolverHelper.createResolver(this)).getValue()); + assertThrows(RedactedException.class, () -> expr1.evaluate(evalContext).getValue()); assertEquals( "Could not evaluate the expression because 'strMap[\"password\"]' was redacted", redactedException.getMessage()); IndexExpression expr2 = new IndexExpression(new ValueRefExpression("strMap"), new ValueRefExpression("str")); redactedException = - assertThrows( - RedactedException.class, - () -> expr2.evaluate(RefResolverHelper.createResolver(this)).getValue()); + assertThrows(RedactedException.class, () -> expr2.evaluate(evalContext).getValue()); assertEquals( "Could not evaluate the expression because 'strMap[str]' was redacted", redactedException.getMessage()); @@ -172,9 +166,7 @@ void redactedType() { new IndexExpression( new ValueRefExpression("secretArray"), new NumericValue(0, ValueType.INT)); RedactedException redactedException = - assertThrows( - RedactedException.class, - () -> exprArray.evaluate(RefResolverHelper.createResolver(this)).getValue()); + assertThrows(RedactedException.class, () -> exprArray.evaluate(evalContext).getValue()); assertEquals( "Could not evaluate the expression because 'secretArray[0]' was redacted", redactedException.getMessage()); @@ -182,18 +174,14 @@ void redactedType() { new IndexExpression( new ValueRefExpression("secretList"), new NumericValue(0, ValueType.INT)); redactedException = - assertThrows( - RedactedException.class, - () -> exprList.evaluate(RefResolverHelper.createResolver(this)).getValue()); + assertThrows(RedactedException.class, () -> exprList.evaluate(evalContext).getValue()); assertEquals( "Could not evaluate the expression because 'secretList[0]' was redacted", redactedException.getMessage()); IndexExpression exprMap = new IndexExpression(new ValueRefExpression("secretMap"), new StringValue("foo")); redactedException = - assertThrows( - RedactedException.class, - () -> exprMap.evaluate(RefResolverHelper.createResolver(this)).getValue()); + assertThrows(RedactedException.class, () -> exprMap.evaluate(evalContext).getValue()); assertEquals( "Could not evaluate the expression because 'secretMap[\"foo\"]' was redacted", redactedException.getMessage()); @@ -207,12 +195,12 @@ void stringPrimitives() { IndexExpression expr = new IndexExpression( new ValueRefExpression("uuidArray"), new NumericValue(1, ValueType.INT)); - assertEquals(UUID_2, expr.evaluate(RefResolverHelper.createResolver(this)).getValue()); + assertEquals(UUID_2, expr.evaluate(evalContext).getValue()); expr = new IndexExpression(new ValueRefExpression("uuidList"), new NumericValue(1, ValueType.INT)); - assertEquals(UUID_2, expr.evaluate(RefResolverHelper.createResolver(this)).getValue()); + assertEquals(UUID_2, expr.evaluate(evalContext).getValue()); expr = new IndexExpression(new ValueRefExpression("uuidMap"), new StringValue("foo")); - assertEquals(UUID_1, expr.evaluate(RefResolverHelper.createResolver(this)).getValue()); + assertEquals(UUID_1, expr.evaluate(evalContext).getValue()); } private static class StoreSecret { diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/IsDefinedExpressionTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/IsDefinedExpressionTest.java index b8911c90826..53f672cd724 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/IsDefinedExpressionTest.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/IsDefinedExpressionTest.java @@ -1,12 +1,13 @@ package com.datadog.debugger.el.expressions; +import static com.datadog.debugger.el.EvalContextHelper.createEvalContext; import static com.datadog.debugger.el.PrettyPrintVisitor.print; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import com.datadog.debugger.el.DSL; -import com.datadog.debugger.el.RefResolverHelper; +import com.datadog.debugger.el.EvalContext; import com.datadog.debugger.el.Value; import com.datadog.debugger.el.ValueType; import com.datadog.debugger.el.values.BooleanValue; @@ -14,35 +15,34 @@ import com.datadog.debugger.el.values.MapValue; import com.datadog.debugger.el.values.NumericValue; import com.datadog.debugger.el.values.StringValue; -import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver; import datadog.trace.bootstrap.debugger.el.Values; import java.util.Arrays; import java.util.Collections; import org.junit.jupiter.api.Test; class IsDefinedExpressionTest { - private final ValueReferenceResolver resolver = RefResolverHelper.createResolver(this); + private final EvalContext evalContext = createEvalContext(this); @Test void testNullValue() { IsDefinedExpression expression = new IsDefinedExpression(null); - assertFalse(expression.evaluate(resolver)); + assertFalse(expression.evaluate(evalContext)); assertEquals("isDefined(null)", print(expression)); expression = new IsDefinedExpression(DSL.value(Values.NULL_OBJECT)); - assertTrue(expression.evaluate(resolver)); + assertTrue(expression.evaluate(evalContext)); assertEquals("isDefined(null)", print(expression)); expression = new IsDefinedExpression(DSL.value(Value.nullValue())); - assertTrue(expression.evaluate(resolver)); + assertTrue(expression.evaluate(evalContext)); assertEquals("isDefined(com.datadog.debugger.el.values.NullValue)", print(expression)); } @Test void testUndefinedValue() { IsDefinedExpression expression = new IsDefinedExpression(DSL.value(Values.UNDEFINED_OBJECT)); - assertFalse(expression.evaluate(resolver)); + assertFalse(expression.evaluate(evalContext)); assertEquals("isDefined(UNDEFINED)", print(expression)); expression = new IsDefinedExpression(DSL.ref("undefinedvar")); - assertFalse(expression.evaluate(resolver)); + assertFalse(expression.evaluate(evalContext)); } @Test @@ -52,13 +52,13 @@ void testNumericLiteral() { NumericValue none = new NumericValue(null, ValueType.OBJECT); IsDefinedExpression expression = new IsDefinedExpression(zero); - assertTrue(expression.evaluate(resolver)); + assertTrue(expression.evaluate(evalContext)); assertEquals("isDefined(0)", print(expression)); expression = new IsDefinedExpression(one); - assertTrue(expression.evaluate(resolver)); + assertTrue(expression.evaluate(evalContext)); assertEquals("isDefined(1)", print(expression)); expression = new IsDefinedExpression(none); - assertTrue(expression.evaluate(resolver)); + assertTrue(expression.evaluate(evalContext)); assertEquals("isDefined(null)", print(expression)); } @@ -69,13 +69,13 @@ void testBooleanLiteral() { BooleanValue none = new BooleanValue(null, ValueType.OBJECT); IsDefinedExpression expression = new IsDefinedExpression(yes); - assertTrue(expression.evaluate(resolver)); + assertTrue(expression.evaluate(evalContext)); assertEquals("isDefined(true)", print(expression)); expression = new IsDefinedExpression(no); - assertTrue(expression.evaluate(resolver)); + assertTrue(expression.evaluate(evalContext)); assertEquals("isDefined(false)", print(expression)); expression = new IsDefinedExpression(none); - assertTrue(expression.evaluate(resolver)); + assertTrue(expression.evaluate(evalContext)); assertEquals("isDefined(null)", print(expression)); } @@ -89,11 +89,11 @@ void testStringLiteral() { IsDefinedExpression isDefined2 = new IsDefinedExpression(emptyString); IsDefinedExpression isDefined3 = new IsDefinedExpression(nullString); - assertTrue(isDefined1.evaluate(resolver)); + assertTrue(isDefined1.evaluate(evalContext)); assertEquals("isDefined(\"Hello World\")", print(isDefined1)); - assertTrue(isDefined2.evaluate(resolver)); + assertTrue(isDefined2.evaluate(evalContext)); assertEquals("isDefined(\"\")", print(isDefined2)); - assertTrue(isDefined3.evaluate(resolver)); + assertTrue(isDefined3.evaluate(evalContext)); assertEquals("isDefined(\"null\")", print(isDefined3)); } @@ -109,13 +109,13 @@ void testListValue() { IsDefinedExpression isDefined3 = new IsDefinedExpression(nullList); IsDefinedExpression isDefined4 = new IsDefinedExpression(undefinedList); - assertTrue(isDefined1.evaluate(resolver)); + assertTrue(isDefined1.evaluate(evalContext)); assertEquals("isDefined(List)", print(isDefined1)); - assertTrue(isDefined2.evaluate(resolver)); + assertTrue(isDefined2.evaluate(evalContext)); assertEquals("isDefined(List)", print(isDefined2)); - assertTrue(isDefined3.evaluate(resolver)); + assertTrue(isDefined3.evaluate(evalContext)); assertEquals("isDefined(null)", print(isDefined3)); - assertFalse(isDefined4.evaluate(resolver)); + assertFalse(isDefined4.evaluate(evalContext)); assertEquals("isDefined(null)", print(isDefined4)); } @@ -126,19 +126,18 @@ void testMapValue() { MapValue nullMao = new MapValue(null); MapValue undefinedMap = new MapValue(Values.UNDEFINED_OBJECT); - ValueReferenceResolver resolver = RefResolverHelper.createResolver(this); IsDefinedExpression isDefined1 = new IsDefinedExpression(map); IsDefinedExpression isDefined2 = new IsDefinedExpression(emptyMap); IsDefinedExpression isDefined3 = new IsDefinedExpression(nullMao); IsDefinedExpression isDefined4 = new IsDefinedExpression(undefinedMap); - assertTrue(isDefined1.evaluate(resolver)); + assertTrue(isDefined1.evaluate(evalContext)); assertEquals("isDefined(Map)", print(isDefined1)); - assertTrue(isDefined2.evaluate(resolver)); + assertTrue(isDefined2.evaluate(evalContext)); assertEquals("isDefined(Map)", print(isDefined2)); - assertTrue(isDefined3.evaluate(resolver)); + assertTrue(isDefined3.evaluate(evalContext)); assertEquals("isDefined(null)", print(isDefined3)); - assertFalse(isDefined4.evaluate(resolver)); + assertFalse(isDefined4.evaluate(evalContext)); assertEquals("isDefined(null)", print(isDefined4)); } } diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/IsEmptyExpressionTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/IsEmptyExpressionTest.java index d9bb0f4ecd7..3581fd96907 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/IsEmptyExpressionTest.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/IsEmptyExpressionTest.java @@ -1,11 +1,12 @@ package com.datadog.debugger.el.expressions; +import static com.datadog.debugger.el.EvalContextHelper.createEvalContext; import static com.datadog.debugger.el.PrettyPrintVisitor.print; import static org.junit.jupiter.api.Assertions.*; import com.datadog.debugger.el.DSL; +import com.datadog.debugger.el.EvalContext; import com.datadog.debugger.el.EvaluationException; -import com.datadog.debugger.el.RefResolverHelper; import com.datadog.debugger.el.Value; import com.datadog.debugger.el.ValueType; import com.datadog.debugger.el.values.BooleanValue; @@ -13,7 +14,6 @@ import com.datadog.debugger.el.values.MapValue; import com.datadog.debugger.el.values.NumericValue; import com.datadog.debugger.el.values.StringValue; -import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver; import datadog.trace.bootstrap.debugger.el.Values; import java.util.Arrays; import java.util.Collections; @@ -21,30 +21,30 @@ import org.junit.jupiter.api.Test; class IsEmptyExpressionTest { + EvalContext evalContext = createEvalContext(this); + @Test void testNullValue() { - ValueReferenceResolver resolver = RefResolverHelper.createResolver(this); IsEmptyExpression expression1 = new IsEmptyExpression(null); EvaluationException exception = - assertThrows(EvaluationException.class, () -> expression1.evaluate(resolver)); + assertThrows(EvaluationException.class, () -> expression1.evaluate(evalContext)); assertEquals("Cannot evaluate the expression for null value", exception.getMessage()); assertEquals("isEmpty(null)", print(expression1)); IsEmptyExpression expression2 = new IsEmptyExpression(DSL.value(Values.NULL_OBJECT)); - exception = assertThrows(EvaluationException.class, () -> expression2.evaluate(resolver)); + exception = assertThrows(EvaluationException.class, () -> expression2.evaluate(evalContext)); assertEquals("Cannot evaluate the expression for null value", exception.getMessage()); assertEquals("isEmpty(null)", print(expression2)); IsEmptyExpression expression3 = new IsEmptyExpression(DSL.value(Value.nullValue())); - exception = assertThrows(EvaluationException.class, () -> expression3.evaluate(resolver)); + exception = assertThrows(EvaluationException.class, () -> expression3.evaluate(evalContext)); assertEquals("Cannot evaluate the expression for null value", exception.getMessage()); assertEquals("isEmpty(com.datadog.debugger.el.values.NullValue)", print(expression3)); } @Test void testUndefinedValue() { - ValueReferenceResolver resolver = RefResolverHelper.createResolver(this); IsEmptyExpression expression = new IsEmptyExpression(DSL.value(Values.UNDEFINED_OBJECT)); EvaluationException exception = - assertThrows(EvaluationException.class, () -> expression.evaluate(resolver)); + assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext)); assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage()); assertEquals("isEmpty(UNDEFINED)", print(expression)); } @@ -55,15 +55,14 @@ void testNumericLiteral() { NumericValue one = new NumericValue(1, ValueType.INT); NumericValue none = new NumericValue(null, ValueType.OBJECT); - ValueReferenceResolver resolver = RefResolverHelper.createResolver(this); IsEmptyExpression expression = new IsEmptyExpression(zero); - assertFalse(expression.evaluate(resolver)); + assertFalse(expression.evaluate(evalContext)); assertEquals("isEmpty(0)", print(expression)); expression = new IsEmptyExpression(one); - assertFalse(expression.evaluate(resolver)); + assertFalse(expression.evaluate(evalContext)); assertEquals("isEmpty(1)", print(expression)); IsEmptyExpression nullExpression = new IsEmptyExpression(none); - assertThrows(EvaluationException.class, () -> nullExpression.evaluate(resolver)); + assertThrows(EvaluationException.class, () -> nullExpression.evaluate(evalContext)); assertEquals("isEmpty(null)", print(nullExpression)); } @@ -73,16 +72,15 @@ void testBooleanLiteral() { BooleanValue no = BooleanValue.FALSE; BooleanValue none = new BooleanValue(null, ValueType.OBJECT); - ValueReferenceResolver resolver = RefResolverHelper.createResolver(this); IsEmptyExpression expression = new IsEmptyExpression(yes); - assertFalse(expression.evaluate(resolver)); + assertFalse(expression.evaluate(evalContext)); assertEquals("isEmpty(true)", print(expression)); expression = new IsEmptyExpression(no); - assertFalse(expression.evaluate(resolver)); + assertFalse(expression.evaluate(evalContext)); assertEquals("isEmpty(false)", print(expression)); IsEmptyExpression nullExpression = new IsEmptyExpression(none); EvaluationException exception = - assertThrows(EvaluationException.class, () -> nullExpression.evaluate(resolver)); + assertThrows(EvaluationException.class, () -> nullExpression.evaluate(evalContext)); assertEquals("Cannot evaluate the expression for null value", exception.getMessage()); assertEquals("isEmpty(null)", print(nullExpression)); } @@ -93,17 +91,16 @@ void testStringLiteral() { StringValue emptyString = new StringValue(""); StringValue nullString = new StringValue(null); - ValueReferenceResolver resolver = RefResolverHelper.createResolver(this); IsEmptyExpression isEmpty1 = new IsEmptyExpression(string); IsEmptyExpression isEmpty2 = new IsEmptyExpression(emptyString); IsEmptyExpression isEmpty3 = new IsEmptyExpression(nullString); - assertFalse(isEmpty1.evaluate(resolver)); + assertFalse(isEmpty1.evaluate(evalContext)); assertEquals("isEmpty(\"Hello World\")", print(isEmpty1)); - assertTrue(isEmpty2.evaluate(resolver)); + assertTrue(isEmpty2.evaluate(evalContext)); assertEquals("isEmpty(\"\")", print(isEmpty2)); EvaluationException exception = - assertThrows(EvaluationException.class, () -> isEmpty3.evaluate(resolver)); + assertThrows(EvaluationException.class, () -> isEmpty3.evaluate(evalContext)); assertEquals("Cannot evaluate the expression for null value", exception.getMessage()); assertEquals("isEmpty(\"null\")", print(isEmpty3)); } @@ -117,7 +114,6 @@ void testCollectionLiteral() { ListValue set = new ListValue(new HashSet<>(Arrays.asList("a", "b"))); ListValue emptySet = new ListValue(Collections.emptySet()); - ValueReferenceResolver resolver = RefResolverHelper.createResolver(this); IsEmptyExpression isEmpty1 = new IsEmptyExpression(list); IsEmptyExpression isEmpty2 = new IsEmptyExpression(emptyList); IsEmptyExpression isEmpty3 = new IsEmptyExpression(nullList); @@ -125,20 +121,20 @@ void testCollectionLiteral() { IsEmptyExpression isEmpty5 = new IsEmptyExpression(set); IsEmptyExpression isEmpty6 = new IsEmptyExpression(emptySet); - assertFalse(isEmpty1.evaluate(resolver)); + assertFalse(isEmpty1.evaluate(evalContext)); assertEquals("isEmpty(List)", print(isEmpty1)); - assertTrue(isEmpty2.evaluate(resolver)); + assertTrue(isEmpty2.evaluate(evalContext)); assertEquals("isEmpty(List)", print(isEmpty2)); EvaluationException exception = - assertThrows(EvaluationException.class, () -> isEmpty3.evaluate(resolver)); + assertThrows(EvaluationException.class, () -> isEmpty3.evaluate(evalContext)); assertEquals("Cannot evaluate the expression for null value", exception.getMessage()); assertEquals("isEmpty(null)", print(isEmpty3)); - exception = assertThrows(EvaluationException.class, () -> isEmpty4.evaluate(resolver)); + exception = assertThrows(EvaluationException.class, () -> isEmpty4.evaluate(evalContext)); assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage()); assertEquals("isEmpty(null)", print(isEmpty4)); - assertFalse(isEmpty5.evaluate(resolver)); + assertFalse(isEmpty5.evaluate(evalContext)); assertEquals("isEmpty(Set)", print(isEmpty5)); - assertTrue(isEmpty6.evaluate(resolver)); + assertTrue(isEmpty6.evaluate(evalContext)); assertEquals("isEmpty(Set)", print(isEmpty6)); } @@ -149,21 +145,20 @@ void testMapValue() { MapValue nullMao = new MapValue(null); MapValue undefinedMap = new MapValue(Values.UNDEFINED_OBJECT); - ValueReferenceResolver resolver = RefResolverHelper.createResolver(this); IsEmptyExpression isEmpty1 = new IsEmptyExpression(map); IsEmptyExpression isEmpty2 = new IsEmptyExpression(emptyMap); IsEmptyExpression isEmpty3 = new IsEmptyExpression(nullMao); IsEmptyExpression isEmpty4 = new IsEmptyExpression(undefinedMap); - assertFalse(isEmpty1.evaluate(resolver)); + assertFalse(isEmpty1.evaluate(evalContext)); assertEquals("isEmpty(Map)", print(isEmpty1)); - assertTrue(isEmpty2.evaluate(resolver)); + assertTrue(isEmpty2.evaluate(evalContext)); assertEquals("isEmpty(Map)", print(isEmpty2)); EvaluationException exception = - assertThrows(EvaluationException.class, () -> isEmpty3.evaluate(resolver)); + assertThrows(EvaluationException.class, () -> isEmpty3.evaluate(evalContext)); assertEquals("Cannot evaluate the expression for null value", exception.getMessage()); assertEquals("isEmpty(null)", print(isEmpty3)); - exception = assertThrows(EvaluationException.class, () -> isEmpty4.evaluate(resolver)); + exception = assertThrows(EvaluationException.class, () -> isEmpty4.evaluate(evalContext)); assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage()); assertEquals("isEmpty(null)", print(isEmpty4)); } diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/LenExpressionTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/LenExpressionTest.java index a978e6a8a42..5c9d150141c 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/LenExpressionTest.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/LenExpressionTest.java @@ -1,12 +1,12 @@ package com.datadog.debugger.el.expressions; +import static com.datadog.debugger.el.EvalContextHelper.createEvalContext; import static com.datadog.debugger.el.PrettyPrintVisitor.print; import static org.junit.jupiter.api.Assertions.*; import com.datadog.debugger.el.DSL; +import com.datadog.debugger.el.EvalContext; import com.datadog.debugger.el.EvaluationException; -import com.datadog.debugger.el.RefResolverHelper; -import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver; import datadog.trace.bootstrap.debugger.el.Values; import java.util.Arrays; import java.util.Collections; @@ -14,13 +14,13 @@ import org.junit.jupiter.api.Test; class LenExpressionTest { - private final ValueReferenceResolver resolver = RefResolverHelper.createResolver(this); + private final EvalContext evalContext = createEvalContext(this); @Test void nullExpression() { LenExpression expression = new LenExpression(null); EvaluationException exception = - assertThrows(EvaluationException.class, () -> expression.evaluate(resolver).getValue()); + assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext).getValue()); assertEquals("Cannot evaluate the expression for null value", exception.getMessage()); assertEquals("len(null)", print(expression)); } @@ -29,7 +29,7 @@ void nullExpression() { void undefinedExpression() { LenExpression expression = new LenExpression(DSL.value(Values.UNDEFINED_OBJECT)); EvaluationException exception = - assertThrows(EvaluationException.class, () -> expression.evaluate(resolver).getValue()); + assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext).getValue()); assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage()); assertEquals("len(UNDEFINED)", print(expression)); } @@ -37,24 +37,24 @@ void undefinedExpression() { @Test void stringExpression() { LenExpression expression = new LenExpression(DSL.value("a")); - assertEquals(1, expression.evaluate(resolver).getValue()); + assertEquals(1, expression.evaluate(evalContext).getValue()); assertEquals("len(\"a\")", print(expression)); } @Test void collectionExpression() { LenExpression expression = new LenExpression(DSL.value(Arrays.asList("a", "b"))); - assertEquals(2, expression.evaluate(resolver).getValue()); + assertEquals(2, expression.evaluate(evalContext).getValue()); assertEquals("len(List)", print(expression)); expression = new LenExpression(DSL.value(new HashSet<>(Arrays.asList("a", "b")))); - assertEquals(2, expression.evaluate(resolver).getValue()); + assertEquals(2, expression.evaluate(evalContext).getValue()); assertEquals("len(Set)", print(expression)); } @Test void mapExpression() { LenExpression expression = new LenExpression(DSL.value(Collections.singletonMap("a", "b"))); - assertEquals(1, expression.evaluate(resolver).getValue()); + assertEquals(1, expression.evaluate(evalContext).getValue()); assertEquals("len(Map)", print(expression)); } } diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/MatchesExpressionTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/MatchesExpressionTest.java index 23cfc0c7c66..7e33d745532 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/MatchesExpressionTest.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/MatchesExpressionTest.java @@ -1,19 +1,19 @@ package com.datadog.debugger.el.expressions; +import static com.datadog.debugger.el.EvalContextHelper.createEvalContext; import static com.datadog.debugger.el.PrettyPrintVisitor.print; import static org.junit.jupiter.api.Assertions.*; import com.datadog.debugger.el.DSL; +import com.datadog.debugger.el.EvalContext; import com.datadog.debugger.el.EvaluationException; -import com.datadog.debugger.el.RefResolverHelper; import com.datadog.debugger.el.values.StringValue; -import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver; import datadog.trace.bootstrap.debugger.el.Values; import java.net.URI; import org.junit.jupiter.api.Test; class MatchesExpressionTest { - private final ValueReferenceResolver resolver = RefResolverHelper.createResolver(this); + private final EvalContext evalContext = createEvalContext(this); // used to ref lookup URI uri = URI.create("https://www.datadoghq.com"); @@ -21,7 +21,7 @@ class MatchesExpressionTest { void nullExpression() { MatchesExpression expression = new MatchesExpression(null, null); EvaluationException exception = - assertThrows(EvaluationException.class, () -> expression.evaluate(resolver)); + assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext)); assertEquals("Cannot evaluate the expression for null value", exception.getMessage()); assertEquals("matches(null, null)", print(expression)); } @@ -31,7 +31,7 @@ void undefinedExpression() { MatchesExpression expression = new MatchesExpression(DSL.value(Values.UNDEFINED_OBJECT), new StringValue(null)); EvaluationException exception = - assertThrows(EvaluationException.class, () -> expression.evaluate(resolver)); + assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext)); assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage()); assertEquals("matches(UNDEFINED, \"null\")", print(expression)); } @@ -39,17 +39,17 @@ void undefinedExpression() { @Test void stringExpression() { MatchesExpression expression = new MatchesExpression(DSL.value("abc"), new StringValue("abc")); - assertTrue(expression.evaluate(resolver)); + assertTrue(expression.evaluate(evalContext)); assertEquals("matches(\"abc\", \"abc\")", print(expression)); expression = new MatchesExpression(DSL.value("abc"), new StringValue("^ab.*")); - assertTrue(expression.evaluate(resolver)); + assertTrue(expression.evaluate(evalContext)); assertEquals("matches(\"abc\", \"^ab.*\")", print(expression)); expression = new MatchesExpression(DSL.value("abc"), new StringValue("bc")); - assertFalse(expression.evaluate(resolver)); + assertFalse(expression.evaluate(evalContext)); assertEquals("matches(\"abc\", \"bc\")", print(expression)); expression = new MatchesExpression(DSL.value("abc"), new StringValue("[def]+")); - assertFalse(expression.evaluate(resolver)); + assertFalse(expression.evaluate(evalContext)); assertEquals("matches(\"abc\", \"[def]+\")", print(expression)); } @@ -57,7 +57,7 @@ void stringExpression() { void stringPrimitives() { MatchesExpression expression = new MatchesExpression(DSL.ref("uri"), new StringValue("^https?://w{3}\\.datadoghq\\.com$")); - assertTrue(expression.evaluate(resolver)); + assertTrue(expression.evaluate(evalContext)); assertEquals("matches(uri, \"^https?://w{3}\\.datadoghq\\.com$\")", print(expression)); } } diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/NotExpressionTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/NotExpressionTest.java index ac6d251134c..bad4a9f4c0e 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/NotExpressionTest.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/NotExpressionTest.java @@ -1,9 +1,9 @@ package com.datadog.debugger.el.expressions; +import static com.datadog.debugger.el.EvalContextHelper.createEvalContext; import static com.datadog.debugger.el.PrettyPrintVisitor.print; import static org.junit.jupiter.api.Assertions.*; -import com.datadog.debugger.el.RefResolverHelper; import java.util.stream.Stream; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -14,7 +14,7 @@ class NotExpressionTest { @MethodSource("expressions") void testNullPredicate(BooleanExpression expression, boolean expected, String prettyPrint) { NotExpression expr = new NotExpression(expression); - assertEquals(expected, expr.evaluate(RefResolverHelper.createResolver(this))); + assertEquals(expected, expr.evaluate(createEvalContext(this))); assertEquals(prettyPrint, print(expr)); } diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/StartsWithExpressionTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/StartsWithExpressionTest.java index 0626dc1d6ff..f17a11a7946 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/StartsWithExpressionTest.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/StartsWithExpressionTest.java @@ -1,19 +1,19 @@ package com.datadog.debugger.el.expressions; +import static com.datadog.debugger.el.EvalContextHelper.createEvalContext; import static com.datadog.debugger.el.PrettyPrintVisitor.print; import static org.junit.jupiter.api.Assertions.*; import com.datadog.debugger.el.DSL; +import com.datadog.debugger.el.EvalContext; import com.datadog.debugger.el.EvaluationException; -import com.datadog.debugger.el.RefResolverHelper; import com.datadog.debugger.el.values.StringValue; -import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver; import datadog.trace.bootstrap.debugger.el.Values; import java.net.URI; import org.junit.jupiter.api.Test; class StartsWithExpressionTest { - private final ValueReferenceResolver resolver = RefResolverHelper.createResolver(this); + private final EvalContext evalContext = createEvalContext(this); // used to ref lookup URI uri = URI.create("https://www.datadoghq.com"); @@ -21,7 +21,7 @@ class StartsWithExpressionTest { void nullExpression() { StartsWithExpression expression = new StartsWithExpression(null, null); EvaluationException exception = - assertThrows(EvaluationException.class, () -> expression.evaluate(resolver)); + assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext)); assertEquals("Cannot evaluate the expression for null value", exception.getMessage()); assertEquals("startsWith(null, null)", print(expression)); } @@ -31,7 +31,7 @@ void undefinedExpression() { StartsWithExpression expression = new StartsWithExpression(DSL.value(Values.UNDEFINED_OBJECT), new StringValue(null)); EvaluationException exception = - assertThrows(EvaluationException.class, () -> expression.evaluate(resolver)); + assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext)); assertEquals("Cannot evaluate the expression for undefined value", exception.getMessage()); assertEquals("startsWith(UNDEFINED, \"null\")", print(expression)); } @@ -40,11 +40,11 @@ void undefinedExpression() { void stringExpression() { StartsWithExpression expression = new StartsWithExpression(DSL.value("abc"), new StringValue("ab")); - assertTrue(expression.evaluate(resolver)); + assertTrue(expression.evaluate(evalContext)); assertEquals("startsWith(\"abc\", \"ab\")", print(expression)); expression = new StartsWithExpression(DSL.value("abc"), new StringValue("bc")); - assertFalse(expression.evaluate(resolver)); + assertFalse(expression.evaluate(evalContext)); assertEquals("startsWith(\"abc\", \"bc\")", print(expression)); } @@ -52,7 +52,7 @@ void stringExpression() { void stringPrimitives() { StartsWithExpression expression = new StartsWithExpression(DSL.ref("uri"), new StringValue("https")); - assertTrue(expression.evaluate(resolver)); + assertTrue(expression.evaluate(evalContext)); assertEquals("startsWith(uri, \"https\")", print(expression)); } } diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/SubStringExpressionTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/SubStringExpressionTest.java index 57c2ddb8291..3e2479cdd42 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/SubStringExpressionTest.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/SubStringExpressionTest.java @@ -1,19 +1,19 @@ package com.datadog.debugger.el.expressions; +import static com.datadog.debugger.el.EvalContextHelper.createEvalContext; import static com.datadog.debugger.el.PrettyPrintVisitor.print; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import com.datadog.debugger.el.DSL; +import com.datadog.debugger.el.EvalContext; import com.datadog.debugger.el.EvaluationException; -import com.datadog.debugger.el.RefResolverHelper; -import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver; import datadog.trace.bootstrap.debugger.el.Values; import java.net.URI; import org.junit.jupiter.api.Test; public class SubStringExpressionTest { - private final ValueReferenceResolver resolver = RefResolverHelper.createResolver(this); + private final EvalContext evalContext = createEvalContext(this); // used to ref lookup URI uri = URI.create("https://www.datadoghq.com"); Object nullValue = null; @@ -22,11 +22,11 @@ public class SubStringExpressionTest { void nullExpression() { SubStringExpression expression1 = new SubStringExpression(null, 0, 0); EvaluationException evaluationException = - assertThrows(EvaluationException.class, () -> expression1.evaluate(resolver)); + assertThrows(EvaluationException.class, () -> expression1.evaluate(evalContext)); assertEquals("substring(null, 0, 0)", evaluationException.getExpr()); SubStringExpression expression2 = new SubStringExpression(DSL.ref("nullValue"), 0, 0); evaluationException = - assertThrows(EvaluationException.class, () -> expression2.evaluate(resolver)); + assertThrows(EvaluationException.class, () -> expression2.evaluate(evalContext)); assertEquals("substring(nullValue, 0, 0)", evaluationException.getExpr()); } @@ -35,14 +35,14 @@ void undefinedExpression() { SubStringExpression expression = new SubStringExpression(DSL.value(Values.UNDEFINED_OBJECT), 0, 0); EvaluationException evaluationException = - assertThrows(EvaluationException.class, () -> expression.evaluate(resolver)); + assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext)); assertEquals("substring(UNDEFINED, 0, 0)", evaluationException.getExpr()); } @Test void stringExpression() { SubStringExpression expression = new SubStringExpression(DSL.value("abc"), 0, 1); - assertEquals("a", expression.evaluate(resolver).getValue()); + assertEquals("a", expression.evaluate(evalContext).getValue()); assertEquals("substring(\"abc\", 0, 1)", print(expression)); } @@ -50,14 +50,14 @@ void stringExpression() { void stringOutOfBoundsExpression() { SubStringExpression expression = new SubStringExpression(DSL.value("abc"), 0, 10); EvaluationException evaluationException = - assertThrows(EvaluationException.class, () -> expression.evaluate(resolver)); + assertThrows(EvaluationException.class, () -> expression.evaluate(evalContext)); assertEquals("substring(\"abc\", 0, 10)", evaluationException.getExpr()); } @Test void stringPrimitives() { SubStringExpression expression = new SubStringExpression(DSL.ref("uri"), 0, 5); - assertEquals("https", expression.evaluate(resolver).getValue()); + assertEquals("https", expression.evaluate(evalContext).getValue()); assertEquals("substring(uri, 0, 5)", print(expression)); } } diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/ValueRefExpressionTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/ValueRefExpressionTest.java index c5501252962..7bc26b1540e 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/ValueRefExpressionTest.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/ValueRefExpressionTest.java @@ -1,19 +1,22 @@ package com.datadog.debugger.el.expressions; import static com.datadog.debugger.el.DSL.*; +import static com.datadog.debugger.el.EvalContextHelper.TEST_TIMEOUT; +import static com.datadog.debugger.el.EvalContextHelper.createEvalContext; +import static com.datadog.debugger.el.EvalContextHelper.createResolver; import static com.datadog.debugger.el.PrettyPrintVisitor.print; import static com.datadog.debugger.el.TestHelper.setFieldInConfig; import static org.junit.jupiter.api.Assertions.*; import com.datadog.debugger.el.DSL; +import com.datadog.debugger.el.EvalContext; import com.datadog.debugger.el.RedactedException; -import com.datadog.debugger.el.RefResolverHelper; import com.datadog.debugger.el.Value; import datadog.trace.api.Config; import datadog.trace.bootstrap.debugger.CapturedContext.CapturedValue; -import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver; import datadog.trace.bootstrap.debugger.el.ValueReferences; import datadog.trace.bootstrap.debugger.util.Redaction; +import datadog.trace.bootstrap.debugger.util.TimeoutChecker; import java.util.HashMap; import java.util.Map; import java.util.UUID; @@ -26,7 +29,7 @@ class ValueRefExpressionTest { void testRef() { ValueRefExpression valueRef = new ValueRefExpression("b"); ExObjectWithRefAndValue instance = new ExObjectWithRefAndValue(null, "hello"); - Value val = valueRef.evaluate(RefResolverHelper.createResolver(instance)); + Value val = valueRef.evaluate(createEvalContext(instance)); assertNotNull(val); assertFalse(val.isUndefined()); assertEquals(instance.getB(), val.getValue()); @@ -42,19 +45,21 @@ void testPredicatedRef() { IsEmptyExpression isEmptyInvalid = new IsEmptyExpression(invalidValueRef); ExObjectWithRefAndValue instance = new ExObjectWithRefAndValue(null, "hello"); - ValueReferenceResolver ctx = RefResolverHelper.createResolver(instance); + EvalContext evalContext = createEvalContext(instance); - assertFalse(isEmpty.evaluate(ctx)); + assertFalse(isEmpty.evaluate(evalContext)); assertEquals("isEmpty(b)", print(isEmpty)); RuntimeException runtimeException = - assertThrows(RuntimeException.class, () -> isEmptyInvalid.evaluate(ctx)); + assertThrows(RuntimeException.class, () -> isEmptyInvalid.evaluate(evalContext)); assertEquals("Cannot dereference field: x", runtimeException.getMessage()); runtimeException = - assertThrows(RuntimeException.class, () -> and(isEmptyInvalid, isEmpty).evaluate(ctx)); + assertThrows( + RuntimeException.class, () -> and(isEmptyInvalid, isEmpty).evaluate(evalContext)); assertEquals("Cannot dereference field: x", runtimeException.getMessage()); runtimeException = - assertThrows(RuntimeException.class, () -> or(isEmptyInvalid, isEmpty).evaluate(ctx)); + assertThrows( + RuntimeException.class, () -> or(isEmptyInvalid, isEmpty).evaluate(evalContext)); assertEquals("Cannot dereference field: x", runtimeException.getMessage()); assertEquals("isEmpty(x)", print(isEmptyInvalid)); } @@ -74,30 +79,33 @@ class Obj { exts.put(ValueReferences.RETURN_EXTENSION_NAME, CapturedValue.of(returnVal)); exts.put(ValueReferences.DURATION_EXTENSION_NAME, CapturedValue.of(duration)); exts.put(ValueReferences.EXCEPTION_EXTENSION_NAME, CapturedValue.of(exception)); - ValueReferenceResolver resolver = - RefResolverHelper.createResolver(new Obj()).withExtensions(exts); + EvalContext evalContext = + new EvalContext( + createResolver(new Obj()).withExtensions(exts), + TimeoutChecker.create(Config.get(), TEST_TIMEOUT)); ValueRefExpression expression = DSL.ref(ValueReferences.DURATION_REF); - assertEquals(duration, expression.evaluate(resolver).getValue()); + assertEquals(duration, expression.evaluate(evalContext).getValue()); assertEquals("@duration", print(expression)); expression = DSL.ref(ValueReferences.RETURN_REF); - assertEquals(returnVal, expression.evaluate(resolver).getValue()); + assertEquals(returnVal, expression.evaluate(evalContext).getValue()); assertEquals("@return", print(expression)); expression = DSL.ref(ValueReferences.EXCEPTION_REF); - assertEquals(exception, expression.evaluate(resolver).getValue()); + assertEquals(exception, expression.evaluate(evalContext).getValue()); assertEquals("@exception", print(expression)); expression = DSL.ref("limit"); - assertEquals(511L, expression.evaluate(resolver).getValue()); + assertEquals(511L, expression.evaluate(evalContext).getValue()); assertEquals("limit", print(expression)); expression = DSL.ref("msg"); - assertEquals("Hello there", expression.evaluate(resolver).getValue()); + assertEquals("Hello there", expression.evaluate(evalContext).getValue()); assertEquals("msg", print(expression)); expression = DSL.ref("i"); - assertEquals(6, expression.evaluate(resolver).getValue()); // int value is widened to long + assertEquals(6, expression.evaluate(evalContext).getValue()); // int value is widened to long assertEquals("i", print(expression)); ValueRefExpression invalidExpression = ref(ValueReferences.synthetic("invalid")); RuntimeException runtimeException = - assertThrows(RuntimeException.class, () -> invalidExpression.evaluate(resolver).getValue()); + assertThrows( + RuntimeException.class, () -> invalidExpression.evaluate(evalContext).getValue()); assertEquals("Cannot find synthetic var: invalid", runtimeException.getMessage()); assertEquals("@invalid", print(invalidExpression)); } @@ -115,9 +123,7 @@ public void redacted() { ValueRefExpression valueRef = new ValueRefExpression("password"); StoreSecret instance = new StoreSecret("secret123"); RedactedException redactedException = - assertThrows( - RedactedException.class, - () -> valueRef.evaluate(RefResolverHelper.createResolver(instance))); + assertThrows(RedactedException.class, () -> valueRef.evaluate(createEvalContext(instance))); assertEquals( "Could not evaluate the expression because 'password' was redacted", redactedException.getMessage()); @@ -136,8 +142,7 @@ class Holder { } RedactedException redactedException = assertThrows( - RedactedException.class, - () -> valueRef.evaluate(RefResolverHelper.createResolver(new Holder()))); + RedactedException.class, () -> valueRef.evaluate(createEvalContext(new Holder()))); assertEquals( "Could not evaluate the expression because 'store' was redacted", redactedException.getMessage()); @@ -153,13 +158,13 @@ class StrPrimitive { Class clazz = String.class; } ValueRefExpression valueRef = new ValueRefExpression("uuid"); - Value val = valueRef.evaluate(RefResolverHelper.createResolver(new StrPrimitive())); + Value val = valueRef.evaluate(createEvalContext(new StrPrimitive())); assertNotNull(val); assertFalse(val.isUndefined()); assertEquals("123e4567-e89b-12d3-a456-426655440000", val.getValue()); assertEquals("uuid", print(valueRef)); valueRef = new ValueRefExpression("clazz"); - val = valueRef.evaluate(RefResolverHelper.createResolver(new StrPrimitive())); + val = valueRef.evaluate(createEvalContext(new StrPrimitive())); assertNotNull(val); assertFalse(val.isUndefined()); assertEquals("java.lang.String", val.getValue()); diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/resources/test_conditional_14.json b/dd-java-agent/agent-debugger/debugger-el/src/test/resources/test_conditional_14.json index 69577b9e305..787c7f74691 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/test/resources/test_conditional_14.json +++ b/dd-java-agent/agent-debugger/debugger-el/src/test/resources/test_conditional_14.json @@ -7,7 +7,8 @@ {"eq": [{"count": {"ref": "strArray"}}, 2]}, {"eq": [{"count": {"ref": "strMap"}}, 2]}, {"eq": [{"count": {"ref": "strSet"}}, 1]}, - {"eq": [{"count": {"ref": "strList"}}, 1]} + {"eq": [{"count": {"ref": "strList"}}, 1]}, + {"all": [{"ref": "largeList"}, {"neq": [{"ref": "@it"}, "d"]}]} ] } } diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/resources/test_value_expr_01.json b/dd-java-agent/agent-debugger/debugger-el/src/test/resources/test_value_expr_01.json index f19b01f7f57..4c8ec9294cb 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/test/resources/test_value_expr_01.json +++ b/dd-java-agent/agent-debugger/debugger-el/src/test/resources/test_value_expr_01.json @@ -1,9 +1,9 @@ { "dsl": "", "json": { - "and": [ + "or": [ { - "or": [ + "and": [ {"eq": [{"ref": "i"}, 10]}, {"==": [{"ref": "i"}, 10]}, {"lt": [{"ref": "i"}, 11]}, @@ -20,6 +20,7 @@ {"not": {"isEmpty": {"ref": "list"}}}, {"any": [{"ref": "list"}, {"eq": [{"ref": "@it"}, "a"]}]}, {"all": [{"ref": "list"}, {"neq": [{"ref": "@it"}, "d"]}]}, + {"all": [{"ref": "largeList"}, {"neq": [{"ref": "@it"}, "d"]}]}, {"startsWith": [{"ref": "str"}, "hel"]}, {"endsWith": [{"ref": "str"}, "llo"]}, {"contains": [{"ref": "str"}, "ll"]}, diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/JsonSnapshotSerializer.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/JsonSnapshotSerializer.java index f3971f0d331..4acfef797f9 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/JsonSnapshotSerializer.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/JsonSnapshotSerializer.java @@ -10,14 +10,12 @@ import datadog.trace.bootstrap.debugger.CapturedContext; import datadog.trace.bootstrap.debugger.DebuggerContext; import java.time.Duration; -import java.time.temporal.ChronoUnit; /** Serializes snapshots in Json using Moshi */ public class JsonSnapshotSerializer implements DebuggerContext.ValueSerializer { private static final JsonAdapter ADAPTER = MoshiHelper.createMoshiSnapshot( - Duration.of( - Config.get().getDynamicInstrumentationCaptureTimeout(), ChronoUnit.MILLIS)) + Duration.ofMillis(Config.get().getDynamicInstrumentationCaptureTimeout())) .adapter(IntakeRequest.class); private static final JsonAdapter VALUE_ADAPTER = new MoshiSnapshotHelper.CapturedValueAdapter(); diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/StringTemplateBuilder.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/StringTemplateBuilder.java index 8bd75149e39..893d1a43d65 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/StringTemplateBuilder.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/StringTemplateBuilder.java @@ -7,10 +7,13 @@ import com.datadog.debugger.el.Value; import com.datadog.debugger.el.ValueScript; import com.datadog.debugger.probe.LogProbe; +import datadog.trace.api.Config; import datadog.trace.bootstrap.debugger.CapturedContext; import datadog.trace.bootstrap.debugger.EvaluationError; import datadog.trace.bootstrap.debugger.Limits; import datadog.trace.bootstrap.debugger.util.Redaction; +import datadog.trace.bootstrap.debugger.util.TimeoutChecker; +import java.time.Duration; import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,6 +40,9 @@ public String evaluate(CapturedContext context, LogProbe.LogStatus status) { return null; } StringBuilder sb = new StringBuilder(); + // Only one timeout for all expressions + Duration timeout = Duration.ofMillis(Config.get().getDynamicInstrumentationEvalTimeout()); + TimeoutChecker timeoutChecker = TimeoutChecker.create(Config.get(), timeout); for (LogProbe.Segment segment : segments) { ValueScript parsedExr = segment.getParsedExpr(); if (segment.getStr() != null) { @@ -44,7 +50,7 @@ public String evaluate(CapturedContext context, LogProbe.LogStatus status) { } else { if (parsedExr != null) { try { - Value result = parsedExr.execute(context); + Value result = parsedExr.execute(context, timeoutChecker); if (result.isUndefined()) { sb.append(result.getValue()); } else if (result.isNull()) { diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/LogProbe.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/LogProbe.java index 3418ea1af4d..a6fd0cb5519 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/LogProbe.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/LogProbe.java @@ -44,7 +44,6 @@ import de.thetaphi.forbiddenapis.SuppressForbidden; import java.io.IOException; import java.time.Duration; -import java.time.temporal.ChronoUnit; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; @@ -590,7 +589,9 @@ private boolean evaluateCondition(CapturedContext capture, LogStatus status) { return true; } try { - if (!probeCondition.execute(capture)) { + Duration timeout = Duration.ofMillis(Config.get().getDynamicInstrumentationEvalTimeout()); + TimeoutChecker timeoutChecker = TimeoutChecker.create(Config.get(), timeout); + if (!probeCondition.execute(capture, timeoutChecker)) { return false; } } catch (EvaluationException ex) { @@ -720,7 +721,9 @@ private void processCaptureExpressions(CapturedContext context, LogStatus logSta } for (CaptureExpression captureExpression : captureExpressions) { try { - Value result = captureExpression.expr.execute(context); + Duration timeout = Duration.ofMillis(Config.get().getDynamicInstrumentationEvalTimeout()); + TimeoutChecker timeoutChecker = TimeoutChecker.create(Config.get(), timeout); + Value result = captureExpression.expr.execute(context, timeoutChecker); if (result.isUndefined()) { throw new EvaluationException("UNDEFINED", captureExpression.getExpr().getDsl()); } @@ -837,9 +840,8 @@ public void commit(CapturedContext lineContext, int line) { if (isFullSnapshot()) { // freeze context just before commit because line probes have only one context Duration timeout = - Duration.of( - Config.get().getDynamicInstrumentationCaptureTimeout(), ChronoUnit.MILLIS); - lineContext.freeze(new TimeoutChecker(timeout)); + Duration.ofMillis(Config.get().getDynamicInstrumentationCaptureTimeout()); + lineContext.freeze(TimeoutChecker.create(Config.get(), timeout)); snapshot.addLine(lineContext, line); } commitSnapshot(snapshot, sink); diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/SpanDecorationProbe.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/SpanDecorationProbe.java index af9354429d1..d0c60012153 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/SpanDecorationProbe.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/SpanDecorationProbe.java @@ -10,6 +10,7 @@ import com.datadog.debugger.instrumentation.InstrumentationResult; import com.datadog.debugger.instrumentation.MethodInfo; import com.datadog.debugger.sink.Snapshot; +import datadog.trace.api.Config; import datadog.trace.api.Pair; import datadog.trace.api.sampling.Sampler; import datadog.trace.bootstrap.debugger.CapturedContext; @@ -20,9 +21,11 @@ import datadog.trace.bootstrap.debugger.ProbeId; import datadog.trace.bootstrap.debugger.ProbeImplementation; import datadog.trace.bootstrap.debugger.ProbeRateLimiter; +import datadog.trace.bootstrap.debugger.util.TimeoutChecker; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import datadog.trace.util.TagsHelper; +import java.time.Duration; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -206,10 +209,13 @@ public void evaluate( CapturedContext.Status status, MethodLocation methodLocation, boolean singleProbe) { + // Only one timeout for all conditions + Duration timeout = Duration.ofMillis(Config.get().getDynamicInstrumentationEvalTimeout()); + TimeoutChecker timeoutChecker = TimeoutChecker.create(Config.get(), timeout); for (Decoration decoration : decorations) { if (decoration.when != null) { try { - boolean condition = decoration.when.execute(context); + boolean condition = decoration.when.execute(context, timeoutChecker); if (!condition) { continue; } diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/TriggerProbe.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/TriggerProbe.java index f890df1d8e9..945b2a052dc 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/TriggerProbe.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/TriggerProbe.java @@ -9,15 +9,18 @@ import com.datadog.debugger.instrumentation.DiagnosticMessage; import com.datadog.debugger.instrumentation.InstrumentationResult; import com.datadog.debugger.instrumentation.MethodInfo; +import datadog.trace.api.Config; import datadog.trace.api.sampling.Sampler; import datadog.trace.bootstrap.debugger.CapturedContext; import datadog.trace.bootstrap.debugger.CapturedContextProbe; import datadog.trace.bootstrap.debugger.MethodLocation; import datadog.trace.bootstrap.debugger.ProbeId; import datadog.trace.bootstrap.debugger.ProbeRateLimiter; +import datadog.trace.bootstrap.debugger.util.TimeoutChecker; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import datadog.trace.bootstrap.instrumentation.api.Tags; +import java.time.Duration; import java.util.Arrays; import java.util.List; import java.util.Objects; @@ -134,7 +137,8 @@ private boolean evaluateCondition(CapturedContext capture) { } long start = System.nanoTime(); try { - return probeCondition.execute(capture); + Duration timeout = Duration.ofMillis(Config.get().getDynamicInstrumentationEvalTimeout()); + return probeCondition.execute(capture, TimeoutChecker.create(Config.get(), timeout)); } catch (Exception ex) { DebuggerAgent.getSink().getProbeStatusSink().addError(probeId, ex); return false; diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/MoshiSnapshotHelper.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/MoshiSnapshotHelper.java index 68cbb430c3e..b9aa67c28bf 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/MoshiSnapshotHelper.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/MoshiSnapshotHelper.java @@ -21,7 +21,6 @@ import java.lang.reflect.Type; import java.nio.charset.StandardCharsets; import java.time.Duration; -import java.time.temporal.ChronoUnit; import java.util.List; import java.util.Map; import java.util.Set; @@ -118,8 +117,7 @@ public void toJson(JsonWriter jsonWriter, Snapshot.Captures captures) throws IOE jsonWriter.nullValue(); return; } - jsonWriter.setTag( - TimeoutChecker.class, new TimeoutChecker(System.currentTimeMillis(), captureTimeOut)); + jsonWriter.setTag(TimeoutChecker.class, TimeoutChecker.create(Config.get(), captureTimeOut)); jsonWriter.beginObject(); jsonWriter.name(ENTRY); capturedContextAdapter.toJson(jsonWriter, captures.getEntry()); @@ -160,12 +158,12 @@ public void toJson(JsonWriter jsonWriter, CapturedContext capturedContext) throw TimeoutChecker timeoutChecker = jsonWriter.tag(TimeoutChecker.class); if (timeoutChecker == null) { Duration timeout = - Duration.of(Config.get().getDynamicInstrumentationCaptureTimeout(), ChronoUnit.MILLIS); - timeoutChecker = new TimeoutChecker(timeout); + Duration.ofMillis(Config.get().getDynamicInstrumentationCaptureTimeout()); + timeoutChecker = TimeoutChecker.create(Config.get(), timeout); } // need to 'freeze' the context before serializing it capturedContext.freeze(timeoutChecker); - if (timeoutChecker.isTimedOut(System.currentTimeMillis())) { + if (timeoutChecker.isTimedOut()) { jsonWriter.beginObject(); jsonWriter.name(NOT_CAPTURED_REASON); jsonWriter.value(TIMEOUT_REASON); @@ -273,7 +271,7 @@ private SerializationResult toJsonCapturedValues( if (count >= limits.maxFieldCount) { return SerializationResult.FIELD_COUNT; } - if (timeoutChecker.isTimedOut(System.currentTimeMillis())) { + if (timeoutChecker.isTimedOut()) { return SerializationResult.TIMEOUT; } jsonWriter.name(entry.getKey()); @@ -305,7 +303,7 @@ public void toJson(JsonWriter jsonWriter, CapturedContext.CapturedValue captured } TimeoutChecker timeoutChecker = capturedValue.getTimeoutChecker(); if (timeoutChecker == null) { - timeoutChecker = new TimeoutChecker(Duration.of(10, ChronoUnit.MILLIS)); + timeoutChecker = TimeoutChecker.create(Config.get(), Duration.ofMillis(10)); } Object value = capturedValue.getValue(); String type = capturedValue.getType(); diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/SerializerWithLimits.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/SerializerWithLimits.java index 0ee03a7f52a..211543efa14 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/SerializerWithLimits.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/SerializerWithLimits.java @@ -137,7 +137,7 @@ public void serialize(Object value, String type, Limits limits) throws Exception tokenWriter.epilogue(value); return; } - if (timeoutChecker.isTimedOut(System.currentTimeMillis())) { + if (timeoutChecker.isTimedOut()) { tokenWriter.notCaptured(NotCapturedReason.TIMEOUT); tokenWriter.epilogue(value); return; diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/ValueScriptHelper.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/ValueScriptHelper.java index bdbbacec81d..1ae9d5079d2 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/ValueScriptHelper.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/ValueScriptHelper.java @@ -6,14 +6,12 @@ import datadog.trace.bootstrap.debugger.Limits; import datadog.trace.bootstrap.debugger.util.TimeoutChecker; import java.time.Duration; -import java.time.temporal.ChronoUnit; public class ValueScriptHelper { public static void serializeValue( StringBuilder sb, String expr, Object value, CapturedContext.Status status, Limits limits) { - Duration timeout = - Duration.of(Config.get().getDynamicInstrumentationCaptureTimeout(), ChronoUnit.MILLIS); - TimeoutChecker timeoutChecker = new TimeoutChecker(timeout); + Duration timeout = Duration.ofMillis(Config.get().getDynamicInstrumentationCaptureTimeout()); + TimeoutChecker timeoutChecker = TimeoutChecker.create(Config.get(), timeout); SerializerWithLimits serializer = new SerializerWithLimits(new StringTokenWriter(sb, status.getErrors()), timeoutChecker); try { diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/SnapshotSerializationTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/SnapshotSerializationTest.java index 539a123b52d..0018c6d182b 100644 --- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/SnapshotSerializationTest.java +++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/SnapshotSerializationTest.java @@ -31,6 +31,7 @@ import com.datadog.debugger.util.MoshiSnapshotTestHelper; import com.squareup.moshi.JsonAdapter; import datadog.environment.JavaVirtualMachine; +import datadog.trace.api.Config; import datadog.trace.bootstrap.debugger.CapturedContext; import datadog.trace.bootstrap.debugger.CapturedStackFrame; import datadog.trace.bootstrap.debugger.DebuggerContext; @@ -922,11 +923,9 @@ public void fieldCount20() throws IOException { @Test @Flaky public void timeOut() throws IOException { - DebuggerContext.initValueSerializer( - new TimeoutSnapshotSerializer(Duration.of(150, ChronoUnit.MILLIS))); + DebuggerContext.initValueSerializer(new TimeoutSnapshotSerializer(Duration.ofMillis(150))); JsonAdapter adapter = - MoshiHelper.createMoshiSnapshot(Duration.of(100, ChronoUnit.MILLIS)) - .adapter(Snapshot.class); + MoshiHelper.createMoshiSnapshot(Duration.ofMillis(100)).adapter(Snapshot.class); Snapshot snapshot = createSnapshot(); CapturedContext context = new CapturedContext(); CapturedContext.CapturedValue arg1 = CapturedContext.CapturedValue.of("arg1", "int", 42); @@ -949,7 +948,7 @@ public void valueTimeout() throws IOException { new TimeoutSnapshotSerializer(Duration.of(20, ChronoUnit.MILLIS))); CapturedContext.CapturedValue arg1 = CapturedContext.CapturedValue.of("arg1", Random.class.getTypeName(), new Random(0)); - arg1.freeze(new TimeoutChecker(Duration.ofMillis(10))); + arg1.freeze(TimeoutChecker.create(Config.get(), Duration.ofMillis(10))); String buffer = arg1.getStrValue(); System.out.println(buffer); Map json = MoshiHelper.createGenericAdapter().fromJson(buffer); diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/el/ELIntegrationSanityTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/el/ELIntegrationSanityTest.java index 9ac26df3239..7b6382cae21 100644 --- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/el/ELIntegrationSanityTest.java +++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/el/ELIntegrationSanityTest.java @@ -4,6 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import com.datadog.debugger.agent.JsonSnapshotSerializer; +import datadog.trace.api.Config; import datadog.trace.bootstrap.debugger.CapturedContext; import datadog.trace.bootstrap.debugger.DebuggerContext; import datadog.trace.bootstrap.debugger.Limits; @@ -59,12 +60,16 @@ void extractAfterEl() throws IllegalAccessException { capturedContext.addArguments(new CapturedContext.CapturedValue[] {thisValue}); // '.name.value' is not present in the snapshot - it needs to be retrieved via reflection - Value val = DSL.getMember(DSL.ref("name"), "value").evaluate(capturedContext); + Value val = + DSL.getMember(DSL.ref("name"), "value") + .evaluate( + new EvalContext( + capturedContext, TimeoutChecker.create(Config.get(), Duration.ofMillis(1000)))); // make sure the nested field was properly resolved assertEquals(p.name.value, val.getValue()); // freeze the captured context - capturedContext.freeze(new TimeoutChecker(Duration.of(1, ChronoUnit.SECONDS))); + capturedContext.freeze(TimeoutChecker.create(Config.get(), Duration.of(1, ChronoUnit.SECONDS))); // after freezing the original value is removed and only the serialized json representation // remains diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/StringTokenWriterTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/StringTokenWriterTest.java index 2480ca2004c..3009ff735d6 100644 --- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/StringTokenWriterTest.java +++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/StringTokenWriterTest.java @@ -7,10 +7,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; +import datadog.trace.api.Config; import datadog.trace.bootstrap.debugger.Limits; import datadog.trace.bootstrap.debugger.util.TimeoutChecker; import java.time.Duration; -import java.time.temporal.ChronoUnit; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -175,7 +175,7 @@ private String serializeValue(Object value, Limits limits) throws Exception { SerializerWithLimits serializer = new SerializerWithLimits( new StringTokenWriter(sb, new ArrayList<>()), - new TimeoutChecker(Duration.of(300, ChronoUnit.SECONDS))); + TimeoutChecker.create(Config.get(), Duration.ofSeconds(300))); serializer.serialize( value, value != null ? value.getClass().getTypeName() : Object.class.getTypeName(), limits); return sb.toString(); diff --git a/dd-smoke-tests/debugger-integration-tests/src/main/java/datadog/smoketest/debugger/DebuggerTestApplication.java b/dd-smoke-tests/debugger-integration-tests/src/main/java/datadog/smoketest/debugger/DebuggerTestApplication.java index 2c1ffc19559..030167f6496 100644 --- a/dd-smoke-tests/debugger-integration-tests/src/main/java/datadog/smoketest/debugger/DebuggerTestApplication.java +++ b/dd-smoke-tests/debugger-integration-tests/src/main/java/datadog/smoketest/debugger/DebuggerTestApplication.java @@ -6,7 +6,9 @@ import java.lang.management.ManagementFactory; import java.lang.management.OperatingSystemMXBean; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.function.Consumer; @@ -51,6 +53,7 @@ private static void registerMethods() { methodsByName.put("multiProbesFullMethod", Main::runFullMethod); methodsByName.put("loopingFullMethod", Main::runLoopingFullMethod); methodsByName.put("exceptionMethod", Main::runExceptionMethod); + methodsByName.put("processLargeCollection", Main::runProcessLargeCollection); } private static void emptyMethod(String arg) {} @@ -82,6 +85,10 @@ private static void runExceptionMethod(String s) { exceptionMethod(s); } + private static void runProcessLargeCollection(String arg) { + processLargeCollection(1_000_000); + } + private static String fullMethod( int argInt, String argStr, double argDouble, Map argMap, String... argVar) { try { @@ -113,4 +120,14 @@ private static void exceptionMethod(String arg) { } } } + + private static void processLargeCollection(int largeListSize) { + List largeList = new ArrayList<>(); + for (int i = 0; i < largeListSize; i++) { + largeList.add("foobar" + i); + } + for (int i = 0; i < largeListSize; i++) { + largeList.get(i); + } + } } diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/LogProbesIntegrationTest.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/LogProbesIntegrationTest.java index 10c2bd38bd9..2d594af97e7 100644 --- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/LogProbesIntegrationTest.java +++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/LogProbesIntegrationTest.java @@ -1,7 +1,9 @@ package datadog.smoketest; +import static com.datadog.debugger.el.DSL.all; import static com.datadog.debugger.el.DSL.and; import static com.datadog.debugger.el.DSL.eq; +import static com.datadog.debugger.el.DSL.filter; import static com.datadog.debugger.el.DSL.gt; import static com.datadog.debugger.el.DSL.len; import static com.datadog.debugger.el.DSL.nullValue; @@ -9,6 +11,7 @@ import static com.datadog.debugger.el.DSL.value; import static com.datadog.debugger.el.DSL.when; import static com.datadog.debugger.util.LogProbeTestHelper.parseTemplate; +import static java.util.Collections.singletonList; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -573,6 +576,74 @@ void testCaughtException() throws Exception { () -> String.format("timeout snapshotReceived=%s", snapshotReceived.get())); } + @Test + @DisplayName("testConditionTimeout") + void testConditionTimeout() throws Exception { + final String EXPECTED_UPLOADS = "4"; // 3 statuses + 1 snapshot + final String METHOD_NAME = "processLargeCollection"; + LogProbe probe = + LogProbe.builder() + .probeId(PROBE_ID) + .where(MAIN_CLASS_NAME, METHOD_NAME) + .evaluateAt(MethodLocation.EXIT) + .captureSnapshot(true) + .when( + new ProbeCondition( + when(all(ref("largeList"), gt(len(ref("@it")), value(0)))), + "all(largeList, {len(@it) > 0}")) + .build(); + setCurrentConfiguration(createConfig(probe)); + targetProcess = createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS).start(); + AtomicBoolean snapshotReceived = new AtomicBoolean(); + registerSnapshotListener( + snapshot -> { + if (snapshot.getProbe().getProbeId().equals(PROBE_ID)) { + assertEquals(1, snapshot.getEvaluationErrors().size()); + assertEquals("timeout (50ms)", snapshot.getEvaluationErrors().get(0).getMessage()); + snapshotReceived.set(true); + } + }); + processRequests( + snapshotReceived::get, + () -> String.format("timeout snapshotReceived=%s", snapshotReceived.get())); + } + + @Test + @DisplayName("testTemplateTimeout") + void testTemplateTimeout() throws Exception { + final String EXPECTED_UPLOADS = "4"; // 3 statuses + 1 snapshot + final String METHOD_NAME = "processLargeCollection"; + final String LARGE_COLLECTION_TEMPLATE = "{filter(largeList, {len(@it) > 0})}"; + List segments = + singletonList( + new LogProbe.Segment( + new ValueScript( + filter(ref("largeList"), gt(len(ref("@it")), value(0))), + "filter(largeList, {len(@it) > 0})"))); + LogProbe probe = + LogProbe.builder() + .probeId(PROBE_ID) + .where(MAIN_CLASS_NAME, METHOD_NAME) + .evaluateAt(MethodLocation.EXIT) + .captureSnapshot(true) + .template(LARGE_COLLECTION_TEMPLATE, segments) + .build(); + setCurrentConfiguration(createConfig(probe)); + targetProcess = createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS).start(); + AtomicBoolean snapshotReceived = new AtomicBoolean(); + registerSnapshotListener( + snapshot -> { + if (snapshot.getProbe().getProbeId().equals(PROBE_ID)) { + assertEquals(1, snapshot.getEvaluationErrors().size()); + assertEquals("timeout (50ms)", snapshot.getEvaluationErrors().get(0).getMessage()); + snapshotReceived.set(true); + } + }); + processRequests( + snapshotReceived::get, + () -> String.format("timeout snapshotReceived=%s", snapshotReceived.get())); + } + private ProbeId getProbeId(int i) { return new ProbeId(String.valueOf(i), 0); } diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/MoshiConfigTestHelper.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/MoshiConfigTestHelper.java index a19c5833212..23eb7f6fb17 100644 --- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/MoshiConfigTestHelper.java +++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/MoshiConfigTestHelper.java @@ -153,7 +153,20 @@ public Void visit(FilterCollectionExpression filterCollectionExpression) { @Override public Void visit(HasAllExpression hasAllExpression) { - throw new UnsupportedOperationException("hasAll expression"); + try { + jsonWriter.beginObject(); + jsonWriter.name("all"); + jsonWriter.beginArray(); + hasAllExpression.getValueExpression().accept(this); + // jsonWriter.beginObject(); + hasAllExpression.getFilterPredicateExpression().accept(this); + // jsonWriter.endObject(); + jsonWriter.endArray(); + jsonWriter.endObject(); + } catch (IOException ex) { + LOGGER.debug("Cannot serialize: ", ex); + } + return null; } @Override diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanDecorationProbesIntegrationTests.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanDecorationProbesIntegrationTests.java index 194000bccb1..09346289fb7 100644 --- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanDecorationProbesIntegrationTests.java +++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanDecorationProbesIntegrationTests.java @@ -45,6 +45,8 @@ void setup(TestInfo testInfo) throws Exception { protected ProcessBuilder createProcessBuilder(Path logFilePath, String... params) { List commandParams = getDebuggerCommandParams(); commandParams.add("-Ddd.trace.enabled=true"); // explicitly enable tracer + // increase eval timeout for decoration evaluations + commandParams.add("-Ddd.dynamic.instrumentation.evaluation.timeout.ms=100"); return ProcessBuilderHelper.createProcessBuilder( commandParams, logFilePath, getAppClass(), params); } diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanProbesIntegrationTest.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanProbesIntegrationTest.java index 3c55b8ff759..6cf6f17f883 100644 --- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanProbesIntegrationTest.java +++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanProbesIntegrationTest.java @@ -60,7 +60,7 @@ void testLineRangeSpan() throws Exception { .probeId(PROBE_ID) // from line: System.out.println("fullMethod"); // to line: + String.join(",", argVar); - .where(MAIN_CLASS_NAME, 88, 97) + .where(MAIN_CLASS_NAME, 95, 104) .build(); setCurrentConfiguration(createSpanConfig(spanProbe)); targetProcess = createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS).start(); @@ -69,7 +69,7 @@ void testLineRangeSpan() throws Exception { registerTraceListener( decodedTrace -> { DecodedSpan decodedSpan = decodedTrace.getSpans().get(0); - assertEquals("Main.fullMethod:L88-97", decodedSpan.getResource()); + assertEquals("Main.fullMethod:L95-104", decodedSpan.getResource()); traceReceived.set(true); }); processRequests( @@ -92,7 +92,7 @@ void testSingleLineSpan() throws Exception { SpanProbe.builder() .probeId(PROBE_ID) // on line: System.out.println("fullMethod"); - .where(MAIN_CLASS_NAME, 88) + .where(MAIN_CLASS_NAME, 95) .build(); setCurrentConfiguration(createSpanConfig(spanProbe)); targetProcess = createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS).start(); diff --git a/dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java b/dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java index 061698283a7..1aba2cb276b 100644 --- a/dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java +++ b/dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java @@ -231,7 +231,9 @@ public final class ConfigDefaults { static final int DEFAULT_DYNAMIC_INSTRUMENTATION_UPLOAD_BATCH_SIZE = 100; static final int DEFAULT_DYNAMIC_INSTRUMENTATION_MAX_PAYLOAD_SIZE = 1024; // KiB static final boolean DEFAULT_DYNAMIC_INSTRUMENTATION_VERIFY_BYTECODE = true; + static final String DEFAULT_DYNAMIC_INSTRUMENTATION_TIMEOUT_CHECKER_MODE = "WALL"; static final int DEFAULT_DYNAMIC_INSTRUMENTATION_CAPTURE_TIMEOUT = 100; // milliseconds + static final int DEFAULT_DYNAMIC_INSTRUMENTATION_EVAL_TIMEOUT = 50; // milliseconds static final int DEFAULT_DYNAMIC_INSTRUMENTATION_LOCALVAR_HOISTING_LEVEL = 1; static final boolean DEFAULT_SYMBOL_DATABASE_ENABLED = true; static final boolean DEFAULT_SYMBOL_DATABASE_FORCE_UPLOAD = false; diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/DebuggerConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/DebuggerConfig.java index 606267fa285..1e9d90c2e43 100644 --- a/dd-trace-api/src/main/java/datadog/trace/api/config/DebuggerConfig.java +++ b/dd-trace-api/src/main/java/datadog/trace/api/config/DebuggerConfig.java @@ -32,8 +32,14 @@ public final class DebuggerConfig { "dynamic.instrumentation.exclude.files"; public static final String DYNAMIC_INSTRUMENTATION_INCLUDE_FILES = "dynamic.instrumentation.include.files"; + public static final String DYNAMIC_INSTRUMENTATION_TIMEOUT_CHECKER_MODE = + "internal.dynamic.instrumentation.timeout.checker.mode"; public static final String DYNAMIC_INSTRUMENTATION_CAPTURE_TIMEOUT = "dynamic.instrumentation.capture.timeout"; + public static final String DYNAMIC_INSTRUMENTATION_CAPTURE_TIMEOUT_MS = + "dynamic.instrumentation.capture.timeout.ms"; + public static final String DYNAMIC_INSTRUMENTATION_EVAL_TIMEOUT_MS = + "dynamic.instrumentation.evaluation.timeout.ms"; public static final String DYNAMIC_INSTRUMENTATION_REDACTED_IDENTIFIERS = "dynamic.instrumentation.redacted.identifiers"; public static final String DYNAMIC_INSTRUMENTATION_REDACTION_EXCLUDED_IDENTIFIERS = diff --git a/internal-api/src/main/java/datadog/trace/api/Config.java b/internal-api/src/main/java/datadog/trace/api/Config.java index b10bda7c683..32e753d69fb 100644 --- a/internal-api/src/main/java/datadog/trace/api/Config.java +++ b/internal-api/src/main/java/datadog/trace/api/Config.java @@ -72,10 +72,12 @@ import static datadog.trace.api.ConfigDefaults.DEFAULT_DYNAMIC_INSTRUMENTATION_CLASSFILE_DUMP_ENABLED; import static datadog.trace.api.ConfigDefaults.DEFAULT_DYNAMIC_INSTRUMENTATION_DIAGNOSTICS_INTERVAL; import static datadog.trace.api.ConfigDefaults.DEFAULT_DYNAMIC_INSTRUMENTATION_ENABLED; +import static datadog.trace.api.ConfigDefaults.DEFAULT_DYNAMIC_INSTRUMENTATION_EVAL_TIMEOUT; import static datadog.trace.api.ConfigDefaults.DEFAULT_DYNAMIC_INSTRUMENTATION_LOCALVAR_HOISTING_LEVEL; import static datadog.trace.api.ConfigDefaults.DEFAULT_DYNAMIC_INSTRUMENTATION_MAX_PAYLOAD_SIZE; import static datadog.trace.api.ConfigDefaults.DEFAULT_DYNAMIC_INSTRUMENTATION_METRICS_ENABLED; import static datadog.trace.api.ConfigDefaults.DEFAULT_DYNAMIC_INSTRUMENTATION_POLL_INTERVAL; +import static datadog.trace.api.ConfigDefaults.DEFAULT_DYNAMIC_INSTRUMENTATION_TIMEOUT_CHECKER_MODE; import static datadog.trace.api.ConfigDefaults.DEFAULT_DYNAMIC_INSTRUMENTATION_UPLOAD_BATCH_SIZE; import static datadog.trace.api.ConfigDefaults.DEFAULT_DYNAMIC_INSTRUMENTATION_UPLOAD_FLUSH_INTERVAL; import static datadog.trace.api.ConfigDefaults.DEFAULT_DYNAMIC_INSTRUMENTATION_UPLOAD_TIMEOUT; @@ -325,9 +327,11 @@ import static datadog.trace.api.config.DebuggerConfig.DEBUGGER_SOURCE_FILE_TRACKING_ENABLED; import static datadog.trace.api.config.DebuggerConfig.DISTRIBUTED_DEBUGGER_ENABLED; import static datadog.trace.api.config.DebuggerConfig.DYNAMIC_INSTRUMENTATION_CAPTURE_TIMEOUT; +import static datadog.trace.api.config.DebuggerConfig.DYNAMIC_INSTRUMENTATION_CAPTURE_TIMEOUT_MS; import static datadog.trace.api.config.DebuggerConfig.DYNAMIC_INSTRUMENTATION_CLASSFILE_DUMP_ENABLED; import static datadog.trace.api.config.DebuggerConfig.DYNAMIC_INSTRUMENTATION_DIAGNOSTICS_INTERVAL; import static datadog.trace.api.config.DebuggerConfig.DYNAMIC_INSTRUMENTATION_ENABLED; +import static datadog.trace.api.config.DebuggerConfig.DYNAMIC_INSTRUMENTATION_EVAL_TIMEOUT_MS; import static datadog.trace.api.config.DebuggerConfig.DYNAMIC_INSTRUMENTATION_EXCLUDE_FILES; import static datadog.trace.api.config.DebuggerConfig.DYNAMIC_INSTRUMENTATION_INCLUDE_FILES; import static datadog.trace.api.config.DebuggerConfig.DYNAMIC_INSTRUMENTATION_INSTRUMENT_THE_WORLD; @@ -340,6 +344,7 @@ import static datadog.trace.api.config.DebuggerConfig.DYNAMIC_INSTRUMENTATION_REDACTED_TYPES; import static datadog.trace.api.config.DebuggerConfig.DYNAMIC_INSTRUMENTATION_REDACTION_EXCLUDED_IDENTIFIERS; import static datadog.trace.api.config.DebuggerConfig.DYNAMIC_INSTRUMENTATION_SNAPSHOT_URL; +import static datadog.trace.api.config.DebuggerConfig.DYNAMIC_INSTRUMENTATION_TIMEOUT_CHECKER_MODE; import static datadog.trace.api.config.DebuggerConfig.DYNAMIC_INSTRUMENTATION_UPLOAD_BATCH_SIZE; import static datadog.trace.api.config.DebuggerConfig.DYNAMIC_INSTRUMENTATION_UPLOAD_FLUSH_INTERVAL; import static datadog.trace.api.config.DebuggerConfig.DYNAMIC_INSTRUMENTATION_UPLOAD_INTERVAL_SECONDS; @@ -1229,7 +1234,9 @@ public static String getHostName() { private final String dynamicInstrumentationInstrumentTheWorld; private final String dynamicInstrumentationExcludeFiles; private final String dynamicInstrumentationIncludeFiles; + private final String dynamicInstrumentationTimeoutCheckerMode; private final int dynamicInstrumentationCaptureTimeout; + private final int dynamicInstrumentationEvaluationTimeout; private final String dynamicInstrumentationRedactedIdentifiers; private final Set dynamicInstrumentationRedactionExcludedIdentifiers; private final String dynamicInstrumentationRedactedTypes; @@ -2886,10 +2893,18 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment()) configProvider.getString(DYNAMIC_INSTRUMENTATION_EXCLUDE_FILES); dynamicInstrumentationIncludeFiles = configProvider.getString(DYNAMIC_INSTRUMENTATION_INCLUDE_FILES); + dynamicInstrumentationTimeoutCheckerMode = + configProvider.getString( + DYNAMIC_INSTRUMENTATION_TIMEOUT_CHECKER_MODE, + DEFAULT_DYNAMIC_INSTRUMENTATION_TIMEOUT_CHECKER_MODE); dynamicInstrumentationCaptureTimeout = configProvider.getInteger( DYNAMIC_INSTRUMENTATION_CAPTURE_TIMEOUT, - DEFAULT_DYNAMIC_INSTRUMENTATION_CAPTURE_TIMEOUT); + DEFAULT_DYNAMIC_INSTRUMENTATION_CAPTURE_TIMEOUT, + DYNAMIC_INSTRUMENTATION_CAPTURE_TIMEOUT_MS); + dynamicInstrumentationEvaluationTimeout = + configProvider.getInteger( + DYNAMIC_INSTRUMENTATION_EVAL_TIMEOUT_MS, DEFAULT_DYNAMIC_INSTRUMENTATION_EVAL_TIMEOUT); dynamicInstrumentationRedactedIdentifiers = configProvider.getString(DYNAMIC_INSTRUMENTATION_REDACTED_IDENTIFIERS, null); dynamicInstrumentationRedactionExcludedIdentifiers = @@ -4689,10 +4704,18 @@ public String getDynamicInstrumentationIncludeFiles() { return dynamicInstrumentationIncludeFiles; } + public String getDynamicInstrumentationTimeoutCheckerMode() { + return dynamicInstrumentationTimeoutCheckerMode; + } + public int getDynamicInstrumentationCaptureTimeout() { return dynamicInstrumentationCaptureTimeout; } + public int getDynamicInstrumentationEvalTimeout() { + return dynamicInstrumentationEvaluationTimeout; + } + public boolean isSymbolDatabaseEnabled() { return symbolDatabaseEnabled; } diff --git a/metadata/supported-configurations.json b/metadata/supported-configurations.json index ae081138b71..60dae10c020 100644 --- a/metadata/supported-configurations.json +++ b/metadata/supported-configurations.json @@ -1217,11 +1217,27 @@ "aliases": ["DD_JMXFETCH_START_DELAY"] } ], - "DD_DYNAMIC_INSTRUMENTATION_CAPTURE_TIMEOUT": [ + "DD_INTERNAL_DYNAMIC_INSTRUMENTATION_TIMEOUT_CHECKER_MODE": [ { "version": "A", + "type": "string", + "default": "WALL", + "aliases": [] + } + ], + "DD_DYNAMIC_INSTRUMENTATION_CAPTURE_TIMEOUT_MS": [ + { + "version": "B", "type": "int", "default": "100", + "aliases": ["DD_DYNAMIC_INSTRUMENTATION_CAPTURE_TIMEOUT"] + } + ], + "DD_DYNAMIC_INSTRUMENTATION_EVALUATION_TIMEOUT_MS": [ + { + "version": "A", + "type": "int", + "default": "50", "aliases": [] } ], From 35a5317d217b0936fb7b63d7b31870b593661ea8 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Thu, 2 Jul 2026 16:18:45 -0400 Subject: [PATCH 128/139] Add tip to latest inst and debugger test matrices (#11848) Add tip to latest inst and debugger test matrices Co-authored-by: sarah.chen --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c089ef9fab2..5138dcae082 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -978,7 +978,7 @@ test_inst_latest: CACHE_TYPE: "latestdep" parallel: matrix: - - testJvm: ["8", "17", "21", "25"] # the latest "tip" version is LTS v25 + - testJvm: ["8", "17", "21", "25", "tip"] # the latest "tip" version is 26 # Gitlab doesn't support "parallel" and "parallel:matrix" at the same time # This emulates "parallel" by including it in the matrix CI_SPLIT: [ "1/6", "2/6", "3/6", "4/6", "5/6", "6/6"] @@ -991,7 +991,7 @@ test_inst_latest_arm64: CACHE_TYPE: "latestdep" parallel: matrix: - - testJvm: ["8", "17", "21", "25"] # the latest "tip" version is LTS v25 + - testJvm: ["8", "17", "21", "25", "tip"] # the latest "tip" version is 26 # Gitlab doesn't support "parallel" and "parallel:matrix" at the same time # This emulates "parallel" by including it in the matrix CI_SPLIT: [ "1/6", "2/6", "3/6", "4/6", "5/6", "6/6"] @@ -1061,7 +1061,7 @@ test_debugger: variables: GRADLE_TARGET: ":debuggerTest" CACHE_TYPE: "base" - DEFAULT_TEST_JVMS: /^(8|11|17|21|25|semeru8)$/ # the latest "tip" version is LTS v25 + DEFAULT_TEST_JVMS: /^(8|11|17|21|25|tip|semeru8)$/ # the latest "tip" version is 26 parallel: matrix: *test_matrix # avoid running coverage for semeru8, semeru11, semeru17 and ibm8 as some tests are disabled and therefore cannot reach the From 273405742829135c251d9a02ab483e59ccd7a6c6 Mon Sep 17 00:00:00 2001 From: Brice Dutheil Date: Fri, 3 Jul 2026 10:35:22 +0200 Subject: [PATCH 129/139] Upgrade Shadow plugin to 9.4.2 (#11730) chore: upgrade shadow plugin from 8.3.9 to 9.4.2 * Adapt custom ShadowJar wiring to the lazy API. Configuration lists now use providers around `configurations.named(...)`, and Shadow resolves `Configuration` values directly. https://github.com/GradleUp/shadow/pull/1044 https://github.com/GradleUp/shadow/pull/1045 * Keep filtering explicit. Shadow 9 changed `DependencyFilter` overloads, so shared filters run in Shadow `dependencies` blocks. Empty module/version fields no longer act as broad wildcards, so group-wide excludes use full group/module/version regex notation. That keeps dependencies meant to stay external out of shaded jars; otherwise downstream jars can get partly relocated API copies, such as SLF4J, and lose their real binding. https://gradleup.com/shadow/configuration/dependencies/#using-regex-patterns-to-filter-dependencies https://github.com/GradleUp/shadow/pull/1328 * Keep `mergeServiceFiles` users on `DuplicatesStrategy.INCLUDE` before transformers run, then drop unrelated duplicate resources with file matching. Shadow 9 honors duplicate strategies during transforms. https://github.com/GradleUp/shadow/pull/1233 https://github.com/GradleUp/shadow/pull/1617 * Disable automatic Multi-Release manifest inheritance for the agent jar to keep the previous manifest shape. https://github.com/GradleUp/shadow/pull/1239 https://github.com/GradleUp/shadow/pull/1675 * Note the relocation output change. Shadow 9.2+ rewrites more descriptor-shaped string constants, which explains the observed `LoggerRuntime` LDC descriptor change. https://github.com/GradleUp/shadow/pull/1714 https://github.com/GradleUp/shadow/pull/1731 * Apply the same API and resource handling changes to smoke-test modules that run in the main Gradle build. refactor: migrate `excludeShared` from Groovy Closure to Action chore: tighten call-site shadow duplicates chore: tweak duplication strategy on CSI plugin chore: decalre shadow in the version catalog chore: fix comment on skipping license/notice in csi jar Co-authored-by: brice.dutheil --- build.gradle.kts | 2 +- .../build.gradle.kts | 8 +- .../modifiable-config-agent/build.gradle.kts | 2 +- dd-java-agent/agent-aiguard/build.gradle | 1 - .../benchmark-integration/build.gradle | 23 ---- dd-java-agent/build.gradle | 30 ++++- dd-java-agent/ddprof-lib/build.gradle | 6 +- dd-java-agent/instrumentation/build.gradle | 26 +++- .../liberty/liberty-23.0/build.gradle | 5 +- .../servlet/jakarta-servlet-5.0/build.gradle | 2 +- dd-java-agent/testing/build.gradle | 4 +- .../appsec/springboot-graphql/build.gradle | 20 ++- .../custom-systemloader/build.gradle | 2 +- dd-smoke-tests/field-injection/build.gradle | 2 +- dd-smoke-tests/grpc-1.5/build.gradle | 4 + dd-smoke-tests/iast-propagation/build.gradle | 2 +- dd-smoke-tests/log-injection/build.gradle | 5 +- .../spring-boot-2.3-webmvc-jetty/build.gradle | 12 +- .../spring-boot-2.4-webflux/build.gradle | 2 +- .../spring-boot-2.5-webflux/build.gradle | 2 +- .../spring-boot-2.6-webflux/build.gradle | 12 +- .../spring-boot-2.6-webmvc/build.gradle | 12 +- .../spring-boot-rabbit/build.gradle | 2 +- dd-smoke-tests/springboot-grpc/build.gradle | 2 +- dd-smoke-tests/springboot-mongo/build.gradle | 2 +- dd-trace-ot/build.gradle.kts | 10 +- gradle/dependencies.gradle | 117 +++++++++--------- gradle/libs.versions.toml | 4 + .../feature-flagging-agent/build.gradle.kts | 7 +- products/metrics/metrics-lib/build.gradle.kts | 7 +- 30 files changed, 211 insertions(+), 124 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 22fca7f31a3..254d9927817 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -17,7 +17,7 @@ plugins { id("com.github.spotbugs") version "6.5.5" id("de.thetaphi.forbiddenapis") version "3.10" id("io.github.gradle-nexus.publish-plugin") version "2.0.0" - id("com.gradleup.shadow") version "8.3.9" apply false + alias(libs.plugins.shadow) apply false id("me.champeau.jmh") version "0.7.3" apply false id("org.gradle.playframework") version "0.16.0" apply false } diff --git a/buildSrc/call-site-instrumentation-plugin/build.gradle.kts b/buildSrc/call-site-instrumentation-plugin/build.gradle.kts index 0667e21e1c9..82b9466d1bb 100644 --- a/buildSrc/call-site-instrumentation-plugin/build.gradle.kts +++ b/buildSrc/call-site-instrumentation-plugin/build.gradle.kts @@ -1,7 +1,7 @@ plugins { java id("com.diffplug.spotless") version "8.4.0" - id("com.gradleup.shadow") version "8.3.9" + alias(libs.plugins.shadow) } java { @@ -69,7 +69,11 @@ tasks { } shadowJar { - mergeServiceFiles() + duplicatesStrategy = DuplicatesStrategy.FAIL + // Let's skip license/notice since this jar's only use is during build + filesMatching(listOf("META-INF/LICENSE*", "META-INF/NOTICE*")) { + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + } manifest { attributes(mapOf("Main-Class" to "datadog.trace.plugin.csi.PluginApplication")) } diff --git a/buildSrc/modifiable-config-agent/build.gradle.kts b/buildSrc/modifiable-config-agent/build.gradle.kts index ddef5f7b008..baecb9b269b 100644 --- a/buildSrc/modifiable-config-agent/build.gradle.kts +++ b/buildSrc/modifiable-config-agent/build.gradle.kts @@ -1,6 +1,6 @@ plugins { java - id("com.gradleup.shadow") version "8.3.9" + alias(libs.plugins.shadow) } java { diff --git a/dd-java-agent/agent-aiguard/build.gradle b/dd-java-agent/agent-aiguard/build.gradle index 70aab194be4..40d7d7d8d1f 100644 --- a/dd-java-agent/agent-aiguard/build.gradle +++ b/dd-java-agent/agent-aiguard/build.gradle @@ -34,4 +34,3 @@ tasks.named("shadowJar", ShadowJar) { tasks.named("jar", Jar) { archiveClassifier = 'unbundled' } - diff --git a/dd-java-agent/benchmark-integration/build.gradle b/dd-java-agent/benchmark-integration/build.gradle index 9a033a774d7..49f94e0714e 100644 --- a/dd-java-agent/benchmark-integration/build.gradle +++ b/dd-java-agent/benchmark-integration/build.gradle @@ -1,26 +1,3 @@ -buildscript { - repositories { - mavenLocal() - if (project.rootProject.hasProperty("gradlePluginProxy")) { - maven { - url project.rootProject.property("gradlePluginProxy") - allowInsecureProtocol = true - } - } - if (project.rootProject.hasProperty("mavenRepositoryProxy")) { - maven { - url project.rootProject.property("mavenRepositoryProxy") - allowInsecureProtocol = true - } - } - gradlePluginPortal() - mavenCentral() - } - dependencies { - classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.1' - } -} - apply from: "$rootDir/gradle/java.gradle" description = 'Integration Level Agent benchmarks.' diff --git a/dd-java-agent/build.gradle b/dd-java-agent/build.gradle index 4710bd5bc98..38b686c76ab 100644 --- a/dd-java-agent/build.gradle +++ b/dd-java-agent/build.gradle @@ -81,8 +81,24 @@ dependencies { def generalShadowJarConfig(ShadowJar shadowJarTask) { shadowJarTask.with { mergeServiceFiles() + addMultiReleaseAttribute = false duplicatesStrategy = DuplicatesStrategy.FAIL + // Service descriptors are intentionally merged by mergeServiceFiles(); let + // duplicate service entries reach that transformer instead of failing first. + filesMatching('META-INF/services/**') { + duplicatesStrategy = DuplicatesStrategy.INCLUDE + } + // Vendored dependencies often repeat license/notice metadata. Keep one copy + // while still failing on unexpected duplicate runtime resources and classes. + filesMatching([ + 'META-INF/LICENSE*', + 'META-INF/NOTICE*', + 'META-INF/AL2.0', + 'META-INF/LGPL2.1', + ]) { + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + } // Remove some cruft from the final jar. // These patterns should NOT include **/META-INF/maven/**/pom.properties, which is @@ -99,6 +115,7 @@ def generalShadowJarConfig(ShadowJar shadowJarTask) { exclude '**/inst/META-INF/versions/**' exclude '**/META-INF/versions/*/org/yaml/**' exclude '**/package.html' + exclude '**/about.html' // Used to generate Java code during build, no need to include original file exclude '**/*.trie' @@ -257,7 +274,7 @@ includeSubprojShadowJar(project(':products:metrics:metrics-lib'), 'metrics', inc includeSubprojShadowJar(project(':products:feature-flagging:feature-flagging-agent'), 'feature-flagging', includedJarFileTree) def sharedShadowJar = tasks.register('sharedShadowJar', ShadowJar) { - it.configurations = [project.configurations.sharedShadowInclude] + it.configurations.add(project.configurations.named('sharedShadowInclude')) // Put the jar in a different directory so we don't overwrite the normal shadow jar and // break caching, and also to not interfere with CI scripts that copy everything in the // libs directory @@ -275,16 +292,16 @@ def sharedShadowJar = tasks.register('sharedShadowJar', ShadowJar) { exclude(project(':utils:time-utils')) exclude(project(':products:metrics:metrics-api')) exclude(project(':products:metrics:metrics-agent')) - exclude(dependency('org.slf4j::')) + exclude(dependency('org.slf4j:.*:.*')) // use dd-instrument-java's embedded copy of asm - exclude(dependency('org.ow2.asm:asm:')) + exclude(dependency('org.ow2.asm:asm:.*')) } } includeShadowJar(sharedShadowJar, 'shared', includedJarFileTree) // place the tracer in its own shadow jar separate to instrumentation def traceShadowJar = tasks.register('traceShadowJar', ShadowJar) { - it.configurations = [project.configurations.traceShadowInclude] + it.configurations.add(project.configurations.named('traceShadowInclude')) it.destinationDirectory.set(project.layout.buildDirectory.dir("trace-lib")) it.archiveClassifier = 'trace' it.dependencies deps.excludeShared @@ -299,7 +316,10 @@ tasks.named("shadowJar", ShadowJar) { generalShadowJarConfig(it) - configurations = [project.configurations.shadowInclude] + // The default shadowJar task has a runtimeClasspath convention. Replace it + // instead of adding to it, otherwise runtimeClasspath would be bundled too. + configurations.empty() + configurations.add(project.configurations.named('shadowInclude')) archiveClassifier = '' diff --git a/dd-java-agent/ddprof-lib/build.gradle b/dd-java-agent/ddprof-lib/build.gradle index b4f3219ae23..f6d653e3bbd 100644 --- a/dd-java-agent/ddprof-lib/build.gradle +++ b/dd-java-agent/ddprof-lib/build.gradle @@ -16,10 +16,8 @@ dependencies { } tasks.named("shadowJar", ShadowJar) { - dependencies { - deps.excludeShared - exclude '**/*.debug' - } + dependencies deps.excludeShared + exclude '**/*.debug' archiveClassifier = 'all' include { def rslt = false diff --git a/dd-java-agent/instrumentation/build.gradle b/dd-java-agent/instrumentation/build.gradle index 5e36217ad42..8077740656f 100644 --- a/dd-java-agent/instrumentation/build.gradle +++ b/dd-java-agent/instrumentation/build.gradle @@ -120,13 +120,37 @@ if (project.gradle.startParameter.taskNames.any { it.endsWith("generateMuzzleRep tasks.named('shadowJar', ShadowJar) { duplicatesStrategy = DuplicatesStrategy.FAIL + // Shadow 8.x silently wrote duplicate class (130+) entries into the instrumentation jar. + // Those duplicate entries did not survive as duplicates in the final agent jar, + // because `:dd-java-agent:expandAgentShadowJarInst` expands the instrumentation jar + // with a `Sync` task, and the specific `inst` expansion keeps the first duplicate path. + // (explicit `duplicatesStrategy = DuplicatesStrategy.EXCLUDE` on the `inst` prefix). + // + // Shadow 9 refactored deeply it's "copy" pipeline via https://github.com/GradleUp/shadow/pull/1233 + // by `Project.zipTree` and can now honor `DuplicatesStrategy`, see in particular + // * https://github.com/GradleUp/shadow/issues/1223 - Duplicates from jars are not handled per duplicatesStrategy + // * https://github.com/GradleUp/shadow/issues/488 - DuplicatesStrategy.FAIL doesn't work with transform + // + // Keeping `duplicatesStrategy = FAIL` only, Shadow 9 now fails while creating the instrumentation jar. + filesMatching([ + // agent-installer also publishes this Java 11 source-set output at runtime. + 'datadog/trace/agent/tooling/bytebuddy/DDJava9ClassFileTransformer*.class', + // agent-installer also publishes this Java 25 source-set output at runtime. + 'datadog/trace/agent/tooling/servicediscovery/MemFDUnixWriterFFM*.class', + // aggregate instrumentation includes some classes directly and via jars. + 'datadog/trace/instrumentation/**/*.class', + // same aggregate duplication, for Java 11 exception profiling advice. + 'datadog/exceptions/instrumentation/**/*.class', + ]) { + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + } dependencies { // the tracer is now in a separate shadow jar exclude(project(":dd-trace-core")) exclude(dependency('com.datadoghq:sketches-java')) exclude(dependency('com.google.re2j:re2j')) + deps.excludeShared.execute(it) } - dependencies deps.excludeShared } // temporary config to add slf4j-simple so we get logging from instrumenters while indexing diff --git a/dd-java-agent/instrumentation/liberty/liberty-23.0/build.gradle b/dd-java-agent/instrumentation/liberty/liberty-23.0/build.gradle index f90c9eed237..dbbcdb9b066 100644 --- a/dd-java-agent/instrumentation/liberty/liberty-23.0/build.gradle +++ b/dd-java-agent/instrumentation/liberty/liberty-23.0/build.gradle @@ -137,7 +137,10 @@ tasks.named('filterLogbackClassic', Sync) { } tasks.named("shadowJar", ShadowJar) { - configurations = [project.configurations.shadow] + // The default shadowJar task has a runtimeClasspath convention. Replace it + // instead of adding to it; this jar is intentionally built from the shadow configuration only. + configurations.empty() + configurations.add(project.configurations.named('shadow')) zip64 = true archiveFileName = 'openliberty-shadow.jar' diff --git a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/build.gradle b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/build.gradle index 93ffdc1a131..07a424a3113 100644 --- a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/build.gradle +++ b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/build.gradle @@ -37,7 +37,7 @@ tasks.register('relocatedJavaxJar', ShadowJar) { archiveClassifier.set('relocated-javax') - configurations = [project.configurations.javaxClassesToRelocate] + configurations.add(project.configurations.named('javaxClassesToRelocate')) include '**/*.jar' include '**/Servlet31InputStreamWrapper.class' diff --git a/dd-java-agent/testing/build.gradle b/dd-java-agent/testing/build.gradle index 02d83f9db62..f979f390728 100644 --- a/dd-java-agent/testing/build.gradle +++ b/dd-java-agent/testing/build.gradle @@ -67,9 +67,9 @@ tasks.named("shadowJar", ShadowJar) { // Only bundle jetty dependencies into the jar (relocated) // All other dependencies remain as transitive dependencies dependencies { - include(dependency { + include { it.moduleGroup == 'org.eclipse.jetty' || it.moduleGroup == 'org.eclipse.jetty.http2' - }) + } } // Relocate jetty classes to avoid conflicts with instrumented versions diff --git a/dd-smoke-tests/appsec/springboot-graphql/build.gradle b/dd-smoke-tests/appsec/springboot-graphql/build.gradle index 78ce91a23ca..6c07696b614 100644 --- a/dd-smoke-tests/appsec/springboot-graphql/build.gradle +++ b/dd-smoke-tests/appsec/springboot-graphql/build.gradle @@ -1,4 +1,5 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar +import com.github.jengelman.gradle.plugins.shadow.transformers.PropertiesFileTransformer plugins { id 'com.gradleup.shadow' @@ -16,8 +17,23 @@ jar { } shadowJar { - mergeServiceFiles { - include 'META-INF/spring.*' + duplicatesStrategy = DuplicatesStrategy.INCLUDE + mergeServiceFiles() + append 'META-INF/spring.handlers' + append 'META-INF/spring.schemas' + append 'META-INF/spring.tooling' + transform(PropertiesFileTransformer) { + paths = ['META-INF/spring.factories'] + mergeStrategy = "append" + } + filesNotMatching([ + 'META-INF/services/**', + 'META-INF/spring.handlers', + 'META-INF/spring.schemas', + 'META-INF/spring.tooling', + 'META-INF/spring.factories', + ]) { + duplicatesStrategy = DuplicatesStrategy.EXCLUDE } } diff --git a/dd-smoke-tests/custom-systemloader/build.gradle b/dd-smoke-tests/custom-systemloader/build.gradle index b9d1d63caf3..28836e0f103 100644 --- a/dd-smoke-tests/custom-systemloader/build.gradle +++ b/dd-smoke-tests/custom-systemloader/build.gradle @@ -14,7 +14,7 @@ tasks.named("jar", Jar) { } tasks.named("shadowJar", ShadowJar) { - configurations = [project.configurations.runtimeClasspath] + configurations.add(project.configurations.named('runtimeClasspath')) } dependencies { diff --git a/dd-smoke-tests/field-injection/build.gradle b/dd-smoke-tests/field-injection/build.gradle index 2117c2e056b..468f33342f9 100644 --- a/dd-smoke-tests/field-injection/build.gradle +++ b/dd-smoke-tests/field-injection/build.gradle @@ -14,7 +14,7 @@ tasks.named("jar", Jar) { } tasks.named("shadowJar", ShadowJar) { - configurations = [project.configurations.runtimeClasspath] + configurations.add(project.configurations.named('runtimeClasspath')) } dependencies { diff --git a/dd-smoke-tests/grpc-1.5/build.gradle b/dd-smoke-tests/grpc-1.5/build.gradle index 4babb64d12c..d691a9e157f 100644 --- a/dd-smoke-tests/grpc-1.5/build.gradle +++ b/dd-smoke-tests/grpc-1.5/build.gradle @@ -39,8 +39,12 @@ protobuf { } tasks.withType(ShadowJar).configureEach { + duplicatesStrategy = DuplicatesStrategy.INCLUDE archiveClassifier.set("fat") mergeServiceFiles() + filesNotMatching('META-INF/services/**') { + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + } } tasks.withType(Test).configureEach { diff --git a/dd-smoke-tests/iast-propagation/build.gradle b/dd-smoke-tests/iast-propagation/build.gradle index 89a7fd287dc..33d3d1019e0 100644 --- a/dd-smoke-tests/iast-propagation/build.gradle +++ b/dd-smoke-tests/iast-propagation/build.gradle @@ -30,7 +30,7 @@ tasks.named("jar", Jar) { } tasks.named("shadowJar", ShadowJar) { - configurations = [project.configurations.runtimeClasspath] + configurations.add(project.configurations.named('runtimeClasspath')) } dependencies { diff --git a/dd-smoke-tests/log-injection/build.gradle b/dd-smoke-tests/log-injection/build.gradle index e4e86df74ed..9e01a511e8b 100644 --- a/dd-smoke-tests/log-injection/build.gradle +++ b/dd-smoke-tests/log-injection/build.gradle @@ -178,7 +178,9 @@ def generateTestingJar(String interfaceName, String backend, List("shadowJ dependencies { // direct dependencies exclude(project(":dd-trace-api")) - exclude(dependency("io.opentracing:")) - exclude(dependency("io.opentracing.contrib:")) - exclude(dependency("org.slf4j:")) - exclude(dependency("com.github.jnr:")) + exclude(dependency("io.opentracing:.*:.*")) + exclude(dependency("io.opentracing.contrib:.*:.*")) + exclude(dependency("org.slf4j:.*:.*")) + exclude(dependency("com.github.jnr:.*:.*")) // indirect dependency of JNR, no need to embed - exclude(dependency("org.ow2.asm:")) + exclude(dependency("org.ow2.asm:.*:.*")) } relocate("com.", "ddtrot.com.") { diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index e8daf61cd03..a037fccee09 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -7,71 +7,76 @@ final class CachedData { // Inverse of "shared". These exclude directives are part of shadowJar's DSL // which is similar but not exactly the same as the regular gradle dependency{} block // Also, transitive dependencies have to be explicitly listed - excludeShared : (Closure) { - // projects bundled with shared or on bootstrap - exclude(project(':dd-java-agent:agent-bootstrap')) - exclude(project(':dd-java-agent:agent-debugger:debugger-bootstrap')) - exclude(project(':dd-java-agent:agent-logging')) - exclude(project(':dd-trace-api')) - exclude(project(':internal-api')) - exclude(project(':internal-api:internal-api-9')) - exclude(project(':communication')) - exclude(project(':components:context')) - exclude(project(':components:environment')) - exclude(project(':components:json')) - exclude(project(':products:feature-flagging:feature-flagging-bootstrap')) - exclude(project(':products:metrics:metrics-agent')) - exclude(project(':products:metrics:metrics-api')) - exclude(project(':products:metrics:metrics-lib')) - exclude(project(':remote-config:remote-config-api')) - exclude(project(':remote-config:remote-config-core')) - exclude(project(':telemetry')) - exclude(project(':utils:config-utils')) - exclude(project(':utils:container-utils')) - exclude(project(':utils:filesystem-utils')) - exclude(project(':utils:queue-utils')) - exclude(project(':utils:socket-utils')) - exclude(project(':utils:time-utils')) - exclude(project(':utils:logging-utils')) - exclude(project(':utils:version-utils')) - exclude(project(':dd-java-agent:agent-crashtracking')) - exclude(project(':dd-java-agent:ddprof-lib')) - exclude(dependency('org.slf4j::')) - exclude(dependency(':dd-instrument-java:')) + // Can't use shadow's Action because dependencies.gradle is used in + // projects that don't have this plugin (e.g. the other unrelated declarations) + excludeShared : new Action() { + @Override + void execute(Object filter) { + // projects bundled with shared or on bootstrap + filter.exclude(filter.project(':dd-java-agent:agent-bootstrap')) + filter.exclude(filter.project(':dd-java-agent:agent-debugger:debugger-bootstrap')) + filter.exclude(filter.project(':dd-java-agent:agent-logging')) + filter.exclude(filter.project(':dd-trace-api')) + filter.exclude(filter.project(':internal-api')) + filter.exclude(filter.project(':internal-api:internal-api-9')) + filter.exclude(filter.project(':communication')) + filter.exclude(filter.project(':components:context')) + filter.exclude(filter.project(':components:environment')) + filter.exclude(filter.project(':components:json')) + filter.exclude(filter.project(':products:feature-flagging:feature-flagging-bootstrap')) + filter.exclude(filter.project(':products:metrics:metrics-agent')) + filter.exclude(filter.project(':products:metrics:metrics-api')) + filter.exclude(filter.project(':products:metrics:metrics-lib')) + filter.exclude(filter.project(':remote-config:remote-config-api')) + filter.exclude(filter.project(':remote-config:remote-config-core')) + filter.exclude(filter.project(':telemetry')) + filter.exclude(filter.project(':utils:config-utils')) + filter.exclude(filter.project(':utils:container-utils')) + filter.exclude(filter.project(':utils:filesystem-utils')) + filter.exclude(filter.project(':utils:queue-utils')) + filter.exclude(filter.project(':utils:socket-utils')) + filter.exclude(filter.project(':utils:time-utils')) + filter.exclude(filter.project(':utils:logging-utils')) + filter.exclude(filter.project(':utils:version-utils')) + filter.exclude(filter.project(':dd-java-agent:agent-crashtracking')) + filter.exclude(filter.project(':dd-java-agent:ddprof-lib')) + filter.exclude(filter.dependency('org.slf4j:.*:.*')) + filter.exclude(filter.dependency('.*:dd-instrument-java:.*')) - // okhttp and its transitives (both fork and non-fork) - exclude(dependency('com.datadoghq.okhttp3:okhttp')) - exclude(dependency('com.squareup.okhttp3:okhttp')) - exclude(dependency('com.datadoghq.okio:okio')) - exclude(dependency('com.squareup.okio:okio')) - exclude(dependency('at.yawk.lz4:lz4-java')) - exclude(dependency('io.airlift:aircompressor')) + // okhttp and its transitives (both fork and non-fork) + filter.exclude(filter.dependency('com.datadoghq.okhttp3:okhttp')) + filter.exclude(filter.dependency('com.squareup.okhttp3:okhttp')) + filter.exclude(filter.dependency('com.datadoghq.okio:okio')) + filter.exclude(filter.dependency('com.squareup.okio:okio')) + filter.exclude(filter.dependency('at.yawk.lz4:lz4-java')) + filter.exclude(filter.dependency('io.airlift:aircompressor')) - // dogstatsd and its transitives - exclude(dependency('com.datadoghq:java-dogstatsd-client')) - exclude(dependency('com.github.jnr::')) - exclude(dependency('org.ow2.asm::')) + // dogstatsd and its transitives + filter.exclude(filter.dependency('com.datadoghq:java-dogstatsd-client')) + filter.exclude(filter.dependency('com.github.jnr:.*:.*')) + filter.exclude(filter.dependency('org.ow2.asm:.*:.*')) - // sketches-java used by dd-trace-core (DataStreams) and metrics - exclude(dependency('com.datadoghq:sketches-java')) + // sketches-java used by dd-trace-core (DataStreams) and metrics + filter.exclude(filter.dependency('com.datadoghq:sketches-java')) - // javac plugin client - exclude(dependency('com.datadoghq:dd-javac-plugin-client')) + // javac plugin client + filter.exclude(filter.dependency('com.datadoghq:dd-javac-plugin-client')) - // moshi and its transitives - exclude(dependency('com.squareup.moshi::')) + // moshi and its transitives + filter.exclude(filter.dependency('com.squareup.moshi:.*:.*')) - // jctools and its transitives - exclude(dependency('org.jctools::')) + // jctools and its transitives + filter.exclude(filter.dependency('org.jctools:.*:.*')) - // cafe_crypto and its transitives - exclude(dependency('cafe.cryptography::')) + // cafe_crypto and its transitives + filter.exclude(filter.dependency('cafe.cryptography:.*:.*')) - // snakeyaml-engine and its transitives - exclude(dependency('org.snakeyaml:snakeyaml-engine')) + // snakeyaml-engine and its transitives + filter.exclude(filter.dependency('org.snakeyaml:snakeyaml-engine')) - // re2j and its transitives - exclude(dependency('com.google.re2j:re2j')) + // re2j and its transitives + filter.exclude(filter.dependency('com.google.re2j:re2j')) + } } ] } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index dc40da9c734..bcc354eeb38 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,6 +6,7 @@ develocity = "4.4.1" forbiddenapis = "3.10" gradle-tooling-api = "8.14.5" jsr305 = "3.0.2" +shadow = "9.4.2" spotbugs_annotations = "4.9.8" # DataDog libs and forks @@ -190,3 +191,6 @@ junit-platform = ["junit-platform-launcher"] mockito = ["mokito-core", "mokito-junit-jupiter", "bytebuddy", "bytebuddyagent"] groovy = ["groovy", "groovy-json"] spock = ["spock-core", "objenesis"] + +[plugins] +shadow = { id = "com.gradleup.shadow", version.ref = "shadow" } diff --git a/products/feature-flagging/feature-flagging-agent/build.gradle.kts b/products/feature-flagging/feature-flagging-agent/build.gradle.kts index 1dcadde035f..a219a48456c 100644 --- a/products/feature-flagging/feature-flagging-agent/build.gradle.kts +++ b/products/feature-flagging/feature-flagging-agent/build.gradle.kts @@ -1,4 +1,6 @@ +import com.github.jengelman.gradle.plugins.shadow.tasks.DependencyFilter import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar +import org.gradle.api.Action import org.gradle.kotlin.dsl.project plugins { @@ -25,8 +27,7 @@ dependencies { tasks.named("shadowJar") { dependencies { val deps = project.extra["deps"] as Map<*, *> - val excludeShared = deps["excludeShared"] as groovy.lang.Closure<*> - excludeShared.delegate = this - excludeShared.call() + val excludeShared = deps["excludeShared"] as Action + excludeShared.execute(this) } } diff --git a/products/metrics/metrics-lib/build.gradle.kts b/products/metrics/metrics-lib/build.gradle.kts index 4f58777ff02..48c86622733 100644 --- a/products/metrics/metrics-lib/build.gradle.kts +++ b/products/metrics/metrics-lib/build.gradle.kts @@ -1,4 +1,6 @@ +import com.github.jengelman.gradle.plugins.shadow.tasks.DependencyFilter import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar +import org.gradle.api.Action plugins { `java-library` @@ -27,9 +29,8 @@ dependencies { tasks.named("shadowJar") { dependencies { val deps = project.extra["deps"] as Map<*, *> - val excludeShared = deps["excludeShared"] as groovy.lang.Closure<*> - excludeShared.delegate = this - excludeShared.call() + val excludeShared = deps["excludeShared"] as Action + excludeShared.execute(this) } } From 0eeac731fafa60d5e10c302cf7bf3560380e4127 Mon Sep 17 00:00:00 2001 From: Brice Dutheil Date: Fri, 3 Jul 2026 11:16:27 +0200 Subject: [PATCH 130/139] chore: Use a named service type for test container parallel usage (#11843) chore: Use a named service type for test container parallel usage In the coming Gradle 9.7, using the interface BuildService alone, fails the build with this error: ``` * What went wrong: A problem occurred evaluating script. > A problem occurred evaluating script. > Could not create the parameters for BuildService: an implementation type is required, but BuildService is the BuildService interface itself. ``` Co-authored-by: brice.dutheil --- gradle/java_no_deps.gradle | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gradle/java_no_deps.gradle b/gradle/java_no_deps.gradle index 955fcf65659..0d8b5706b11 100644 --- a/gradle/java_no_deps.gradle +++ b/gradle/java_no_deps.gradle @@ -1,6 +1,8 @@ import datadog.gradle.plugin.testJvmConstraints.TestJvmConstraintsExtension import datadog.gradle.plugin.testJvmConstraints.ProvideJvmArgsOnJvmLauncherVersion import groovy.transform.CompileStatic +import org.gradle.api.services.BuildService +import org.gradle.api.services.BuildServiceParameters import java.nio.file.Files import java.nio.file.LinkOption @@ -121,8 +123,10 @@ def tracerJavaExtension = extensions.create(TracerJavaExtension.NAME, TracerJava -// Only run one testcontainers test at a time -ext.testcontainersLimit = gradle.sharedServices.registerIfAbsent("testcontainersLimit", BuildService) { +abstract class TestcontainersLimitService implements BuildService { +} + +ext.testcontainersLimit = gradle.sharedServices.registerIfAbsent("testcontainersLimit", TestcontainersLimitService) { maxParallelUsages = 1 } From bb6b14ab6fcc7fc236209976f17c54972c0b7b5f Mon Sep 17 00:00:00 2001 From: ValentinZakharov Date: Fri, 3 Jul 2026 17:46:38 +0200 Subject: [PATCH 131/139] Add RxJava 3 instrumentation (#11849) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Scaffold rxjava-3.0 instrumentation module Co-Authored-By: Claude Opus 4.8 (1M context) Add rxjava-3.0 Tracing observer/subscriber wrappers Co-Authored-By: Claude Opus 4.8 (1M context) Add rxjava-3.0 type instrumentations, module and async result extension Co-Authored-By: Claude Opus 4.8 (1M context) Register rxjava3 async result extension for Graal native-image Co-Authored-By: Claude Opus 4.8 (1M context) Add rxjava-3.0 SubscriptionTest Co-Authored-By: Claude Opus 4.8 (1M context) Add rxjava-3.0 core context propagation test Co-Authored-By: Claude Opus 4.8 (1M context) Fix pending-trace leak from RxJava3 AbstractDirectTask static initializer RxJava 3 introduced io.reactivex.rxjava3.internal.schedulers.AbstractDirectTask, whose static initializer constructs FINISHED/DISPOSED sentinel FutureTask instances. When that initializer first runs under an active trace (e.g. the first delay/timeout scheduler hop inside a span), the executor instrumentation captures a ScopeContinuation on those static singletons that is never cancelled, leaking the pending trace so it is never reported. Disable async propagation while AbstractDirectTask's type initializer runs, mirroring the existing reactor.core.scheduler.SchedulerTask/WorkerTask handling. The matcher is inert unless RxJava 3 is on the classpath. RxJava 2 has no equivalent class. Restores the delayed-Maybe coverage in RxJava3Test, which fails without this fix and passes with it. Co-Authored-By: Claude Opus 4.8 (1M context) Add rxjava-3.0 @WithSpan async result extension test Co-Authored-By: Claude Opus 4.8 (1M context) Add rxjava-3.0 Java 8 interop context-propagation investigation test Co-Authored-By: Claude Opus 4.8 (1M context) Unify rxjava-3.0 test package under testdog.trace.instrumentation.rxjava3 Two tests were under datadog.trace.instrumentation.rxjava3 while the @Trace-using tests must live under testdog.* (the agent ignores datadog.* for instrumentation). Move all four tests to testdog.* for consistency. Co-Authored-By: Claude Opus 4.8 (1M context) review Add config json entry Skip root context capture in Observable and Single CaptureParentSpanAdvice Add scheduler context propagation and no-spurious-traces tests for Observable and Single Fix misleading comment in correctParentsFromSubscriptionTime test Extend cancel test to cover all five reactive types Ensure publisher-parent span is always finished in cancelUnderTrace Normalize PropagateParentSpanAdvice guard and add @Nonnull to TracingObserver spotless spotless Extend SubscriptionTest to cover all five RxJava 3 reactive types Add cancelledNever test to cover dispose-path span lifecycle in RxJava3ResultExtensionTest Remove strictTraceWrites(false) overrides — all tests pass under strict mode Remove redundant package comment — testdog convention is implicit across the codebase Remove redundant comments that describe what the code does rather than why Use childOfIndex(0) instead of childOf(parentId) in RxJava3InteropTest Remove redundant @WithConfig for opentelemetry-annotations-1.20 integration Remove redundant null check on parentContext in CaptureParentSpanAdvice Extract local variable for repeated Context class name in contextStore() Co-authored-by: amarziali Co-authored-by: valentin.zakharov --- ...veImageGeneratorRunnerInstrumentation.java | 1 + ...syncPropagatingDisableInstrumentation.java | 12 + .../rxjava/rxjava-3.0/build.gradle | 36 + .../rxjava3/CompletableInstrumentation.java | 72 ++ .../rxjava3/FlowableInstrumentation.java | 71 ++ .../rxjava3/MaybeInstrumentation.java | 69 ++ .../rxjava3/ObservableInstrumentation.java | 70 ++ .../rxjava3/RxJavaAsyncResultExtension.java | 68 ++ .../instrumentation/rxjava3/RxJavaModule.java | 52 ++ .../rxjava3/SingleInstrumentation.java | 70 ++ .../rxjava3/TracingCompletableObserver.java | 38 + .../rxjava3/TracingMaybeObserver.java | 45 ++ .../rxjava3/TracingObserver.java | 45 ++ .../rxjava3/TracingSingleObserver.java | 38 + .../rxjava3/TracingSubscriber.java | 45 ++ .../annotatedsample/RxJava3TracedMethods.java | 137 ++++ .../rxjava3/RxJava3InteropTest.java | 132 ++++ .../rxjava3/RxJava3ResultExtensionTest.java | 241 +++++++ .../instrumentation/rxjava3/RxJava3Test.java | 657 ++++++++++++++++++ .../rxjava3/SubscriptionTest.java | 162 +++++ metadata/supported-configurations.json | 8 + settings.gradle.kts | 1 + 22 files changed, 2070 insertions(+) create mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/build.gradle create mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/CompletableInstrumentation.java create mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/FlowableInstrumentation.java create mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/MaybeInstrumentation.java create mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/ObservableInstrumentation.java create mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/RxJavaAsyncResultExtension.java create mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/RxJavaModule.java create mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/SingleInstrumentation.java create mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingCompletableObserver.java create mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingMaybeObserver.java create mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingObserver.java create mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingSingleObserver.java create mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingSubscriber.java create mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/annotatedsample/RxJava3TracedMethods.java create mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3InteropTest.java create mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3ResultExtensionTest.java create mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3Test.java create mode 100644 dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/SubscriptionTest.java diff --git a/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/NativeImageGeneratorRunnerInstrumentation.java b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/NativeImageGeneratorRunnerInstrumentation.java index 7fa0195e70e..8ab84d9b8af 100644 --- a/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/NativeImageGeneratorRunnerInstrumentation.java +++ b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/NativeImageGeneratorRunnerInstrumentation.java @@ -157,6 +157,7 @@ public static void onEnter(@Advice.Argument(value = 0, readOnly = false) String[ + "datadog.trace.instrumentation.reactivestreams.ReactiveStreamsAsyncResultExtension:build_time," + "datadog.trace.instrumentation.reactor.core.ReactorAsyncResultExtension:build_time," + "datadog.trace.instrumentation.rxjava2.RxJavaAsyncResultExtension:build_time," + + "datadog.trace.instrumentation.rxjava3.RxJavaAsyncResultExtension:build_time," + "datadog.trace.logging.ddlogger.DDLogger:build_time," + "datadog.trace.logging.ddlogger.DDLoggerFactory:build_time," + "datadog.trace.logging.ddlogger.DDLoggerFactory$HelperWrapper:build_time," diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/AsyncPropagatingDisableInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/AsyncPropagatingDisableInstrumentation.java index 94c94573032..98b127fea12 100644 --- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/AsyncPropagatingDisableInstrumentation.java +++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/AsyncPropagatingDisableInstrumentation.java @@ -47,6 +47,14 @@ public AsyncPropagatingDisableInstrumentation() { namedOneOf("reactor.core.scheduler.SchedulerTask", "reactor.core.scheduler.WorkerTask"); private static final ElementMatcher RXJAVA2_DISABLED_TYPE_INITIALIZERS = named("io.reactivex.internal.schedulers.AbstractDirectTask"); + + /** + * RxJava 3's AbstractDirectTask creates FINISHED/DISPOSED sentinel FutureTask instances in its + * static initializer. + */ + private static final ElementMatcher RXJAVA3_DISABLED_TYPE_INITIALIZERS = + named("io.reactivex.rxjava3.internal.schedulers.AbstractDirectTask"); + private static final ElementMatcher NETTY_GLOBAL_EVENT_EXECUTOR = namedOneOf( "io.netty.util.concurrent.GlobalEventExecutor", @@ -90,6 +98,7 @@ public String[] knownMatchingTypes() { "org.apache.activemq.broker.TransactionBroker", "com.mongodb.internal.connection.DefaultConnectionPool$AsyncWorkManager", "io.reactivex.internal.schedulers.AbstractDirectTask", + "io.reactivex.rxjava3.internal.schedulers.AbstractDirectTask", "jdk.internal.net.http.HttpClientImpl", LETTUCE_HANDSHAKE_HANDLER, "io.netty.util.concurrent.GlobalEventExecutor", @@ -110,6 +119,7 @@ public ElementMatcher hierarchyMatcher() { .or(GRPC_MANAGED_CHANNEL) .or(REACTOR_DISABLED_TYPE_INITIALIZERS) .or(RXJAVA2_DISABLED_TYPE_INITIALIZERS) + .or(RXJAVA3_DISABLED_TYPE_INITIALIZERS) .or(JAVA_HTTP_CLIENT); } @@ -196,6 +206,8 @@ public void methodAdvice(MethodTransformer transformer) { isTypeInitializer().and(isDeclaredBy(REACTOR_DISABLED_TYPE_INITIALIZERS)), advice); transformer.applyAdvice( isTypeInitializer().and(isDeclaredBy(RXJAVA2_DISABLED_TYPE_INITIALIZERS)), advice); + transformer.applyAdvice( + isTypeInitializer().and(isDeclaredBy(RXJAVA3_DISABLED_TYPE_INITIALIZERS)), advice); transformer.applyAdvice( isTypeInitializer().and(isDeclaredBy(NETTY_GLOBAL_EVENT_EXECUTOR)), advice); transformer.applyAdvice(namedOneOf("sendAsync").and(isDeclaredBy(JAVA_HTTP_CLIENT)), advice); diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/build.gradle b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/build.gradle new file mode 100644 index 00000000000..50d136149d4 --- /dev/null +++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/build.gradle @@ -0,0 +1,36 @@ +muzzle { + pass { + group = "io.reactivex.rxjava3" + module = "rxjava" + versions = "[3.0.0,)" + } + // Assert the rxjava3 advice never resolves against rxjava2 — the two namespaces + // must not overlap. rxjava3 references io.reactivex.rxjava3.core.*, absent from the + // rxjava2 artifact, so muzzle must fail to match it. + fail { + name = "rxjava2-must-not-match" + group = "io.reactivex.rxjava2" + module = "rxjava" + versions = "[2.0.0,)" + } +} + +apply from: "$rootDir/gradle/java.gradle" + +addTestSuiteForDir('latestDepTest', 'test') + +dependencies { + compileOnly group: 'org.reactivestreams', name: 'reactive-streams', version: '1.0.3' + compileOnly group: 'io.reactivex.rxjava3', name: 'rxjava', version: '3.0.0' + + testImplementation project(':dd-java-agent:instrumentation:datadog:tracing:trace-annotation') + testImplementation project(':dd-java-agent:instrumentation:opentelemetry:opentelemetry-annotations-1.20') + testImplementation group: 'io.reactivex.rxjava3', name: 'rxjava', version: '3.0.0' + testImplementation group: 'io.opentelemetry.instrumentation', name: 'opentelemetry-instrumentation-annotations', version: '1.28.0' + + // Load the rxjava2 instrumenter at test runtime to prove the two versions coexist on + // the agent without interference (it stays dormant with only rxjava3 on the classpath). + testRuntimeOnly project(':dd-java-agent:instrumentation:rxjava:rxjava-2.0') + + latestDepTestImplementation group: 'io.reactivex.rxjava3', name: 'rxjava', version: '+' +} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/CompletableInstrumentation.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/CompletableInstrumentation.java new file mode 100644 index 00000000000..1da60b7db8a --- /dev/null +++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/CompletableInstrumentation.java @@ -0,0 +1,72 @@ +package datadog.trace.instrumentation.rxjava3; + +import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; +import static net.bytebuddy.matcher.ElementMatchers.isConstructor; +import static net.bytebuddy.matcher.ElementMatchers.isMethod; +import static net.bytebuddy.matcher.ElementMatchers.takesArgument; +import static net.bytebuddy.matcher.ElementMatchers.takesArguments; + +import datadog.context.Context; +import datadog.context.ContextScope; +import datadog.trace.agent.tooling.Instrumenter; +import datadog.trace.bootstrap.InstrumentationContext; +import datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge; +import io.reactivex.rxjava3.core.Completable; +import io.reactivex.rxjava3.core.CompletableObserver; +import net.bytebuddy.asm.Advice; + +public final class CompletableInstrumentation + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { + + @Override + public String instrumentedType() { + return "io.reactivex.rxjava3.core.Completable"; + } + + @Override + public void methodAdvice(MethodTransformer transformer) { + transformer.applyAdvice(isConstructor(), getClass().getName() + "$CaptureParentSpanAdvice"); + transformer.applyAdvice( + isMethod() + .and(named("subscribe")) + .and(takesArguments(1)) + .and(takesArgument(0, named("io.reactivex.rxjava3.core.CompletableObserver"))), + getClass().getName() + "$PropagateParentSpanAdvice"); + } + + public static class CaptureParentSpanAdvice { + @Advice.OnMethodExit(suppress = Throwable.class) + public static void onConstruct(@Advice.This final Completable completable) { + Context parentContext = Java8BytecodeBridge.getCurrentContext(); + if (parentContext != Java8BytecodeBridge.getRootContext()) { + InstrumentationContext.get(Completable.class, Context.class) + .put(completable, parentContext); + } + } + } + + public static class PropagateParentSpanAdvice { + @Advice.OnMethodEnter(suppress = Throwable.class) + public static ContextScope onSubscribe( + @Advice.This final Completable completable, + @Advice.Argument(value = 0, readOnly = false) CompletableObserver observer) { + if (observer != null) { + Context parentContext = + InstrumentationContext.get(Completable.class, Context.class).get(completable); + if (parentContext != null) { + observer = new TracingCompletableObserver(observer, parentContext); + // attach the context here in case additional observers are created during subscribe + return parentContext.attach(); + } + } + return null; + } + + @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) + public static void closeScope(@Advice.Enter final ContextScope scope) { + if (scope != null) { + scope.close(); + } + } + } +} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/FlowableInstrumentation.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/FlowableInstrumentation.java new file mode 100644 index 00000000000..3005d7154c4 --- /dev/null +++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/FlowableInstrumentation.java @@ -0,0 +1,71 @@ +package datadog.trace.instrumentation.rxjava3; + +import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; +import static net.bytebuddy.matcher.ElementMatchers.isConstructor; +import static net.bytebuddy.matcher.ElementMatchers.isMethod; +import static net.bytebuddy.matcher.ElementMatchers.takesArgument; +import static net.bytebuddy.matcher.ElementMatchers.takesArguments; + +import datadog.context.Context; +import datadog.context.ContextScope; +import datadog.trace.agent.tooling.Instrumenter; +import datadog.trace.bootstrap.InstrumentationContext; +import datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.core.FlowableSubscriber; +import net.bytebuddy.asm.Advice; + +public final class FlowableInstrumentation + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { + + @Override + public String instrumentedType() { + return "io.reactivex.rxjava3.core.Flowable"; + } + + @Override + public void methodAdvice(MethodTransformer transformer) { + transformer.applyAdvice(isConstructor(), getClass().getName() + "$CaptureParentSpanAdvice"); + transformer.applyAdvice( + isMethod() + .and(named("subscribe")) + .and(takesArguments(1)) + .and(takesArgument(0, named("io.reactivex.rxjava3.core.FlowableSubscriber"))), + getClass().getName() + "$PropagateParentSpanAdvice"); + } + + public static class CaptureParentSpanAdvice { + @Advice.OnMethodExit(suppress = Throwable.class) + public static void onConstruct(@Advice.This final Flowable flowable) { + Context parentContext = Java8BytecodeBridge.getCurrentContext(); + if (parentContext != Java8BytecodeBridge.getRootContext()) { + InstrumentationContext.get(Flowable.class, Context.class).put(flowable, parentContext); + } + } + } + + public static class PropagateParentSpanAdvice { + @Advice.OnMethodEnter(suppress = Throwable.class) + public static ContextScope onSubscribe( + @Advice.This final Flowable flowable, + @Advice.Argument(value = 0, readOnly = false) FlowableSubscriber subscriber) { + if (subscriber != null) { + Context parentContext = + InstrumentationContext.get(Flowable.class, Context.class).get(flowable); + if (parentContext != null) { + subscriber = new TracingSubscriber<>(subscriber, parentContext); + // attach the context here in case additional subscribers are created during subscribe + return parentContext.attach(); + } + } + return null; + } + + @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) + public static void closeScope(@Advice.Enter final ContextScope scope) { + if (scope != null) { + scope.close(); + } + } + } +} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/MaybeInstrumentation.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/MaybeInstrumentation.java new file mode 100644 index 00000000000..dee2b6a8a27 --- /dev/null +++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/MaybeInstrumentation.java @@ -0,0 +1,69 @@ +package datadog.trace.instrumentation.rxjava3; + +import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; +import static net.bytebuddy.matcher.ElementMatchers.isConstructor; +import static net.bytebuddy.matcher.ElementMatchers.isMethod; +import static net.bytebuddy.matcher.ElementMatchers.takesArgument; +import static net.bytebuddy.matcher.ElementMatchers.takesArguments; + +import datadog.context.Context; +import datadog.context.ContextScope; +import datadog.trace.agent.tooling.Instrumenter; +import datadog.trace.bootstrap.InstrumentationContext; +import datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge; +import io.reactivex.rxjava3.core.Maybe; +import io.reactivex.rxjava3.core.MaybeObserver; +import net.bytebuddy.asm.Advice; + +public final class MaybeInstrumentation + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { + @Override + public String instrumentedType() { + return "io.reactivex.rxjava3.core.Maybe"; + } + + @Override + public void methodAdvice(MethodTransformer transformer) { + transformer.applyAdvice(isConstructor(), getClass().getName() + "$CaptureParentSpanAdvice"); + transformer.applyAdvice( + isMethod() + .and(named("subscribe")) + .and(takesArguments(1)) + .and(takesArgument(0, named("io.reactivex.rxjava3.core.MaybeObserver"))), + getClass().getName() + "$PropagateParentSpanAdvice"); + } + + public static class CaptureParentSpanAdvice { + @Advice.OnMethodExit(suppress = Throwable.class) + public static void onConstruct(@Advice.This final Maybe maybe) { + Context parentContext = Java8BytecodeBridge.getCurrentContext(); + if (parentContext != Java8BytecodeBridge.getRootContext()) { + InstrumentationContext.get(Maybe.class, Context.class).put(maybe, parentContext); + } + } + } + + public static class PropagateParentSpanAdvice { + @Advice.OnMethodEnter(suppress = Throwable.class) + public static ContextScope onSubscribe( + @Advice.This final Maybe maybe, + @Advice.Argument(value = 0, readOnly = false) MaybeObserver observer) { + if (observer != null) { + Context parentContext = InstrumentationContext.get(Maybe.class, Context.class).get(maybe); + if (parentContext != null) { + observer = new TracingMaybeObserver<>(observer, parentContext); + // attach the context here in case additional observers are created during subscribe + return parentContext.attach(); + } + } + return null; + } + + @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) + public static void closeScope(@Advice.Enter final ContextScope scope) { + if (scope != null) { + scope.close(); + } + } + } +} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/ObservableInstrumentation.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/ObservableInstrumentation.java new file mode 100644 index 00000000000..663f9a273d7 --- /dev/null +++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/ObservableInstrumentation.java @@ -0,0 +1,70 @@ +package datadog.trace.instrumentation.rxjava3; + +import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; +import static net.bytebuddy.matcher.ElementMatchers.isConstructor; +import static net.bytebuddy.matcher.ElementMatchers.isMethod; +import static net.bytebuddy.matcher.ElementMatchers.takesArgument; +import static net.bytebuddy.matcher.ElementMatchers.takesArguments; + +import datadog.context.Context; +import datadog.context.ContextScope; +import datadog.trace.agent.tooling.Instrumenter; +import datadog.trace.bootstrap.InstrumentationContext; +import datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.core.Observer; +import net.bytebuddy.asm.Advice; + +public final class ObservableInstrumentation + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { + @Override + public String instrumentedType() { + return "io.reactivex.rxjava3.core.Observable"; + } + + @Override + public void methodAdvice(MethodTransformer transformer) { + transformer.applyAdvice(isConstructor(), getClass().getName() + "$CaptureParentSpanAdvice"); + transformer.applyAdvice( + isMethod() + .and(named("subscribe")) + .and(takesArguments(1)) + .and(takesArgument(0, named("io.reactivex.rxjava3.core.Observer"))), + getClass().getName() + "$PropagateParentSpanAdvice"); + } + + public static class CaptureParentSpanAdvice { + @Advice.OnMethodExit(suppress = Throwable.class) + public static void onConstruct(@Advice.This final Observable observable) { + Context parentContext = Java8BytecodeBridge.getCurrentContext(); + if (parentContext != Java8BytecodeBridge.getRootContext()) { + InstrumentationContext.get(Observable.class, Context.class).put(observable, parentContext); + } + } + } + + public static class PropagateParentSpanAdvice { + @Advice.OnMethodEnter(suppress = Throwable.class) + public static ContextScope onSubscribe( + @Advice.This final Observable observable, + @Advice.Argument(value = 0, readOnly = false) Observer observer) { + if (observer != null) { + Context parentContext = + InstrumentationContext.get(Observable.class, Context.class).get(observable); + if (parentContext != null) { + observer = new TracingObserver<>(observer, parentContext); + // attach the context here in case additional observers are created during subscribe + return parentContext.attach(); + } + } + return null; + } + + @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) + public static void closeScope(@Advice.Enter final ContextScope scope) { + if (scope != null) { + scope.close(); + } + } + } +} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/RxJavaAsyncResultExtension.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/RxJavaAsyncResultExtension.java new file mode 100644 index 00000000000..26ad58cfcf3 --- /dev/null +++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/RxJavaAsyncResultExtension.java @@ -0,0 +1,68 @@ +package datadog.trace.instrumentation.rxjava3; + +import datadog.trace.bootstrap.instrumentation.api.AgentSpan; +import datadog.trace.bootstrap.instrumentation.api.EagerHelper; +import datadog.trace.bootstrap.instrumentation.java.concurrent.AsyncResultExtension; +import datadog.trace.bootstrap.instrumentation.java.concurrent.AsyncResultExtensions; +import io.reactivex.rxjava3.core.Completable; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.core.Maybe; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.core.Single; + +public class RxJavaAsyncResultExtension implements AsyncResultExtension, EagerHelper { + static { + AsyncResultExtensions.register(new RxJavaAsyncResultExtension()); + } + + /** + * Register the extension as an {@link AsyncResultExtension} using static class initialization. + *
    + * It uses an empty static method call to ensure the class loading and the one-time-only static + * class initialization. This will ensure this extension will only be registered once under {@link + * AsyncResultExtensions}. + */ + public static void init() {} + + @Override + public boolean supports(Class result) { + return Completable.class.isAssignableFrom(result) + || Maybe.class.isAssignableFrom(result) + || Single.class.isAssignableFrom(result) + || Observable.class.isAssignableFrom(result) + || Flowable.class.isAssignableFrom(result); + } + + @Override + public Object apply(Object result, AgentSpan span) { + if (result instanceof Completable) { + return ((Completable) result) + .doOnEvent(throwable -> onError(span, throwable)) + .doOnDispose(span::finish); + } else if (result instanceof Maybe) { + return ((Maybe) result) + .doOnEvent((o, throwable) -> onError(span, throwable)) + .doOnDispose(span::finish); + } else if (result instanceof Single) { + return ((Single) result) + .doOnEvent((o, throwable) -> onError(span, throwable)) + .doOnDispose(span::finish); + } else if (result instanceof Observable) { + return ((Observable) result) + .doOnComplete(span::finish) + .doOnError(throwable -> onError(span, throwable)) + .doOnDispose(span::finish); + } else if (result instanceof Flowable) { + return ((Flowable) result) + .doOnComplete(span::finish) + .doOnError(throwable -> onError(span, throwable)) + .doOnCancel(span::finish); + } + return null; + } + + private static void onError(AgentSpan span, Throwable throwable) { + span.addThrowable(throwable); + span.finish(); + } +} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/RxJavaModule.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/RxJavaModule.java new file mode 100644 index 00000000000..69cfb0e833a --- /dev/null +++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/RxJavaModule.java @@ -0,0 +1,52 @@ +package datadog.trace.instrumentation.rxjava3; + +import static java.util.Arrays.asList; + +import com.google.auto.service.AutoService; +import datadog.context.Context; +import datadog.trace.agent.tooling.Instrumenter; +import datadog.trace.agent.tooling.InstrumenterModule; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@AutoService(InstrumenterModule.class) +public final class RxJavaModule extends InstrumenterModule.ContextTracking { + public RxJavaModule() { + super("rxjava", "rxjava-3"); + } + + @Override + public String[] helperClassNames() { + return new String[] { + packageName + ".TracingCompletableObserver", + packageName + ".TracingSubscriber", + packageName + ".TracingMaybeObserver", + packageName + ".TracingObserver", + packageName + ".RxJavaAsyncResultExtension", + packageName + ".TracingSingleObserver", + }; + } + + @Override + public Map contextStore() { + String contextClass = Context.class.getName(); + final Map store = new HashMap<>(); + store.put("io.reactivex.rxjava3.core.Flowable", contextClass); + store.put("io.reactivex.rxjava3.core.Completable", contextClass); + store.put("io.reactivex.rxjava3.core.Maybe", contextClass); + store.put("io.reactivex.rxjava3.core.Observable", contextClass); + store.put("io.reactivex.rxjava3.core.Single", contextClass); + return store; + } + + @Override + public List typeInstrumentations() { + return asList( + new CompletableInstrumentation(), + new FlowableInstrumentation(), + new MaybeInstrumentation(), + new ObservableInstrumentation(), + new SingleInstrumentation()); + } +} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/SingleInstrumentation.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/SingleInstrumentation.java new file mode 100644 index 00000000000..c9abbd2ef0c --- /dev/null +++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/SingleInstrumentation.java @@ -0,0 +1,70 @@ +package datadog.trace.instrumentation.rxjava3; + +import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; +import static net.bytebuddy.matcher.ElementMatchers.isConstructor; +import static net.bytebuddy.matcher.ElementMatchers.isMethod; +import static net.bytebuddy.matcher.ElementMatchers.takesArgument; +import static net.bytebuddy.matcher.ElementMatchers.takesArguments; + +import datadog.context.Context; +import datadog.context.ContextScope; +import datadog.trace.agent.tooling.Instrumenter; +import datadog.trace.bootstrap.InstrumentationContext; +import datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge; +import io.reactivex.rxjava3.core.Single; +import io.reactivex.rxjava3.core.SingleObserver; +import net.bytebuddy.asm.Advice; + +public final class SingleInstrumentation + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { + + @Override + public String instrumentedType() { + return "io.reactivex.rxjava3.core.Single"; + } + + @Override + public void methodAdvice(MethodTransformer transformer) { + transformer.applyAdvice(isConstructor(), getClass().getName() + "$CaptureParentSpanAdvice"); + transformer.applyAdvice( + isMethod() + .and(named("subscribe")) + .and(takesArguments(1)) + .and(takesArgument(0, named("io.reactivex.rxjava3.core.SingleObserver"))), + getClass().getName() + "$PropagateParentSpanAdvice"); + } + + public static class CaptureParentSpanAdvice { + @Advice.OnMethodExit(suppress = Throwable.class) + public static void onConstruct(@Advice.This final Single single) { + Context parentContext = Java8BytecodeBridge.getCurrentContext(); + if (parentContext != Java8BytecodeBridge.getRootContext()) { + InstrumentationContext.get(Single.class, Context.class).put(single, parentContext); + } + } + } + + public static class PropagateParentSpanAdvice { + @Advice.OnMethodEnter(suppress = Throwable.class) + public static ContextScope onSubscribe( + @Advice.This final Single single, + @Advice.Argument(value = 0, readOnly = false) SingleObserver observer) { + if (observer != null) { + Context parentContext = InstrumentationContext.get(Single.class, Context.class).get(single); + if (parentContext != null) { + observer = new TracingSingleObserver<>(observer, parentContext); + // attach the context here in case additional observers are created during subscribe + return parentContext.attach(); + } + } + return null; + } + + @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) + public static void closeScope(@Advice.Enter final ContextScope scope) { + if (scope != null) { + scope.close(); + } + } + } +} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingCompletableObserver.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingCompletableObserver.java new file mode 100644 index 00000000000..8a0dd7254e1 --- /dev/null +++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingCompletableObserver.java @@ -0,0 +1,38 @@ +package datadog.trace.instrumentation.rxjava3; + +import datadog.context.Context; +import datadog.context.ContextScope; +import io.reactivex.rxjava3.core.CompletableObserver; +import io.reactivex.rxjava3.disposables.Disposable; +import javax.annotation.Nonnull; + +/** Wrapper that makes sure spans from observer events treat the captured span as their parent. */ +public final class TracingCompletableObserver implements CompletableObserver { + private final CompletableObserver observer; + private final Context parentContext; + + public TracingCompletableObserver( + @Nonnull final CompletableObserver observer, @Nonnull final Context parentContext) { + this.observer = observer; + this.parentContext = parentContext; + } + + @Override + public void onSubscribe(final Disposable d) { + observer.onSubscribe(d); + } + + @Override + public void onError(final Throwable e) { + try (final ContextScope scope = parentContext.attach()) { + observer.onError(e); + } + } + + @Override + public void onComplete() { + try (final ContextScope scope = parentContext.attach()) { + observer.onComplete(); + } + } +} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingMaybeObserver.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingMaybeObserver.java new file mode 100644 index 00000000000..0cbf34c61e4 --- /dev/null +++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingMaybeObserver.java @@ -0,0 +1,45 @@ +package datadog.trace.instrumentation.rxjava3; + +import datadog.context.Context; +import datadog.context.ContextScope; +import io.reactivex.rxjava3.core.MaybeObserver; +import io.reactivex.rxjava3.disposables.Disposable; +import javax.annotation.Nonnull; + +/** Wrapper that makes sure spans from observer events treat the captured span as their parent. */ +public final class TracingMaybeObserver implements MaybeObserver { + private final MaybeObserver observer; + private final Context parentContext; + + public TracingMaybeObserver( + @Nonnull final MaybeObserver observer, @Nonnull final Context parentContext) { + this.observer = observer; + this.parentContext = parentContext; + } + + @Override + public void onSubscribe(final Disposable d) { + observer.onSubscribe(d); + } + + @Override + public void onSuccess(final T value) { + try (final ContextScope scope = parentContext.attach()) { + observer.onSuccess(value); + } + } + + @Override + public void onError(final Throwable e) { + try (final ContextScope scope = parentContext.attach()) { + observer.onError(e); + } + } + + @Override + public void onComplete() { + try (final ContextScope scope = parentContext.attach()) { + observer.onComplete(); + } + } +} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingObserver.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingObserver.java new file mode 100644 index 00000000000..50bad4e92a1 --- /dev/null +++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingObserver.java @@ -0,0 +1,45 @@ +package datadog.trace.instrumentation.rxjava3; + +import datadog.context.Context; +import datadog.context.ContextScope; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.disposables.Disposable; +import javax.annotation.Nonnull; + +/** Wrapper that makes sure spans from observer events treat the captured span as their parent. */ +public final class TracingObserver implements Observer { + private final Observer observer; + private final Context parentContext; + + public TracingObserver( + @Nonnull final Observer observer, @Nonnull final Context parentContext) { + this.observer = observer; + this.parentContext = parentContext; + } + + @Override + public void onSubscribe(final Disposable d) { + observer.onSubscribe(d); + } + + @Override + public void onNext(final T value) { + try (final ContextScope scope = parentContext.attach()) { + observer.onNext(value); + } + } + + @Override + public void onError(final Throwable e) { + try (final ContextScope scope = parentContext.attach()) { + observer.onError(e); + } + } + + @Override + public void onComplete() { + try (final ContextScope scope = parentContext.attach()) { + observer.onComplete(); + } + } +} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingSingleObserver.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingSingleObserver.java new file mode 100644 index 00000000000..3e05d1124bc --- /dev/null +++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingSingleObserver.java @@ -0,0 +1,38 @@ +package datadog.trace.instrumentation.rxjava3; + +import datadog.context.Context; +import datadog.context.ContextScope; +import io.reactivex.rxjava3.core.SingleObserver; +import io.reactivex.rxjava3.disposables.Disposable; +import javax.annotation.Nonnull; + +/** Wrapper that makes sure spans from observer events treat the captured span as their parent. */ +public final class TracingSingleObserver implements SingleObserver { + private final SingleObserver observer; + private final Context parentContext; + + public TracingSingleObserver( + @Nonnull final SingleObserver observer, @Nonnull final Context parentContext) { + this.observer = observer; + this.parentContext = parentContext; + } + + @Override + public void onSubscribe(final Disposable d) { + observer.onSubscribe(d); + } + + @Override + public void onSuccess(final T value) { + try (final ContextScope scope = parentContext.attach()) { + observer.onSuccess(value); + } + } + + @Override + public void onError(final Throwable e) { + try (final ContextScope scope = parentContext.attach()) { + observer.onError(e); + } + } +} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingSubscriber.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingSubscriber.java new file mode 100644 index 00000000000..49caa0e6ecf --- /dev/null +++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/TracingSubscriber.java @@ -0,0 +1,45 @@ +package datadog.trace.instrumentation.rxjava3; + +import datadog.context.Context; +import datadog.context.ContextScope; +import io.reactivex.rxjava3.core.FlowableSubscriber; +import javax.annotation.Nonnull; +import org.reactivestreams.Subscription; + +/** Wrapper that makes sure spans from subscriber events treat the captured span as their parent. */ +public final class TracingSubscriber implements FlowableSubscriber { + private final FlowableSubscriber subscriber; + private final Context parentContext; + + public TracingSubscriber( + @Nonnull final FlowableSubscriber subscriber, @Nonnull final Context parentContext) { + this.subscriber = subscriber; + this.parentContext = parentContext; + } + + @Override + public void onSubscribe(final Subscription subscription) { + subscriber.onSubscribe(subscription); + } + + @Override + public void onNext(final T value) { + try (final ContextScope scope = parentContext.attach()) { + subscriber.onNext(value); + } + } + + @Override + public void onError(final Throwable e) { + try (final ContextScope scope = parentContext.attach()) { + subscriber.onError(e); + } + } + + @Override + public void onComplete() { + try (final ContextScope scope = parentContext.attach()) { + subscriber.onComplete(); + } + } +} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/annotatedsample/RxJava3TracedMethods.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/annotatedsample/RxJava3TracedMethods.java new file mode 100644 index 00000000000..163f5fb4b69 --- /dev/null +++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/annotatedsample/RxJava3TracedMethods.java @@ -0,0 +1,137 @@ +package annotatedsample; + +import static java.util.concurrent.TimeUnit.SECONDS; + +import io.opentelemetry.instrumentation.annotations.WithSpan; +import io.reactivex.rxjava3.core.Completable; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.core.Maybe; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.core.Single; +import java.util.concurrent.CountDownLatch; + +public class RxJava3TracedMethods { + @WithSpan + public static Completable traceAsyncCompletable(CountDownLatch latch) { + return Completable.fromRunnable(() -> await(latch)); + } + + @WithSpan + public static Completable traceAsyncFailingCompletable( + CountDownLatch latch, Exception exception) { + return Completable.fromCallable( + () -> { + await(latch); + throw exception; + }); + } + + @WithSpan + public static Maybe traceAsyncMaybe(CountDownLatch latch) { + return Maybe.fromCallable( + () -> { + await(latch); + return "hello"; + }); + } + + @WithSpan + public static Maybe traceAsyncFailingMaybe(CountDownLatch latch, Exception exception) { + return Maybe.fromCallable( + () -> { + await(latch); + throw exception; + }); + } + + @WithSpan + public static Single traceAsyncSingle(CountDownLatch latch) { + return Single.fromCallable( + () -> { + await(latch); + return "hello"; + }); + } + + @WithSpan + public static Single traceAsyncFailingSingle(CountDownLatch latch, Exception exception) { + return Single.fromCallable( + () -> { + await(latch); + throw exception; + }); + } + + @WithSpan + public static Observable traceAsyncObservable(CountDownLatch latch) { + return Observable.fromCallable( + () -> { + await(latch); + return "hello"; + }); + } + + @WithSpan + public static Observable traceAsyncFailingObservable( + CountDownLatch latch, Exception exception) { + return Observable.fromCallable( + () -> { + await(latch); + throw exception; + }); + } + + @WithSpan + public static Flowable traceAsyncFlowable(CountDownLatch latch) { + return Flowable.fromCallable( + () -> { + await(latch); + return "hello"; + }); + } + + @WithSpan + public static Flowable traceAsyncFailingFlowable( + CountDownLatch latch, Exception exception) { + return Flowable.fromCallable( + () -> { + await(latch); + throw exception; + }); + } + + @WithSpan + public static Completable traceAsyncNeverCompletable() { + return Completable.never(); + } + + @WithSpan + public static Maybe traceAsyncNeverMaybe() { + return Maybe.never(); + } + + @WithSpan + public static Single traceAsyncNeverSingle() { + return Single.never(); + } + + @WithSpan + public static Observable traceAsyncNeverObservable() { + return Observable.never(); + } + + @WithSpan + public static Flowable traceAsyncNeverFlowable() { + return Flowable.never(); + } + + private static void await(CountDownLatch latch) { + try { + if (!latch.await(5, SECONDS)) { + throw new IllegalStateException("Latch still locked"); + } + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + } +} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3InteropTest.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3InteropTest.java new file mode 100644 index 00000000000..14ddd2f1f7b --- /dev/null +++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3InteropTest.java @@ -0,0 +1,132 @@ +package testdog.trace.instrumentation.rxjava3; + +import static datadog.trace.agent.test.assertions.Matchers.validates; +import static datadog.trace.agent.test.assertions.SpanMatcher.span; +import static datadog.trace.agent.test.assertions.TagsMatcher.defaultTags; +import static datadog.trace.agent.test.assertions.TagsMatcher.tag; +import static datadog.trace.agent.test.assertions.TraceMatcher.SORT_BY_START_TIME; +import static datadog.trace.agent.test.assertions.TraceMatcher.trace; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import datadog.trace.agent.test.AbstractInstrumentationTest; +import datadog.trace.agent.test.assertions.TagsMatcher; +import datadog.trace.api.Trace; +import datadog.trace.bootstrap.instrumentation.api.Tags; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.core.Maybe; +import io.reactivex.rxjava3.core.Single; +import java.util.List; +import java.util.Optional; +import java.util.concurrent.CompletableFuture; +import java.util.function.Supplier; +import java.util.stream.Stream; +import org.junit.jupiter.api.Test; + +class RxJava3InteropTest extends AbstractInstrumentationTest { + + // The component tag is stored as a UTF8BytesString, so compare by string content. + static TagsMatcher componentTrace() { + return tag(Tags.COMPONENT, validates(o -> "trace".equals(String.valueOf(o)))); + } + + static class Worker { + static int child(int i) { + return childTraced(i); + } + + @Trace(operationName = "child", resourceName = "child") + static int childTraced(int i) { + return i + 1; + } + + @Trace(operationName = "interop-parent", resourceName = "interop-parent") + static T runUnderParent(Supplier work) { + return work.get(); + } + } + + @Test + void fromCompletionStageSync() { + Integer result = + Worker.runUnderParent( + () -> + Single.fromCompletionStage(CompletableFuture.completedFuture(1)) + .map(Worker::child) + .blockingGet()); + assertEquals(2, result); + + assertTraces( + trace( + SORT_BY_START_TIME, + span().root().operationName("interop-parent").resourceName("interop-parent"), + span() + .childOfIndex(0) + .operationName("child") + .resourceName("child") + .tags(componentTrace(), defaultTags()))); + } + + @Test + void fromCompletionStageAsync() { + Integer result = + Worker.runUnderParent( + () -> + Single.fromCompletionStage(CompletableFuture.supplyAsync(() -> 1)) + .map(Worker::child) + .blockingGet()); + assertEquals(2, result); + + assertTraces( + trace( + SORT_BY_START_TIME, + span().root().operationName("interop-parent").resourceName("interop-parent"), + span() + .childOfIndex(0) + .operationName("child") + .resourceName("child") + .tags(componentTrace(), defaultTags()))); + } + + @Test + void fromOptional() { + Integer result = + Worker.runUnderParent( + () -> Maybe.fromOptional(Optional.of(1)).map(Worker::child).blockingGet()); + assertEquals(2, result); + + assertTraces( + trace( + SORT_BY_START_TIME, + span().root().operationName("interop-parent").resourceName("interop-parent"), + span() + .childOfIndex(0) + .operationName("child") + .resourceName("child") + .tags(componentTrace(), defaultTags()))); + } + + @Test + void fromStream() { + List result = + Worker.runUnderParent( + () -> Flowable.fromStream(Stream.of(1, 2)).map(Worker::child).toList().blockingGet()); + assertEquals(2, result.size()); + assertEquals(2, result.get(0)); + assertEquals(3, result.get(1)); + + assertTraces( + trace( + SORT_BY_START_TIME, + span().root().operationName("interop-parent").resourceName("interop-parent"), + span() + .childOfIndex(0) + .operationName("child") + .resourceName("child") + .tags(componentTrace(), defaultTags()), + span() + .childOfIndex(0) + .operationName("child") + .resourceName("child") + .tags(componentTrace(), defaultTags()))); + } +} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3ResultExtensionTest.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3ResultExtensionTest.java new file mode 100644 index 00000000000..27d76f80c1b --- /dev/null +++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3ResultExtensionTest.java @@ -0,0 +1,241 @@ +package testdog.trace.instrumentation.rxjava3; + +import static datadog.trace.agent.test.assertions.Matchers.validates; +import static datadog.trace.agent.test.assertions.SpanMatcher.span; +import static datadog.trace.agent.test.assertions.TagsMatcher.defaultTags; +import static datadog.trace.agent.test.assertions.TagsMatcher.error; +import static datadog.trace.agent.test.assertions.TagsMatcher.tag; +import static datadog.trace.agent.test.assertions.TraceMatcher.trace; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + +import annotatedsample.RxJava3TracedMethods; +import datadog.trace.agent.test.AbstractInstrumentationTest; +import datadog.trace.agent.test.assertions.SpanMatcher; +import datadog.trace.agent.test.assertions.TagsMatcher; +import datadog.trace.bootstrap.instrumentation.api.Tags; +import datadog.trace.junit.utils.config.WithConfig; +import io.reactivex.rxjava3.core.Completable; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.core.Maybe; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.core.Single; +import java.util.concurrent.CountDownLatch; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.EnumSource; + +@WithConfig(key = "trace.otel.enabled", value = "true") +class RxJava3ResultExtensionTest extends AbstractInstrumentationTest { + + static final String EXCEPTION_MESSAGE = "Test exception"; + + // The COMPONENT and SPAN_KIND tags are stored as UTF8BytesString, so we compare by string content + // rather than using is("...") which would fail the asymmetric String#equals(UTF8BytesString) + // check. + static TagsMatcher otelComponent() { + return tag(Tags.COMPONENT, validates(o -> "opentelemetry".equals(String.valueOf(o)))); + } + + static TagsMatcher internalSpanKind() { + return tag(Tags.SPAN_KIND, validates(o -> Tags.SPAN_KIND_INTERNAL.equals(String.valueOf(o)))); + } + + // The operation and resource names are stored as UTF8BytesString, so we compare by string content + // (CharSequence equality is asymmetric: String#equals(UTF8BytesString) is false). + static SpanMatcher otelSpan(String name) { + return span() + .operationName(java.util.regex.Pattern.compile(java.util.regex.Pattern.quote(name))) + .resourceName((CharSequence cs) -> name.contentEquals(cs)); + } + + /** + * The five reactive types exercised by the test, with their type-specific terminal operations. + */ + enum ReactiveType { + COMPLETABLE("Completable"), + MAYBE("Maybe"), + SINGLE("Single"), + OBSERVABLE("Observable"), + FLOWABLE("Flowable"); + + final String type; + + ReactiveType(String type) { + this.type = type; + } + + /** Runs the blocking terminal operation that drives the async result to completion. */ + void runTerminal(Object asyncType) { + switch (this) { + case COMPLETABLE: + ((Completable) asyncType).blockingAwait(); + break; + case MAYBE: + ((Maybe) asyncType).blockingGet(); + break; + case SINGLE: + ((Single) asyncType).blockingGet(); + break; + case OBSERVABLE: + ((Observable) asyncType).blockingLast(); + break; + case FLOWABLE: + ((Flowable) asyncType).blockingLast(); + break; + default: + throw new IllegalStateException("Unknown type: " + this); + } + } + + /** Subscribes and immediately disposes (cancels) the async result. */ + void subscribeAndDispose(Object asyncType) { + switch (this) { + case COMPLETABLE: + ((Completable) asyncType).subscribe().dispose(); + break; + case MAYBE: + ((Maybe) asyncType).subscribe().dispose(); + break; + case SINGLE: + ((Single) asyncType).subscribe().dispose(); + break; + case OBSERVABLE: + ((Observable) asyncType).subscribe().dispose(); + break; + case FLOWABLE: + ((Flowable) asyncType).subscribe().dispose(); + break; + default: + throw new IllegalStateException("Unknown type: " + this); + } + } + + Object traceAsync(CountDownLatch latch) { + switch (this) { + case COMPLETABLE: + return RxJava3TracedMethods.traceAsyncCompletable(latch); + case MAYBE: + return RxJava3TracedMethods.traceAsyncMaybe(latch); + case SINGLE: + return RxJava3TracedMethods.traceAsyncSingle(latch); + case OBSERVABLE: + return RxJava3TracedMethods.traceAsyncObservable(latch); + case FLOWABLE: + return RxJava3TracedMethods.traceAsyncFlowable(latch); + default: + throw new IllegalStateException("Unknown type: " + this); + } + } + + Object traceAsyncNever() { + switch (this) { + case COMPLETABLE: + return RxJava3TracedMethods.traceAsyncNeverCompletable(); + case MAYBE: + return RxJava3TracedMethods.traceAsyncNeverMaybe(); + case SINGLE: + return RxJava3TracedMethods.traceAsyncNeverSingle(); + case OBSERVABLE: + return RxJava3TracedMethods.traceAsyncNeverObservable(); + case FLOWABLE: + return RxJava3TracedMethods.traceAsyncNeverFlowable(); + default: + throw new IllegalStateException("Unknown type: " + this); + } + } + + Object traceAsyncFailing(CountDownLatch latch, Exception exception) { + switch (this) { + case COMPLETABLE: + return RxJava3TracedMethods.traceAsyncFailingCompletable(latch, exception); + case MAYBE: + return RxJava3TracedMethods.traceAsyncFailingMaybe(latch, exception); + case SINGLE: + return RxJava3TracedMethods.traceAsyncFailingSingle(latch, exception); + case OBSERVABLE: + return RxJava3TracedMethods.traceAsyncFailingObservable(latch, exception); + case FLOWABLE: + return RxJava3TracedMethods.traceAsyncFailingFlowable(latch, exception); + default: + throw new IllegalStateException("Unknown type: " + this); + } + } + } + + @ParameterizedTest(name = "test WithSpan annotated async method {0}") + @EnumSource(ReactiveType.class) + void success(ReactiveType type) { + CountDownLatch latch = new CountDownLatch(1); + Object asyncType = type.traceAsync(latch); + + // The span must not be finished before the async result completes. + assertEquals(0, writer.size()); + + latch.countDown(); + type.runTerminal(asyncType); + + String method = "traceAsync" + type.type; + assertTraces( + trace( + otelSpan("RxJava3TracedMethods." + method) + .tags(defaultTags(), otelComponent(), internalSpanKind()))); + } + + @ParameterizedTest(name = "test WithSpan annotated async method failing {0}") + @EnumSource(ReactiveType.class) + void failing(ReactiveType type) { + CountDownLatch latch = new CountDownLatch(1); + IllegalStateException expectedException = new IllegalStateException(EXCEPTION_MESSAGE); + Object asyncType = type.traceAsyncFailing(latch, expectedException); + + assertEquals(0, writer.size()); + + latch.countDown(); + assertThrows(IllegalStateException.class, () -> type.runTerminal(asyncType)); + + String method = "traceAsyncFailing" + type.type; + assertTraces( + trace( + otelSpan("RxJava3TracedMethods." + method) + .error() + .tags( + defaultTags(), + otelComponent(), + internalSpanKind(), + error(IllegalStateException.class, EXCEPTION_MESSAGE)))); + } + + @ParameterizedTest(name = "test WithSpan annotated async method cancelled {0}") + @EnumSource(ReactiveType.class) + void cancelled(ReactiveType type) { + CountDownLatch latch = new CountDownLatch(1); + Object asyncType = type.traceAsync(latch); + + assertEquals(0, writer.size()); + + latch.countDown(); + type.subscribeAndDispose(asyncType); + + String method = "traceAsync" + type.type; + assertTraces( + trace( + otelSpan("RxJava3TracedMethods." + method) + .tags(defaultTags(), otelComponent(), internalSpanKind()))); + } + + @ParameterizedTest(name = "test WithSpan annotated never async method cancelled {0}") + @EnumSource(ReactiveType.class) + void cancelledNever(ReactiveType type) { + Object asyncType = type.traceAsyncNever(); + + assertEquals(0, writer.size()); + + type.subscribeAndDispose(asyncType); + + String method = "traceAsyncNever" + type.type; + assertTraces( + trace( + otelSpan("RxJava3TracedMethods." + method) + .tags(defaultTags(), otelComponent(), internalSpanKind()))); + } +} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3Test.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3Test.java new file mode 100644 index 00000000000..e9bef9e2068 --- /dev/null +++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3Test.java @@ -0,0 +1,657 @@ +package testdog.trace.instrumentation.rxjava3; + +import static datadog.trace.agent.test.assertions.Matchers.validates; +import static datadog.trace.agent.test.assertions.SpanMatcher.span; +import static datadog.trace.agent.test.assertions.TagsMatcher.defaultTags; +import static datadog.trace.agent.test.assertions.TagsMatcher.error; +import static datadog.trace.agent.test.assertions.TagsMatcher.tag; +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.activeSpan; +import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static java.util.concurrent.TimeUnit.MILLISECONDS; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + +import datadog.trace.agent.test.AbstractInstrumentationTest; +import datadog.trace.agent.test.assertions.SpanMatcher; +import datadog.trace.agent.test.assertions.TagsMatcher; +import datadog.trace.api.Trace; +import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.trace.bootstrap.instrumentation.api.AgentSpan; +import datadog.trace.bootstrap.instrumentation.api.Tags; +import io.reactivex.rxjava3.core.BackpressureStrategy; +import io.reactivex.rxjava3.core.Completable; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.core.Maybe; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.core.Scheduler; +import io.reactivex.rxjava3.core.Single; +import io.reactivex.rxjava3.schedulers.Schedulers; +import java.util.Arrays; +import java.util.List; +import java.util.function.Supplier; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; +import org.reactivestreams.Subscriber; +import org.reactivestreams.Subscription; + +class RxJava3Test extends AbstractInstrumentationTest { + + static final String EXCEPTION_MESSAGE = "test exception"; + + // The component tag is stored as a UTF8BytesString, so we compare by string content rather than + // using is("trace") which would fail the asymmetric String#equals(UTF8BytesString) check. + static TagsMatcher componentTrace() { + return tag(Tags.COMPONENT, validates(o -> "trace".equals(String.valueOf(o)))); + } + + static class Worker { + static long traceParentId; + static long publisherParentId; + static long intermediateId; + + static int addOne(int i) { + return addOneTraced(i); + } + + @Trace(operationName = "addOne", resourceName = "addOne") + static int addOneTraced(int i) { + return i + 1; + } + + static int addTwo(int i) { + return addTwoTraced(i); + } + + @Trace(operationName = "addTwo", resourceName = "addTwo") + static int addTwoTraced(int i) { + return i + 2; + } + + static Object throwException() { + throw new RuntimeException(EXCEPTION_MESSAGE); + } + + @Trace(operationName = "trace-parent", resourceName = "trace-parent") + @SuppressWarnings("unchecked") + static Object assemblePublisherUnderTrace(Supplier publisherSupplier) { + traceParentId = activeSpan().getSpanId(); + AgentSpan span = startSpan("test", "publisher-parent"); + publisherParentId = span.getSpanId(); + AgentScope scope = activateSpan(span); + + Object publisher = publisherSupplier.get(); + try { + if (publisher instanceof Maybe) { + return ((Maybe) publisher).blockingGet(); + } else if (publisher instanceof Flowable) { + List list = ((Flowable) publisher).toList().blockingGet(); + return list.toArray(new Object[0]); + } + throw new RuntimeException("Unknown publisher: " + publisher); + } finally { + span.finish(); + scope.close(); + } + } + + @Trace(operationName = "trace-parent", resourceName = "trace-parent") + static void cancelUnderTrace(Supplier publisherSupplier) { + traceParentId = activeSpan().getSpanId(); + AgentSpan span = startSpan("test", "publisher-parent"); + publisherParentId = span.getSpanId(); + AgentScope scope = activateSpan(span); + + // Normalize every reactive type to a Flowable so a single Subscriber can cancel the + // subscription right away, exercising the cancellation path of each instrumentation. + Object publisher = publisherSupplier.get(); + Flowable flowable; + if (publisher instanceof Maybe) { + flowable = ((Maybe) publisher).toFlowable(); + } else if (publisher instanceof Single) { + flowable = ((Single) publisher).toFlowable(); + } else if (publisher instanceof Observable) { + flowable = ((Observable) publisher).toFlowable(BackpressureStrategy.BUFFER); + } else if (publisher instanceof Completable) { + flowable = ((Completable) publisher).toFlowable(); + } else { + flowable = (Flowable) publisher; + } + + try { + flowable.subscribe( + new Subscriber() { + @Override + public void onSubscribe(Subscription subscription) { + subscription.cancel(); + } + + @Override + public void onNext(Object t) {} + + @Override + public void onError(Throwable error) {} + + @Override + public void onComplete() {} + }); + } finally { + scope.close(); + span.finish(); + } + } + + @Trace(operationName = "trace-parent", resourceName = "trace-parent") + static Object runUnderTraceParent(Supplier work) { + traceParentId = activeSpan().getSpanId(); + return work.get(); + } + } + + // --- Publisher success --------------------------------------------------- + + static List publisherSuccessArgs() { + return Arrays.asList( + Arguments.of( + "basic maybe", + new Object[] {2}, + 1, + (Supplier) () -> Maybe.just(1).map(Worker::addOne)), + Arguments.of( + "two operations maybe", + new Object[] {4}, + 2, + (Supplier) () -> Maybe.just(2).map(Worker::addOne).map(Worker::addOne)), + Arguments.of( + "delayed maybe", + new Object[] {4}, + 1, + (Supplier) () -> Maybe.just(3).delay(100, MILLISECONDS).map(Worker::addOne)), + Arguments.of( + "delayed twice maybe", + new Object[] {6}, + 2, + (Supplier) + () -> + Maybe.just(4) + .delay(100, MILLISECONDS) + .map(Worker::addOne) + .delay(100, MILLISECONDS) + .map(Worker::addOne)), + Arguments.of( + "basic flowable", + new Object[] {6, 7}, + 2, + (Supplier) + () -> Flowable.fromIterable(Arrays.asList(5, 6)).map(Worker::addOne)), + Arguments.of( + "two operations flowable", + new Object[] {8, 9}, + 4, + (Supplier) + () -> + Flowable.fromIterable(Arrays.asList(6, 7)) + .map(Worker::addOne) + .map(Worker::addOne)), + Arguments.of( + "delayed flowable", + new Object[] {8, 9}, + 2, + (Supplier) + () -> + Flowable.fromIterable(Arrays.asList(7, 8)) + .delay(100, MILLISECONDS) + .map(Worker::addOne)), + Arguments.of( + "delayed twice flowable", + new Object[] {10, 11}, + 4, + (Supplier) + () -> + Flowable.fromIterable(Arrays.asList(8, 9)) + .delay(100, MILLISECONDS) + .map(Worker::addOne) + .delay(100, MILLISECONDS) + .map(Worker::addOne)), + Arguments.of( + "maybe from callable", + new Object[] {12}, + 2, + (Supplier) + () -> Maybe.fromCallable(() -> Worker.addOne(10)).map(Worker::addOne))); + } + + @ParameterizedTest(name = "Publisher ''{0}'' test") + @MethodSource("publisherSuccessArgs") + void publisherSuccess(String name, Object[] expected, int workSpans, Supplier supplier) { + Object result = Worker.assemblePublisherUnderTrace(supplier); + + if (expected.length == 1) { + assertEquals(expected[0], result); + } else { + assertArrayEquals(expected, (Object[]) result); + } + + SpanMatcher[] matchers = new SpanMatcher[workSpans + 2]; + matchers[0] = + span() + .root() + .operationName("trace-parent") + .resourceName("trace-parent") + .tags(componentTrace(), defaultTags()); + matchers[1] = + span() + .id(Worker.publisherParentId) + .childOf(Worker.traceParentId) + .operationName("publisher-parent") + .resourceName("publisher-parent") + .tags(defaultTags()); + for (int i = 0; i < workSpans; i++) { + matchers[2 + i] = + span() + .childOf(Worker.publisherParentId) + .operationName("addOne") + .resourceName("addOne") + .tags(componentTrace(), defaultTags()); + } + + assertTraces(trace(SORT_BY_START_TIME, matchers)); + } + + // --- Publisher error ----------------------------------------------------- + + static List publisherErrorArgs() { + return Arrays.asList( + Arguments.of( + "maybe", (Supplier) () -> Maybe.error(new RuntimeException(EXCEPTION_MESSAGE))), + Arguments.of( + "flowable", + (Supplier) () -> Flowable.error(new RuntimeException(EXCEPTION_MESSAGE)))); + } + + @ParameterizedTest(name = "Publisher error ''{0}'' test") + @MethodSource("publisherErrorArgs") + void publisherError(String name, Supplier supplier) { + RuntimeException exception = + assertThrows(RuntimeException.class, () -> Worker.assemblePublisherUnderTrace(supplier)); + assertEquals(EXCEPTION_MESSAGE, exception.getMessage()); + + assertTraces( + trace( + SORT_BY_START_TIME, + span() + .root() + .operationName("trace-parent") + .resourceName("trace-parent") + .error() + .tags( + componentTrace(), + error(RuntimeException.class, EXCEPTION_MESSAGE), + defaultTags()), + // It's important that we don't attach errors at the reactive level so that we don't + // impact the spans on reactive integrations such as netty and lettuce. + span() + .id(Worker.publisherParentId) + .childOf(Worker.traceParentId) + .operationName("publisher-parent") + .resourceName("publisher-parent") + .tags(defaultTags()))); + } + + // --- Publisher step error ------------------------------------------------ + + static List publisherStepErrorArgs() { + return Arrays.asList( + Arguments.of( + "basic maybe failure", + 1, + (Supplier) + () -> Maybe.just(1).map(Worker::addOne).map(i -> Worker.throwException())), + Arguments.of( + "basic flowable failure", + 1, + (Supplier) + () -> + Flowable.fromIterable(Arrays.asList(5, 6)) + .map(Worker::addOne) + .map(i -> Worker.throwException()))); + } + + @ParameterizedTest(name = "Publisher step ''{0}'' test") + @MethodSource("publisherStepErrorArgs") + void publisherStepError(String name, int workSpans, Supplier supplier) { + RuntimeException exception = + assertThrows(RuntimeException.class, () -> Worker.assemblePublisherUnderTrace(supplier)); + assertEquals(EXCEPTION_MESSAGE, exception.getMessage()); + + SpanMatcher[] matchers = new SpanMatcher[workSpans + 2]; + matchers[0] = + span() + .root() + .operationName("trace-parent") + .resourceName("trace-parent") + .error() + .tags( + componentTrace(), error(RuntimeException.class, EXCEPTION_MESSAGE), defaultTags()); + matchers[1] = + span() + .id(Worker.publisherParentId) + .childOf(Worker.traceParentId) + .operationName("publisher-parent") + .resourceName("publisher-parent") + .tags(defaultTags()); + for (int i = 0; i < workSpans; i++) { + matchers[2 + i] = + span() + .childOf(Worker.publisherParentId) + .operationName("addOne") + .resourceName("addOne") + .tags(componentTrace(), defaultTags()); + } + + assertTraces(trace(SORT_BY_START_TIME, matchers)); + } + + // --- Cancel -------------------------------------------------------------- + + static List cancelArgs() { + return Arrays.asList( + Arguments.of("basic maybe", (Supplier) () -> Maybe.just(1)), + Arguments.of( + "basic flowable", (Supplier) () -> Flowable.fromIterable(Arrays.asList(5, 6))), + Arguments.of("basic single", (Supplier) () -> Single.just(1)), + Arguments.of( + "basic observable", + (Supplier) () -> Observable.fromIterable(Arrays.asList(5, 6))), + Arguments.of("basic completable", (Supplier) Completable::complete)); + } + + @ParameterizedTest(name = "Publisher ''{0}'' cancel") + @MethodSource("cancelArgs") + void cancel(String name, Supplier supplier) { + Worker.cancelUnderTrace(supplier); + + assertTraces( + trace( + SORT_BY_START_TIME, + span() + .root() + .operationName("trace-parent") + .resourceName("trace-parent") + .tags(componentTrace(), defaultTags()), + span() + .id(Worker.publisherParentId) + .childOf(Worker.traceParentId) + .operationName("publisher-parent") + .resourceName("publisher-parent") + .tags(defaultTags()))); + } + + // --- Chain spans correct parent ------------------------------------------ + + static List chainParentArgs() { + return Arrays.asList( + Arguments.of( + "basic maybe", + 3, + (Supplier) + () -> + Maybe.just(1) + .map(Worker::addOne) + .map(Worker::addOne) + .concatWith(Maybe.just(1).map(Worker::addOne))), + Arguments.of( + "basic flowable", + 5, + (Supplier) + () -> + Flowable.fromIterable(Arrays.asList(5, 6)) + .map(Worker::addOne) + .map(Worker::addOne) + .concatWith(Maybe.just(1).map(Worker::addOne).toFlowable()))); + } + + @ParameterizedTest(name = "Publisher chain spans have the correct parent for ''{0}''") + @MethodSource("chainParentArgs") + void chainParent(String name, int workSpans, Supplier supplier) { + Worker.assemblePublisherUnderTrace(supplier); + + SpanMatcher[] matchers = new SpanMatcher[workSpans + 2]; + matchers[0] = + span() + .root() + .operationName("trace-parent") + .resourceName("trace-parent") + .tags(componentTrace(), defaultTags()); + matchers[1] = + span() + .id(Worker.publisherParentId) + .childOf(Worker.traceParentId) + .operationName("publisher-parent") + .resourceName("publisher-parent") + .tags(defaultTags()); + for (int i = 0; i < workSpans; i++) { + matchers[2 + i] = + span() + .childOf(Worker.publisherParentId) + .operationName("addOne") + .resourceName("addOne") + .tags(componentTrace(), defaultTags()); + } + + assertTraces(trace(SORT_BY_START_TIME, matchers)); + } + + // --- Correct parents from subscription time (blockingGet) ---------------- + + @Test + void correctParentsFromSubscriptionTimeBlockingGet() { + Maybe maybe = Maybe.just(42).map(Worker::addOne).map(Worker::addTwo); + + Worker.runUnderTraceParent( + () -> { + maybe.blockingGet(); + return null; + }); + + assertTraces( + trace( + SORT_BY_START_TIME, + span().root().operationName("trace-parent").resourceName("trace-parent"), + span() + .childOf(Worker.traceParentId) + .operationName("addOne") + .tags(componentTrace(), defaultTags()), + span() + .childOf(Worker.traceParentId) + .operationName("addTwo") + .tags(componentTrace(), defaultTags()))); + } + + // --- Correct parents from subscription time (intermediate span) ---------- + + static List subscriptionTimeIntermediateArgs() { + return Arrays.asList( + Arguments.of("basic maybe", 1, (Supplier) () -> Maybe.just(1).map(Worker::addOne)), + Arguments.of( + "basic flowable", + 2, + (Supplier) + () -> Flowable.fromIterable(Arrays.asList(1, 2)).map(Worker::addOne))); + } + + @ParameterizedTest( + name = "Publisher chain spans have the correct parents from subscription time ''{0}''") + @MethodSource("subscriptionTimeIntermediateArgs") + @SuppressWarnings("unchecked") + void correctParentsFromSubscriptionTime(String name, int workItems, Supplier supplier) { + Worker.assemblePublisherUnderTrace( + () -> { + // The "add one" operations are assembled under publisher-parent and stay its children. + // The "add two" operations are assembled under intermediate, but intermediate is finished + // before subscription, so re-activating its context at delivery time is a no-op and + // addTwo falls back to the still-active publisher-parent as well. + Object publisher = supplier.get(); + + AgentSpan intermediate = startSpan("test", "intermediate"); + Worker.intermediateId = intermediate.getSpanId(); + AgentScope scope = activateSpan(intermediate); + try { + if (publisher instanceof Maybe) { + return ((Maybe) publisher).map(Worker::addTwo); + } else if (publisher instanceof Flowable) { + return ((Flowable) publisher).map(Worker::addTwo); + } + throw new IllegalStateException("Unknown publisher type"); + } finally { + intermediate.finish(); + scope.close(); + } + }); + + SpanMatcher[] matchers = new SpanMatcher[3 + 2 * workItems]; + matchers[0] = + span() + .root() + .operationName("trace-parent") + .resourceName("trace-parent") + .tags(componentTrace(), defaultTags()); + matchers[1] = + span() + .id(Worker.publisherParentId) + .childOf(Worker.traceParentId) + .operationName("publisher-parent") + .resourceName("publisher-parent") + .tags(defaultTags()); + matchers[2] = + span() + .id(Worker.intermediateId) + .childOf(Worker.publisherParentId) + .operationName("intermediate") + .resourceName("intermediate") + .tags(defaultTags()); + for (int i = 0; i < 2 * workItems; i += 2) { + matchers[3 + i] = + span() + .childOf(Worker.publisherParentId) + .operationName("addOne") + .tags(componentTrace(), defaultTags()); + matchers[4 + i] = + span() + .childOf(Worker.publisherParentId) + .operationName("addTwo") + .tags(componentTrace(), defaultTags()); + } + + assertTraces(trace(SORT_BY_START_TIME, matchers)); + } + + // --- Schedulers ---------------------------------------------------------- + + static List schedulerArgs() { + return Arrays.asList( + Arguments.of("new-thread", Schedulers.newThread()), + Arguments.of("computation", Schedulers.computation()), + Arguments.of("single", Schedulers.single()), + Arguments.of("trampoline", Schedulers.trampoline())); + } + + @ParameterizedTest(name = "Flowables produce the right number of results on ''{0}'' scheduler") + @MethodSource("schedulerArgs") + void schedulers(String schedulerName, Scheduler scheduler) { + List values = + Flowable.fromIterable(Arrays.asList(1, 2, 3, 4)) + .parallel() + .runOn(scheduler) + .flatMap( + num -> + Maybe.just(num.toString() + " on " + Thread.currentThread().getName()) + .toFlowable()) + .sequential() + .toList() + .blockingGet(); + + assertEquals(4, values.size()); + + // No trace-parent span is active while the chain is assembled, so the instrumentation must be + // non-intrusive: parallel scheduler hops must not synthesize any trace. Flushing makes sure + // any span that the instrumentation might have wrongly created on the scheduler threads is + // reported before we assert the writer is empty. + tracer.flush(); + assertEquals( + 0, + writer.getTraceCount(), + () -> "Unexpected traces emitted without active trace: " + writer); + } + + @ParameterizedTest(name = "Flowable propagates context on ''{0}'' scheduler") + @MethodSource("schedulerArgs") + void flowableParallelContextPropagation(String schedulerName, Scheduler scheduler) { + Worker.assemblePublisherUnderTrace( + () -> + Flowable.fromIterable(Arrays.asList(1, 2, 3, 4)) + .parallel() + .runOn(scheduler) + .flatMap(num -> Maybe.just(num).map(Worker::addOne).toFlowable()) + .sequential()); + + SpanMatcher[] matchers = new SpanMatcher[6]; + matchers[0] = + span() + .root() + .operationName("trace-parent") + .resourceName("trace-parent") + .tags(componentTrace(), defaultTags()); + matchers[1] = + span() + .id(Worker.publisherParentId) + .childOf(Worker.traceParentId) + .operationName("publisher-parent") + .resourceName("publisher-parent") + .tags(defaultTags()); + for (int i = 0; i < 4; i++) { + matchers[2 + i] = + span() + .childOf(Worker.publisherParentId) + .operationName("addOne") + .resourceName("addOne") + .tags(componentTrace(), defaultTags()); + } + + assertTraces(trace(SORT_BY_START_TIME, matchers)); + } + + // --- No spurious traces outside active trace -------------------------------- + + // Verifies that CaptureParentSpanAdvice and PropagateParentSpanAdvice are no-ops when there is + // no active trace: the instrumentation must not synthesize any spans of its own. + static List noSpuriousTracesArgs() { + return Arrays.asList( + Arguments.of( + "observable", + (Supplier) + () -> + Observable.fromIterable(Arrays.asList(1, 2, 3, 4)) + .map(i -> i + 1) + .toList() + .blockingGet()), + Arguments.of( + "single", (Supplier) () -> Single.just(1).map(i -> i + 1).blockingGet())); + } + + @ParameterizedTest(name = "No spurious traces for ''{0}'' assembled outside active trace") + @MethodSource("noSpuriousTracesArgs") + void noSpuriousTracesWhenAssembledOutsideTrace(String name, Supplier supplier) { + supplier.get(); + tracer.flush(); + assertEquals( + 0, + writer.getTraceCount(), + () -> "Unexpected traces emitted without active trace: " + writer); + } +} diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/SubscriptionTest.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/SubscriptionTest.java new file mode 100644 index 00000000000..d2f76d17a9b --- /dev/null +++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/SubscriptionTest.java @@ -0,0 +1,162 @@ +package testdog.trace.instrumentation.rxjava3; + +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.startSpan; + +import datadog.trace.agent.test.AbstractInstrumentationTest; +import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.trace.bootstrap.instrumentation.api.AgentSpan; +import io.reactivex.rxjava3.core.BackpressureStrategy; +import io.reactivex.rxjava3.core.Completable; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.core.Maybe; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.core.Single; +import java.util.Random; +import java.util.concurrent.CountDownLatch; +import org.junit.jupiter.api.Test; + +class SubscriptionTest extends AbstractInstrumentationTest { + + @Test + void maybeSubscriptionPropagatesParentSpan() throws InterruptedException { + CountDownLatch latch = new CountDownLatch(1); + + AgentSpan parent = startSpan("test", "parent"); + try (AgentScope scope = activateSpan(parent)) { + Maybe connection = Maybe.create(emitter -> emitter.onSuccess(new Connection())); + connection.subscribe( + c -> { + c.query(); + latch.countDown(); + }); + } finally { + parent.finish(); + } + latch.await(); + + assertTraces( + trace( + SORT_BY_START_TIME, + span().root().operationName("parent"), + span().childOfPrevious().operationName("Connection.query"))); + } + + @Test + void singleSubscriptionPropagatesParentSpan() throws InterruptedException { + CountDownLatch latch = new CountDownLatch(1); + + AgentSpan parent = startSpan("test", "parent"); + try (AgentScope scope = activateSpan(parent)) { + Single connection = Single.create(emitter -> emitter.onSuccess(new Connection())); + connection.subscribe( + c -> { + c.query(); + latch.countDown(); + }); + } finally { + parent.finish(); + } + latch.await(); + + assertTraces( + trace( + SORT_BY_START_TIME, + span().root().operationName("parent"), + span().childOfPrevious().operationName("Connection.query"))); + } + + @Test + void completableSubscriptionPropagatesParentSpan() throws InterruptedException { + CountDownLatch latch = new CountDownLatch(1); + + AgentSpan parent = startSpan("test", "parent"); + try (AgentScope scope = activateSpan(parent)) { + Completable action = Completable.create(emitter -> emitter.onComplete()); + action.subscribe( + () -> { + new Connection().query(); + latch.countDown(); + }); + } finally { + parent.finish(); + } + latch.await(); + + assertTraces( + trace( + SORT_BY_START_TIME, + span().root().operationName("parent"), + span().childOfPrevious().operationName("Connection.query"))); + } + + @Test + void observableSubscriptionPropagatesParentSpan() throws InterruptedException { + CountDownLatch latch = new CountDownLatch(1); + + AgentSpan parent = startSpan("test", "parent"); + try (AgentScope scope = activateSpan(parent)) { + Observable connection = + Observable.create( + emitter -> { + emitter.onNext(new Connection()); + emitter.onComplete(); + }); + connection.subscribe( + c -> { + c.query(); + latch.countDown(); + }); + } finally { + parent.finish(); + } + latch.await(); + + assertTraces( + trace( + SORT_BY_START_TIME, + span().root().operationName("parent"), + span().childOfPrevious().operationName("Connection.query"))); + } + + @Test + void flowableSubscriptionPropagatesParentSpan() throws InterruptedException { + CountDownLatch latch = new CountDownLatch(1); + + AgentSpan parent = startSpan("test", "parent"); + try (AgentScope scope = activateSpan(parent)) { + Flowable connection = + Flowable.create( + emitter -> { + emitter.onNext(new Connection()); + emitter.onComplete(); + }, + BackpressureStrategy.BUFFER); + connection.subscribe( + c -> { + c.query(); + latch.countDown(); + }); + } finally { + parent.finish(); + } + latch.await(); + + assertTraces( + trace( + SORT_BY_START_TIME, + span().root().operationName("parent"), + span().childOfPrevious().operationName("Connection.query"))); + } + + static class Connection { + int query() { + AgentSpan span = startSpan("test", "Connection.query"); + span.finish(); + return new Random().nextInt(); + } + } +} diff --git a/metadata/supported-configurations.json b/metadata/supported-configurations.json index 60dae10c020..2ac540f99fb 100644 --- a/metadata/supported-configurations.json +++ b/metadata/supported-configurations.json @@ -9601,6 +9601,14 @@ "aliases": ["DD_TRACE_INTEGRATION_RXJAVA_ENABLED", "DD_INTEGRATION_RXJAVA_ENABLED"] } ], + "DD_TRACE_RXJAVA_3_ENABLED": [ + { + "version": "A", + "type": "boolean", + "default": "true", + "aliases": ["DD_TRACE_INTEGRATION_RXJAVA_3_ENABLED", "DD_INTEGRATION_RXJAVA_3_ENABLED"] + } + ], "DD_TRACE_S3_ENABLED": [ { "version": "A", diff --git a/settings.gradle.kts b/settings.gradle.kts index 53fe2bff423..36b1d9b95df 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -559,6 +559,7 @@ include( ":dd-java-agent:instrumentation:rs:jax-rs:jax-rs-client:jax-rs-client-2.0", ":dd-java-agent:instrumentation:rxjava:rxjava-1.0", ":dd-java-agent:instrumentation:rxjava:rxjava-2.0", + ":dd-java-agent:instrumentation:rxjava:rxjava-3.0", ":dd-java-agent:instrumentation:scala:scala-concurrent-2.8", ":dd-java-agent:instrumentation:scala:scala-promise:scala-promise-2.10", ":dd-java-agent:instrumentation:scala:scala-promise:scala-promise-2.13", From 2068d0db88b1f869bf449abc596e65bee34b4d15 Mon Sep 17 00:00:00 2001 From: Brice Dutheil Date: Fri, 3 Jul 2026 19:32:54 +0200 Subject: [PATCH 132/139] Prevent duplicate class inclusion in runtime artifacts (#11853) fix(build): Stop publishing extra source-set output twice The `TracerJavaExtension.addSourceSetFor` added the extra source-set output to the `implementation` configuration. A project dependency on the runtime classpath resolves the producer's `runtimeElements` variant. That variant publishes the project jar and runtime dependencies derived from `implementation`, so consumers (the instrumentation project in particular) received the same classes twice: 1. once from the jar configured with `jar.from(mainForJavaVersionSourceSet.output)`, 2. once from the raw class directory published as a dependency This change keeps the additional source set local to the producer module's _compile_ and _test_ classpaths respectively with `compileOnly` and `testImplementation`. The jar remains the runtime artifact consumed by downstream aggregating projects, and it still contains the additional source-set classes. What was considered: dropping the `jar.from(output)` config, it would remove the duplicate, but it would make the consumed module jar incomplete and leave consuming projects relying on class directories instead of the artifact. This would also a the side effect of making Gradle to track individual classes for up-to-date tracking, which consumes more memory. This keeps the existing "jar contract" and only prevent publishing the additional source-set output through `runtimeElements`. This removes the exception-profiling and instrumentation duplicate exclusions that were needed in the instrumentation `shadowJar`. fix(build): Stop publishing agent-installer source-set output twice The `agent-installer` project added its Java-version-specific source-set outputs to the `runtimeOnly` configuration. A project dependency on the runtime classpath resolves the producer's `runtimeElements` variant. That variant publishes the project jar and runtime dependencies derived from `runtimeOnly`, so consumers (the instrumentation project in particular) received the same classes twice: 1. once from the jar configured with `from sourceSets.main_java11.output` and `from sourceSets.main_java25.output`, 2. once from the raw class directories published as runtime dependencies This change keeps the Java-version-specific source sets local to the producer module's test classpath with `testImplementation`. The jar remains the runtime artifact consumed by downstream aggregating projects, and it still contains the Java 11 and Java 25 source-set classes. Dropping the jar configuration would remove the duplicate, but it would make the consumed `agent-installer` jar incomplete and leave consuming projects relying on class directories instead of the artifact. This keeps the existing "jar contract" and only prevents publishing the Java-version-specific source-set output through `runtimeElements`. This removes the agent-installer duplicate exclusions that were needed in the instrumentation `shadowJar`. fix(build): Keep servlet5 relocated jar off `runtimeElements` The `jakarta-servlet-5.0` project added the relocated javax-to-jakarta advice jar to the `implementation` configuration. And a project dependency on the runtime classpath resolves the producer's `runtimeElements` variant. That variant publishes the project jar and its runtime dependencies that are derived from `implementation`, so consumers (the instrumentation project in particular) received the same classes twice: 1. once from the module jar configured with `from zipTree(relocatedJavaxJar.outputs.files.asPath)`, 2. once from the relocated jar published as a runtime dependency This change keeps the relocated jar local to the producer module's _compile_ and _test_ classpaths with `compileOnly` and `testImplementation` respectively. The module jar remains the runtime artifact consumed by downstream projects, and it still contains the relocated servlet5 advice classes. With this, the last duplicate is gone, so drop the remaining `filesMatching { EXCLUDE }` workaround and refresh the comment. chore(build): Use lazy API on jakarta-servlet-5.0 shadow jar task fix(build): Muzzle supports projects having jars outside runtimeClasspath Teach `MuzzleTask` to include an extra classpath (if provided). The goal is to allow it to see the relocated servlet5 jar. It is done by introducing `extraAgentClasspath` on the `MuzzelTask`. Another approach would have been to include the relcated jar on the runtimeClasspath: `sourceSets.main.runtimeClasspath += files(relocatedJavaxJarFile)` However this approach creates confusion ; anything that consume this configuration would see the relocated jar (e.g. during debug). Co-authored-by: brice.dutheil --- .../gradle/plugin/muzzle/tasks/MuzzleTask.kt | 7 ++++- dd-java-agent/agent-installer/build.gradle | 18 +++++++++-- dd-java-agent/instrumentation/build.gradle | 30 +++++-------------- .../servlet/jakarta-servlet-5.0/build.gradle | 29 ++++++++++++++++-- gradle/java_no_deps.gradle | 26 ++++++++++++++-- 5 files changed, 78 insertions(+), 32 deletions(-) diff --git a/buildSrc/src/main/kotlin/datadog/gradle/plugin/muzzle/tasks/MuzzleTask.kt b/buildSrc/src/main/kotlin/datadog/gradle/plugin/muzzle/tasks/MuzzleTask.kt index 76917c6a6c7..b338e096456 100644 --- a/buildSrc/src/main/kotlin/datadog/gradle/plugin/muzzle/tasks/MuzzleTask.kt +++ b/buildSrc/src/main/kotlin/datadog/gradle/plugin/muzzle/tasks/MuzzleTask.kt @@ -7,6 +7,7 @@ import datadog.gradle.plugin.muzzle.MuzzleExtension import datadog.gradle.plugin.muzzle.allMainSourceSet import org.gradle.api.Project import org.gradle.api.artifacts.Configuration +import org.gradle.api.file.ConfigurableFileCollection import org.gradle.api.file.FileCollection import org.gradle.api.file.RegularFileProperty import org.gradle.api.invocation.BuildInvocationDetails @@ -59,6 +60,10 @@ abstract class MuzzleTask @Inject constructor( @get:Classpath protected val agentClassPath = providers.provider { createAgentClassPath(project) } + @get:InputFiles + @get:Classpath + abstract val extraAgentClasspath: ConfigurableFileCollection + @get:InputFiles @get:Classpath protected val muzzleClassPath = providers.provider { createMuzzleClassPath(project, name) } @@ -119,7 +124,7 @@ abstract class MuzzleTask @Inject constructor( buildStartedTime.set(invocationDetails.buildStartedTime) bootstrapClassPath.setFrom(muzzleBootstrap) toolingClassPath.setFrom(muzzleTooling) - instrumentationClassPath.setFrom(agentClassPath.get()) + instrumentationClassPath.setFrom(agentClassPath.get(), extraAgentClasspath) testApplicationClassPath.setFrom(muzzleClassPath.get()) if (muzzleDirective != null) { assertPass.set(muzzleDirective.assertPass) diff --git a/dd-java-agent/agent-installer/build.gradle b/dd-java-agent/agent-installer/build.gradle index b8c8aac5460..766e55af799 100644 --- a/dd-java-agent/agent-installer/build.gradle +++ b/dd-java-agent/agent-installer/build.gradle @@ -42,12 +42,26 @@ tasks.named("compileMain_java25Java", JavaCompile) { } dependencies { + // Wire the Java-version-specific source sets into this project without publishing + // their raw output: + // + // - each additional source set compiles against the main output and only the + // dependencies it needs + // - their compiled outputs stay visible to tests through `testImplementation` + // - their compiled outputs are folded into this project's jar by the jar task below + // + // Main code loads these classes reflectively at agent runtime, so downstream + // consumers should get them from the agent-installer jar. Do not add these + // outputs to `runtimeOnly`: `runtimeElements` publishes both the jar artifact + // and runtime dependencies. Publishing the raw outputs there would expose the + // same classes twice, once from the jar and once from the class directories. main_java11CompileOnly project(':dd-java-agent:agent-tooling') main_java11CompileOnly sourceSets.main.output + testImplementation sourceSets.main_java11.output + main_java25CompileOnly project(':dd-trace-core') main_java25CompileOnly sourceSets.main.output - runtimeOnly sourceSets.main_java11.output - runtimeOnly sourceSets.main_java25.output + testImplementation sourceSets.main_java25.output } tasks.named("jar", Jar) { diff --git a/dd-java-agent/instrumentation/build.gradle b/dd-java-agent/instrumentation/build.gradle index 8077740656f..a3e8ddc83c4 100644 --- a/dd-java-agent/instrumentation/build.gradle +++ b/dd-java-agent/instrumentation/build.gradle @@ -119,31 +119,15 @@ if (project.gradle.startParameter.taskNames.any { it.endsWith("generateMuzzleRep } tasks.named('shadowJar', ShadowJar) { - duplicatesStrategy = DuplicatesStrategy.FAIL - // Shadow 8.x silently wrote duplicate class (130+) entries into the instrumentation jar. - // Those duplicate entries did not survive as duplicates in the final agent jar, - // because `:dd-java-agent:expandAgentShadowJarInst` expands the instrumentation jar - // with a `Sync` task, and the specific `inst` expansion keeps the first duplicate path. - // (explicit `duplicatesStrategy = DuplicatesStrategy.EXCLUDE` on the `inst` prefix). + // Keep duplicate detection enabled on the aggregate instrumentation jar. // - // Shadow 9 refactored deeply it's "copy" pipeline via https://github.com/GradleUp/shadow/pull/1233 - // by `Project.zipTree` and can now honor `DuplicatesStrategy`, see in particular - // * https://github.com/GradleUp/shadow/issues/1223 - Duplicates from jars are not handled per duplicatesStrategy - // * https://github.com/GradleUp/shadow/issues/488 - DuplicatesStrategy.FAIL doesn't work with transform + // The previous source-set fixes and the servlet5 relocated-jar fix keep extra classes in + // producer jars without also publishing their raw output through `runtimeElements`. The old + // per-path `EXCLUDE` workaround is no longer needed. // - // Keeping `duplicatesStrategy = FAIL` only, Shadow 9 now fails while creating the instrumentation jar. - filesMatching([ - // agent-installer also publishes this Java 11 source-set output at runtime. - 'datadog/trace/agent/tooling/bytebuddy/DDJava9ClassFileTransformer*.class', - // agent-installer also publishes this Java 25 source-set output at runtime. - 'datadog/trace/agent/tooling/servicediscovery/MemFDUnixWriterFFM*.class', - // aggregate instrumentation includes some classes directly and via jars. - 'datadog/trace/instrumentation/**/*.class', - // same aggregate duplication, for Java 11 exception profiling advice. - 'datadog/exceptions/instrumentation/**/*.class', - ]) { - duplicatesStrategy = DuplicatesStrategy.EXCLUDE - } + // Shadow 9 honors `DuplicatesStrategy.FAIL` for these inputs. If a producer publishes the same + // classes from both its jar and a runtime file or directory, this task should fail again. + duplicatesStrategy = DuplicatesStrategy.FAIL dependencies { // the tracer is now in a separate shadow jar exclude(project(":dd-trace-core")) diff --git a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/build.gradle b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/build.gradle index 07a424a3113..c664a055f14 100644 --- a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/build.gradle +++ b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/build.gradle @@ -1,4 +1,5 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar +import datadog.gradle.plugin.muzzle.tasks.MuzzleTask plugins { id 'java-test-fixtures' @@ -30,7 +31,7 @@ configurations { javaxClassesToRelocate } -tasks.register('relocatedJavaxJar', ShadowJar) { +def relocatedJavaxJar = tasks.register('relocatedJavaxJar', ShadowJar) { relocate 'javax.servlet', 'jakarta.servlet' relocate 'datadog.trace.instrumentation.servlet3', 'datadog.trace.instrumentation.servlet5' relocate 'datadog.trace.instrumentation.servlet', 'datadog.trace.instrumentation.servlet5' @@ -49,9 +50,24 @@ tasks.register('relocatedJavaxJar', ShadowJar) { includeEmptyDirs = false } +def relocatedJavaxJarFile = relocatedJavaxJar.flatMap { it.archiveFile } dependencies { - implementation files(relocatedJavaxJar.outputs.files) + // Wire the relocated javax->jakarta advice into this project without publishing + // the relocated jar as runtime output: + // + // - keep the relocated jar visible to main compilation through `compileOnly` + // - keep the relocated jar visible to tests through `testImplementation` + // - include the relocated classes into this project's jar (jar task config) + // + // NOTE: + // Do not add the relocated jar to `implementation`: `runtimeElements` publishes + // both the jar artifact and runtime dependencies derived from `implementation`. + // Publishing the relocated jar there would expose the same servlet5 advice classes + // twice to downstream projects, once from the module jar and once from the + // relocated jar. + compileOnly files(relocatedJavaxJarFile) + testImplementation files(relocatedJavaxJarFile) compileOnly group: 'jakarta.servlet', name: 'jakarta.servlet-api', version: '5.0.0' testImplementation group: 'jakarta.servlet', name: 'jakarta.servlet-api', version: '5.0.0' testImplementation group: 'jakarta.servlet.jsp', name: 'jakarta.servlet.jsp-api', version: '3.0.0' @@ -76,5 +92,12 @@ dependencies { } tasks.named("jar", Jar) { - from zipTree(relocatedJavaxJar.outputs.files.asPath) + from zipTree(relocatedJavaxJarFile) +} + +// Make the relocated jar visible to muzzle through `extraAgentClasspath`. +// Muzzle uses the runtime classpath of a project, and this jar is produced +// outside of it. +tasks.withType(MuzzleTask).configureEach { + extraAgentClasspath.from(relocatedJavaxJarFile) } diff --git a/gradle/java_no_deps.gradle b/gradle/java_no_deps.gradle index 0d8b5706b11..c61623c39f5 100644 --- a/gradle/java_no_deps.gradle +++ b/gradle/java_no_deps.gradle @@ -105,13 +105,33 @@ class TracerJavaExtension { } } - // "socket-utils" is only set to compileOnly because the implementation dependency incorrectly adds Java17 classes to all jar prefixes. - // This causes the AgentJarIndex to search for other non-Java17 classes in the wrong prefix location and fail to resolve class names. if (sourceSetConfig.compileOnly.orElse(false).get()) { + // The ":utils:socket-utils" is only set to `compileOnly` because the `implementation` dependency + // adds Java17 classes to all jar prefixes, which is incorrect for this project. + // This causes the AgentJarIndex to search for other non-Java17 classes in the wrong prefix + // location and to fail to resolve class names. project.dependencies.add("compileOnly", mainForJavaVersionSourceSet.output) } else { + // Wire this additional source-set into this project without publishing its raw output + // (handled by the jar configuration). The following + // + // * make this additional source-set's _compile classpath_ visible to **main compilation** through `compileOnly` + // * make this additional source-set's _compiled output_ visible to **main compilation** through `compileOnly` + // * make this additional source-set's _compiled output_ visible to tests through `testImplementation` + // + // The jar task produces the artifact that consumer wants to see, and it is configured + // below to add classes of this additional source-set. + // + // NOTE: + // We don't want to add this source-set's output to the `implementation` configuration! + // Otherwise this additional source-set output directory (where classes are) would end up + // being published as a runtime dependency through `runtimeElements`. + // The `runtimeElements` configuration publishes the jar artifact by default ; thus + // `runtimeElements` would have both the jar, and the added output folder. + // In short this makes classes of this extra source-set in both the jar and the directory. project.dependencies.add("compileOnly", project.files(mainForJavaVersionSourceSet.compileClasspath)) - project.dependencies.add("implementation", mainForJavaVersionSourceSet.output) + project.dependencies.add("compileOnly", mainForJavaVersionSourceSet.output) + project.dependencies.add("testImplementation", mainForJavaVersionSourceSet.output) } project.tasks.named("jar", Jar) { From 936282c1b1a1b0574d725033cd5be61ebf9c89ed Mon Sep 17 00:00:00 2001 From: Leo Romanovsky Date: Mon, 6 Jul 2026 02:02:42 -0400 Subject: [PATCH 133/139] Use canonical FFE fixtures (#11355) Use canonical FFE fixtures Catch up FFE missing flag behavior Align Java smoke fixtures with canonical schema Use canonical fixtures in Java evaluator tests Update FFE fixture submodule Fix OpenFeature smoke CodeNarc Merge branch 'master' into leo.romanovsky/ffe-canonical-fixtures-20260512 Merge branch 'master' into leo.romanovsky/ffe-canonical-fixtures-20260512 Expand OpenFeature smoke exposure coverage Restore missing flag error reporting Apply OpenFeature smoke test formatting Document OpenFeature fixture submodule Merge branch 'master' into leo.romanovsky/ffe-canonical-fixtures-20260512 Merge remote-tracking branch 'origin/master' into leo.romanovsky/ffe-canonical-fixtures-20260512 # Conflicts: # products/feature-flagging/feature-flagging-api/src/test/java/datadog/trace/api/openfeature/DDEvaluatorTest.java Co-authored-by: devflow.devflow-routing-intake --- .github/dependabot.yml | 5 + .gitmodules | 3 + BUILDING.md | 3 +- .../OpenFeatureProviderSmokeTest.groovy | 97 +- .../src/test/resources/config/flags-v1.json | 2953 ----------------- .../test-case-boolean-one-of-matches.json | 240 -- .../test-case-comparator-operator-flag.json | 82 - .../data/test-case-disabled-flag.json | 40 - .../resources/data/test-case-empty-flag.json | 40 - .../test-case-flag-with-empty-string.json | 36 - .../data/test-case-integer-flag.json | 382 --- .../data/test-case-kill-switch-flag.json | 434 --- .../data/test-case-microsecond-date-flag.json | 54 - .../test-case-new-user-onboarding-flag.json | 420 --- .../data/test-case-no-allocations-flag.json | 52 - .../data/test-case-null-operator-flag.json | 94 - .../data/test-case-numeric-flag.json | 58 - .../data/test-case-numeric-one-of.json | 122 - .../data/test-case-race-conditions.json | 10 - .../resources/data/test-case-regex-flag.json | 65 - .../test-case-start-and-end-date-flag.json | 58 - .../data/test-flag-that-does-not-exist.json | 40 - .../resources/data/test-json-config-flag.json | 96 - .../data/test-no-allocations-flag.json | 52 - .../data/test-special-characters.json | 78 - .../test-string-with-special-characters.json | 1190 ------- .../src/test/resources/ffe-system-test-data | 1 + .../api/openfeature/DDEvaluatorTest.java | 1321 +------- .../trace/api/openfeature/util/TestCase.java | 114 - 29 files changed, 266 insertions(+), 7874 deletions(-) delete mode 100644 dd-smoke-tests/openfeature/src/test/resources/config/flags-v1.json delete mode 100644 dd-smoke-tests/openfeature/src/test/resources/data/test-case-boolean-one-of-matches.json delete mode 100644 dd-smoke-tests/openfeature/src/test/resources/data/test-case-comparator-operator-flag.json delete mode 100644 dd-smoke-tests/openfeature/src/test/resources/data/test-case-disabled-flag.json delete mode 100644 dd-smoke-tests/openfeature/src/test/resources/data/test-case-empty-flag.json delete mode 100644 dd-smoke-tests/openfeature/src/test/resources/data/test-case-flag-with-empty-string.json delete mode 100644 dd-smoke-tests/openfeature/src/test/resources/data/test-case-integer-flag.json delete mode 100644 dd-smoke-tests/openfeature/src/test/resources/data/test-case-kill-switch-flag.json delete mode 100644 dd-smoke-tests/openfeature/src/test/resources/data/test-case-microsecond-date-flag.json delete mode 100644 dd-smoke-tests/openfeature/src/test/resources/data/test-case-new-user-onboarding-flag.json delete mode 100644 dd-smoke-tests/openfeature/src/test/resources/data/test-case-no-allocations-flag.json delete mode 100644 dd-smoke-tests/openfeature/src/test/resources/data/test-case-null-operator-flag.json delete mode 100644 dd-smoke-tests/openfeature/src/test/resources/data/test-case-numeric-flag.json delete mode 100644 dd-smoke-tests/openfeature/src/test/resources/data/test-case-numeric-one-of.json delete mode 100644 dd-smoke-tests/openfeature/src/test/resources/data/test-case-race-conditions.json delete mode 100644 dd-smoke-tests/openfeature/src/test/resources/data/test-case-regex-flag.json delete mode 100644 dd-smoke-tests/openfeature/src/test/resources/data/test-case-start-and-end-date-flag.json delete mode 100644 dd-smoke-tests/openfeature/src/test/resources/data/test-flag-that-does-not-exist.json delete mode 100644 dd-smoke-tests/openfeature/src/test/resources/data/test-json-config-flag.json delete mode 100644 dd-smoke-tests/openfeature/src/test/resources/data/test-no-allocations-flag.json delete mode 100644 dd-smoke-tests/openfeature/src/test/resources/data/test-special-characters.json delete mode 100644 dd-smoke-tests/openfeature/src/test/resources/data/test-string-with-special-characters.json create mode 160000 dd-smoke-tests/openfeature/src/test/resources/ffe-system-test-data delete mode 100644 products/feature-flagging/feature-flagging-api/src/test/java/datadog/trace/api/openfeature/util/TestCase.java diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 143febaaeb0..1fe9f4cde20 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -36,3 +36,8 @@ updates: prefix: 'chore(build): ' cooldown: default-days: 2 + + - package-ecosystem: gitsubmodule + directory: / + schedule: + interval: weekly diff --git a/.gitmodules b/.gitmodules index 27fc232a993..18769cc41ae 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "dd-java-agent/agent-jmxfetch/integrations-core"] path = dd-java-agent/agent-jmxfetch/integrations-core url = https://github.com/DataDog/integrations-core.git +[submodule "dd-smoke-tests/openfeature/src/test/resources/ffe-system-test-data"] + path = dd-smoke-tests/openfeature/src/test/resources/ffe-system-test-data + url = https://github.com/DataDog/ffe-system-test-data.git diff --git a/BUILDING.md b/BUILDING.md index 5a557933b54..0ea6bfcec8a 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -179,7 +179,8 @@ winget install --id Docker.DockerDesktop > Without this configuration, you will need to remember to add `--recurse-submodules` to `git checkout` when switching to old branches. > [!TIP] -> This will keep the submodule in `dd-java-agent/agent-jmxfetch/integrations-core` up-to-date. +> This will keep the submodules in `dd-java-agent/agent-jmxfetch/integrations-core` and +> `dd-smoke-tests/openfeature/src/test/resources/ffe-system-test-data` up-to-date. > There is also an automated check when opening a pull request if you are trying to submit a module version change (usually an outdated version). > [!NOTE] diff --git a/dd-smoke-tests/openfeature/src/test/groovy/datadog/smoketest/springboot/OpenFeatureProviderSmokeTest.groovy b/dd-smoke-tests/openfeature/src/test/groovy/datadog/smoketest/springboot/OpenFeatureProviderSmokeTest.groovy index 545c711860c..cb4c641d667 100644 --- a/dd-smoke-tests/openfeature/src/test/groovy/datadog/smoketest/springboot/OpenFeatureProviderSmokeTest.groovy +++ b/dd-smoke-tests/openfeature/src/test/groovy/datadog/smoketest/springboot/OpenFeatureProviderSmokeTest.groovy @@ -21,9 +21,13 @@ import spock.util.concurrent.PollingConditions class OpenFeatureProviderSmokeTest extends AbstractServerSmokeTest { @Shared - private final rcPayload = new JsonSlurper().parse(fetchResource("config/flags-v1.json")).with { json -> - return JsonOutput.toJson(json.data.attributes) - } + private final rcConfig = new JsonSlurper().parse(fetchResource("ffe-system-test-data/ufc-config.json")) as Map + + @Shared + private final rcPayload = JsonOutput.toJson(rcConfig) + + @Shared + private final loggedAllocations = buildLoggedAllocations(rcConfig) @Override ProcessBuilder createProcessBuilder() { @@ -70,34 +74,40 @@ class OpenFeatureProviderSmokeTest extends AbstractServerSmokeTest { setup: setRemoteConfig("datadog/2/FFE_FLAGS/1/config", rcPayload) final url = "http://localhost:${httpPort}/openfeature/evaluate" - final testCases = parseTestCases().findAll { - it.result.flagMetadata?.doLog - } + final testCases = parseTestCases() + assert !testCases.isEmpty() when: - final responses = testCases.collect { + final results = testCases.collect { testCase -> final request = new Request.Builder() .url(url) .post(RequestBody.create(MediaType.parse('application/json'), JsonOutput.toJson(testCase))) .build() - client.newCall(request).execute() + final response = client.newCall(request).execute() + final responseBody = new JsonSlurper().parse(response.body().byteStream()) + return [testCase: testCase, response: response, body: responseBody] } + final expectedExposures = uniqueExpectedExposures(results) then: - responses.every { - it.code() == 200 + results.every { + it.response.code() == 200 } + !expectedExposures.isEmpty() new PollingConditions(timeout: 10).eventually { final requests = evpProxyMessages*.getV2() as List> final events = requests*.exposures.flatten() - assert events.size() == testCases.size() - testCases.each { - testCase -> + assert events.size() == expectedExposures.size() + expectedExposures.each { + expected -> assert events.find { event -> - event.flag.key == testCase.flag && event.subject.id == testCase.targetingKey - } != null : "Unable to find exposure with flag=${testCase.flag} and targetingKey=${testCase.targetingKey}" + event.flag.key == expected.flag && + event.allocation.key == expected.allocation && + event.variant.key == expected.variant && + event.subject.id == expected.targetingKey + } != null : "Unable to find exposure ${expected}" } } } @@ -119,8 +129,16 @@ class OpenFeatureProviderSmokeTest extends AbstractServerSmokeTest { response.code() == 200 final responseBody = new JsonSlurper().parse(response.body().byteStream()) responseBody.value == testCase.result.value - responseBody.variant == testCase.result.variant - responseBody.flagMetadata?.allocationKey == testCase.result.flagMetadata?.allocationKey + responseBody.reason == testCase.result.reason + if (testCase.result.containsKey('errorCode')) { + assert responseBody.errorCode == testCase.result.errorCode + } + if (testCase.result.containsKey('variant')) { + assert responseBody.variant == testCase.result.variant + } + if (testCase.result.flagMetadata?.allocationKey) { + assert responseBody.flagMetadata?.allocationKey == testCase.result.flagMetadata?.allocationKey + } where: testCase << parseTestCases() @@ -131,11 +149,12 @@ class OpenFeatureProviderSmokeTest extends AbstractServerSmokeTest { } private static List> parseTestCases() { - final folder = fetchResource('data') + final folder = fetchResource('ffe-system-test-data/evaluation-cases') final uri = folder.toURI() final testsPath = Paths.get(uri) final files = Files.list(testsPath) .filter(path -> path.toString().endsWith('.json')) + .sorted(Comparator.comparing(path -> path.fileName.toString())) final result = [] final slurper = new JsonSlurper() files.each { @@ -148,9 +167,51 @@ class OpenFeatureProviderSmokeTest extends AbstractServerSmokeTest { } result.addAll(testCases) } + assert !result.isEmpty() return result } + private List> uniqueExpectedExposures(final List> results) { + final expected = [] + final seen = [] as Set + results.each { result -> + final testCase = result.testCase as Map + final body = result.body as Map + final flag = testCase.flag as String + final allocation = body.flagMetadata?.allocationKey as String + final variant = body.variant as String + if (!variant || !allocation || !allocationLogs(flag, allocation)) { + return + } + + final exposure = [ + flag: flag, + allocation: allocation, + variant: variant, + targetingKey: testCase.targetingKey + ] + final key = "${exposure.flag}\u0000${exposure.targetingKey}\u0000${exposure.allocation}\u0000${exposure.variant}" + if (seen.add(key)) { + expected.add(exposure) + } + } + return expected + } + + private boolean allocationLogs(final String flag, final String allocation) { + return loggedAllocations["${flag}\u0000${allocation}"] == true + } + + private static Map buildLoggedAllocations(final Map config) { + final logged = [:] + (config.flags as Map).each { flag, definition -> + (definition.allocations ?: []).each { allocation -> + logged["${flag}\u0000${allocation.key}"] = allocation.doLog == true + } + } + return logged + } + private static Set decodeProducts(final Map request) { return request.client.products.collect { Product.valueOf(it) } } diff --git a/dd-smoke-tests/openfeature/src/test/resources/config/flags-v1.json b/dd-smoke-tests/openfeature/src/test/resources/config/flags-v1.json deleted file mode 100644 index 5b21a9f3661..00000000000 --- a/dd-smoke-tests/openfeature/src/test/resources/config/flags-v1.json +++ /dev/null @@ -1,2953 +0,0 @@ -{ - "data": { - "type": "universal-flag-configuration", - "id": "1", - "attributes": { - "createdAt": "2024-04-17T19:40:53.716Z", - "format": "SERVER", - "environment": { - "name": "Test" - }, - "flags": { - "empty_flag": { - "key": "empty_flag", - "enabled": true, - "variationType": "STRING", - "variations": {}, - "allocations": [] - }, - "disabled_flag": { - "key": "disabled_flag", - "enabled": false, - "variationType": "INTEGER", - "variations": {}, - "allocations": [] - }, - "no_allocations_flag": { - "key": "no_allocations_flag", - "enabled": true, - "variationType": "JSON", - "variations": { - "control": { - "key": "control", - "value": { "variant": "control" } - }, - "treatment": { - "key": "treatment", - "value": { "variant": "treatment" } - } - }, - "allocations": [] - }, - "numeric_flag": { - "key": "numeric_flag", - "enabled": true, - "variationType": "NUMERIC", - "variations": { - "e": { - "key": "e", - "value": 2.7182818 - }, - "pi": { - "key": "pi", - "value": 3.1415926 - } - }, - "allocations": [ - { - "key": "rollout", - "splits": [ - { - "variationKey": "pi", - "shards": [] - } - ], - "doLog": true - } - ] - }, - "regex-flag": { - "key": "regex-flag", - "enabled": true, - "variationType": "STRING", - "variations": { - "partial-example": { - "key": "partial-example", - "value": "partial-example" - }, - "test": { - "key": "test", - "value": "test" - } - }, - "allocations": [ - { - "key": "partial-example", - "rules": [ - { - "conditions": [ - { - "attribute": "email", - "operator": "MATCHES", - "value": "@example\\.com" - } - ] - } - ], - "splits": [ - { - "variationKey": "partial-example", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "test", - "rules": [ - { - "conditions": [ - { - "attribute": "email", - "operator": "MATCHES", - "value": ".*@test\\.com" - } - ] - } - ], - "splits": [ - { - "variationKey": "test", - "shards": [] - } - ], - "doLog": true - } - ] - }, - "numeric-one-of": { - "key": "numeric-one-of", - "enabled": true, - "variationType": "INTEGER", - "variations": { - "1": { - "key": "1", - "value": 1 - }, - "2": { - "key": "2", - "value": 2 - }, - "3": { - "key": "3", - "value": 3 - } - }, - "allocations": [ - { - "key": "1-for-1", - "rules": [ - { - "conditions": [ - { - "attribute": "number", - "operator": "ONE_OF", - "value": ["1"] - } - ] - } - ], - "splits": [ - { - "variationKey": "1", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "2-for-123456789", - "rules": [ - { - "conditions": [ - { - "attribute": "number", - "operator": "ONE_OF", - "value": ["123456789"] - } - ] - } - ], - "splits": [ - { - "variationKey": "2", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "3-for-not-2", - "rules": [ - { - "conditions": [ - { - "attribute": "number", - "operator": "NOT_ONE_OF", - "value": ["2"] - } - ] - } - ], - "splits": [ - { - "variationKey": "3", - "shards": [] - } - ], - "doLog": true - } - ] - }, - "boolean-one-of-matches": { - "key": "boolean-one-of-matches", - "enabled": true, - "variationType": "INTEGER", - "variations": { - "1": { - "key": "1", - "value": 1 - }, - "2": { - "key": "2", - "value": 2 - }, - "3": { - "key": "3", - "value": 3 - }, - "4": { - "key": "4", - "value": 4 - }, - "5": { - "key": "5", - "value": 5 - } - }, - "allocations": [ - { - "key": "1-for-one-of", - "rules": [ - { - "conditions": [ - { - "attribute": "one_of_flag", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "1", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "2-for-matches", - "rules": [ - { - "conditions": [ - { - "attribute": "matches_flag", - "operator": "MATCHES", - "value": "true" - } - ] - } - ], - "splits": [ - { - "variationKey": "2", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "3-for-not-one-of", - "rules": [ - { - "conditions": [ - { - "attribute": "not_one_of_flag", - "operator": "NOT_ONE_OF", - "value": ["false"] - } - ] - } - ], - "splits": [ - { - "variationKey": "3", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "4-for-not-matches", - "rules": [ - { - "conditions": [ - { - "attribute": "not_matches_flag", - "operator": "NOT_MATCHES", - "value": "false" - } - ] - } - ], - "splits": [ - { - "variationKey": "4", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "5-for-matches-null", - "rules": [ - { - "conditions": [ - { - "attribute": "null_flag", - "operator": "ONE_OF", - "value": ["null"] - } - ] - } - ], - "splits": [ - { - "variationKey": "5", - "shards": [] - } - ], - "doLog": true - } - ] - }, - "empty_string_flag": { - "key": "empty_string_flag", - "enabled": true, - "comment": "Testing the empty string as a variation value", - "variationType": "STRING", - "variations": { - "empty_string": { - "key": "empty_string", - "value": "" - }, - "non_empty": { - "key": "non_empty", - "value": "non_empty" - } - }, - "allocations": [ - { - "key": "allocation-empty", - "rules": [ - { - "conditions": [ - { - "attribute": "country", - "operator": "MATCHES", - "value": "US" - } - ] - } - ], - "splits": [ - { - "variationKey": "empty_string", - "shards": [ - { - "salt": "allocation-empty-shards", - "totalShards": 10000, - "ranges": [ - { - "start": 0, - "end": 10000 - } - ] - } - ] - } - ], - "doLog": true - }, - { - "key": "allocation-test", - "rules": [], - "splits": [ - { - "variationKey": "non_empty", - "shards": [ - { - "salt": "allocation-empty-shards", - "totalShards": 10000, - "ranges": [ - { - "start": 0, - "end": 10000 - } - ] - } - ] - } - ], - "doLog": true - } - ] - }, - "kill-switch": { - "key": "kill-switch", - "enabled": true, - "variationType": "BOOLEAN", - "variations": { - "on": { - "key": "on", - "value": true - }, - "off": { - "key": "off", - "value": false - } - }, - "allocations": [ - { - "key": "on-for-NA", - "rules": [ - { - "conditions": [ - { - "attribute": "country", - "operator": "ONE_OF", - "value": ["US", "Canada", "Mexico"] - } - ] - } - ], - "splits": [ - { - "variationKey": "on", - "shards": [ - { - "salt": "some-salt", - "totalShards": 10000, - "ranges": [ - { - "start": 0, - "end": 10000 - } - ] - } - ] - } - ], - "doLog": true - }, - { - "key": "on-for-age-50+", - "rules": [ - { - "conditions": [ - { - "attribute": "age", - "operator": "GTE", - "value": 50 - } - ] - } - ], - "splits": [ - { - "variationKey": "on", - "shards": [ - { - "salt": "some-salt", - "totalShards": 10000, - "ranges": [ - { - "start": 0, - "end": 10000 - } - ] - } - ] - } - ], - "doLog": true - }, - { - "key": "off-for-all", - "rules": [], - "splits": [ - { - "variationKey": "off", - "shards": [] - } - ], - "doLog": true - } - ] - }, - "comparator-operator-test": { - "key": "comparator-operator-test", - "enabled": true, - "variationType": "STRING", - "variations": { - "small": { - "key": "small", - "value": "small" - }, - "medium": { - "key": "medium", - "value": "medium" - }, - "large": { - "key": "large", - "value": "large" - } - }, - "allocations": [ - { - "key": "small-size", - "rules": [ - { - "conditions": [ - { - "attribute": "size", - "operator": "LT", - "value": 10 - } - ] - } - ], - "splits": [ - { - "variationKey": "small", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "medum-size", - "rules": [ - { - "conditions": [ - { - "attribute": "size", - "operator": "GTE", - "value": 10 - }, - { - "attribute": "size", - "operator": "LTE", - "value": 20 - } - ] - } - ], - "splits": [ - { - "variationKey": "medium", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "large-size", - "rules": [ - { - "conditions": [ - { - "attribute": "size", - "operator": "GT", - "value": 25 - } - ] - } - ], - "splits": [ - { - "variationKey": "large", - "shards": [] - } - ], - "doLog": true - } - ] - }, - "start-and-end-date-test": { - "key": "start-and-end-date-test", - "enabled": true, - "variationType": "STRING", - "variations": { - "old": { - "key": "old", - "value": "old" - }, - "current": { - "key": "current", - "value": "current" - }, - "new": { - "key": "new", - "value": "new" - } - }, - "allocations": [ - { - "key": "old-versions", - "splits": [ - { - "variationKey": "old", - "shards": [] - } - ], - "endAt": "2002-10-31T09:00:00.594Z", - "doLog": true - }, - { - "key": "future-versions", - "splits": [ - { - "variationKey": "new", - "shards": [] - } - ], - "startAt": "2052-10-31T09:00:00.594Z", - "doLog": true - }, - { - "key": "current-versions", - "splits": [ - { - "variationKey": "current", - "shards": [] - } - ], - "startAt": "2022-10-31T09:00:00.594Z", - "endAt": "2050-10-31T09:00:00.594Z", - "doLog": true - } - ] - }, - "null-operator-test": { - "key": "null-operator-test", - "enabled": true, - "variationType": "STRING", - "variations": { - "old": { - "key": "old", - "value": "old" - }, - "new": { - "key": "new", - "value": "new" - } - }, - "allocations": [ - { - "key": "null-operator", - "rules": [ - { - "conditions": [ - { - "attribute": "size", - "operator": "IS_NULL", - "value": true - } - ] - }, - { - "conditions": [ - { - "attribute": "size", - "operator": "LT", - "value": 10 - } - ] - } - ], - "splits": [ - { - "variationKey": "old", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "not-null-operator", - "rules": [ - { - "conditions": [ - { - "attribute": "size", - "operator": "IS_NULL", - "value": false - } - ] - } - ], - "splits": [ - { - "variationKey": "new", - "shards": [] - } - ], - "doLog": true - } - ] - }, - "new-user-onboarding": { - "key": "new-user-onboarding", - "enabled": true, - "variationType": "STRING", - "variations": { - "control": { - "key": "control", - "value": "control" - }, - "red": { - "key": "red", - "value": "red" - }, - "blue": { - "key": "blue", - "value": "blue" - }, - "green": { - "key": "green", - "value": "green" - }, - "yellow": { - "key": "yellow", - "value": "yellow" - }, - "purple": { - "key": "purple", - "value": "purple" - } - }, - "allocations": [ - { - "key": "id rule", - "rules": [ - { - "conditions": [ - { - "attribute": "id", - "operator": "MATCHES", - "value": "zach" - } - ] - } - ], - "splits": [ - { - "variationKey": "purple", - "shards": [] - } - ], - "doLog": false - }, - { - "key": "internal users", - "rules": [ - { - "conditions": [ - { - "attribute": "email", - "operator": "MATCHES", - "value": "@mycompany.com" - } - ] - } - ], - "splits": [ - { - "variationKey": "green", - "shards": [] - } - ], - "doLog": false - }, - { - "key": "experiment", - "rules": [ - { - "conditions": [ - { - "attribute": "country", - "operator": "NOT_ONE_OF", - "value": ["US", "Canada", "Mexico"] - } - ] - } - ], - "splits": [ - { - "variationKey": "control", - "shards": [ - { - "salt": "traffic-new-user-onboarding-experiment", - "totalShards": 10000, - "ranges": [ - { - "start": 0, - "end": 6000 - } - ] - }, - { - "salt": "split-new-user-onboarding-experiment", - "totalShards": 10000, - "ranges": [ - { - "start": 0, - "end": 5000 - } - ] - } - ] - }, - { - "variationKey": "red", - "shards": [ - { - "salt": "traffic-new-user-onboarding-experiment", - "totalShards": 10000, - "ranges": [ - { - "start": 0, - "end": 6000 - } - ] - }, - { - "salt": "split-new-user-onboarding-experiment", - "totalShards": 10000, - "ranges": [ - { - "start": 5000, - "end": 8000 - } - ] - } - ] - }, - { - "variationKey": "yellow", - "shards": [ - { - "salt": "traffic-new-user-onboarding-experiment", - "totalShards": 10000, - "ranges": [ - { - "start": 0, - "end": 6000 - } - ] - }, - { - "salt": "split-new-user-onboarding-experiment", - "totalShards": 10000, - "ranges": [ - { - "start": 8000, - "end": 10000 - } - ] - } - ] - } - ], - "doLog": true - }, - { - "key": "rollout", - "rules": [ - { - "conditions": [ - { - "attribute": "country", - "operator": "ONE_OF", - "value": ["US", "Canada", "Mexico"] - } - ] - } - ], - "splits": [ - { - "variationKey": "blue", - "shards": [ - { - "salt": "split-new-user-onboarding-rollout", - "totalShards": 10000, - "ranges": [ - { - "start": 0, - "end": 8000 - } - ] - } - ], - "extraLogging": { - "allocationvalue_type": "rollout", - "owner": "hippo" - } - } - ], - "doLog": true - } - ] - }, - "integer-flag": { - "key": "integer-flag", - "enabled": true, - "variationType": "INTEGER", - "variations": { - "one": { - "key": "one", - "value": 1 - }, - "two": { - "key": "two", - "value": 2 - }, - "three": { - "key": "three", - "value": 3 - } - }, - "allocations": [ - { - "key": "targeted allocation", - "rules": [ - { - "conditions": [ - { - "attribute": "country", - "operator": "ONE_OF", - "value": ["US", "Canada", "Mexico"] - } - ] - }, - { - "conditions": [ - { - "attribute": "email", - "operator": "MATCHES", - "value": ".*@example.com" - } - ] - } - ], - "splits": [ - { - "variationKey": "three", - "shards": [ - { - "salt": "full-range-salt", - "totalShards": 10000, - "ranges": [ - { - "start": 0, - "end": 10000 - } - ] - } - ] - } - ], - "doLog": true - }, - { - "key": "50/50 split", - "rules": [], - "splits": [ - { - "variationKey": "one", - "shards": [ - { - "salt": "split-numeric-flag-some-allocation", - "totalShards": 10000, - "ranges": [ - { - "start": 0, - "end": 5000 - } - ] - } - ] - }, - { - "variationKey": "two", - "shards": [ - { - "salt": "split-numeric-flag-some-allocation", - "totalShards": 10000, - "ranges": [ - { - "start": 5000, - "end": 10000 - } - ] - } - ] - } - ], - "doLog": true - } - ] - }, - "json-config-flag": { - "key": "json-config-flag", - "enabled": true, - "variationType": "JSON", - "variations": { - "one": { - "key": "one", - "value": { "integer": 1, "string": "one", "float": 1.0 } - }, - "two": { - "key": "two", - "value": { "integer": 2, "string": "two", "float": 2.0 } - }, - "empty": { - "key": "empty", - "value": {} - } - }, - "allocations": [ - { - "key": "Optionally Force Empty", - "rules": [ - { - "conditions": [ - { - "attribute": "Force Empty", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "empty", - "shards": [ - { - "salt": "full-range-salt", - "totalShards": 10000, - "ranges": [ - { - "start": 0, - "end": 10000 - } - ] - } - ] - } - ], - "doLog": true - }, - { - "key": "50/50 split", - "rules": [], - "splits": [ - { - "variationKey": "one", - "shards": [ - { - "salt": "traffic-json-flag", - "totalShards": 10000, - "ranges": [ - { - "start": 0, - "end": 10000 - } - ] - }, - { - "salt": "split-json-flag", - "totalShards": 10000, - "ranges": [ - { - "start": 0, - "end": 5000 - } - ] - } - ] - }, - { - "variationKey": "two", - "shards": [ - { - "salt": "traffic-json-flag", - "totalShards": 10000, - "ranges": [ - { - "start": 0, - "end": 10000 - } - ] - }, - { - "salt": "split-json-flag", - "totalShards": 10000, - "ranges": [ - { - "start": 5000, - "end": 10000 - } - ] - } - ] - } - ], - "doLog": true - } - ] - }, - "special-characters": { - "key": "special-characters", - "enabled": true, - "variationType": "JSON", - "variations": { - "de": { - "key": "de", - "value": { "a": "kümmert", "b": "schön" } - }, - "ua": { - "key": "ua", - "value": { "a": "піклуватися", "b": "любов" } - }, - "zh": { - "key": "zh", - "value": { "a": "照顾", "b": "漂亮" } - }, - "emoji": { - "key": "emoji", - "value": { "a": "🤗", "b": "🌸" } - } - }, - "allocations": [ - { - "key": "allocation-test", - "splits": [ - { - "variationKey": "de", - "shards": [ - { - "salt": "split-json-flag", - "totalShards": 10000, - "ranges": [ - { - "start": 0, - "end": 2500 - } - ] - } - ] - }, - { - "variationKey": "ua", - "shards": [ - { - "salt": "split-json-flag", - "totalShards": 10000, - "ranges": [ - { - "start": 2500, - "end": 5000 - } - ] - } - ] - }, - { - "variationKey": "zh", - "shards": [ - { - "salt": "split-json-flag", - "totalShards": 10000, - "ranges": [ - { - "start": 5000, - "end": 7500 - } - ] - } - ] - }, - { - "variationKey": "emoji", - "shards": [ - { - "salt": "split-json-flag", - "totalShards": 10000, - "ranges": [ - { - "start": 7500, - "end": 10000 - } - ] - } - ] - } - ], - "doLog": true - }, - { - "key": "allocation-default", - "splits": [ - { - "variationKey": "de", - "shards": [] - } - ], - "doLog": false - } - ] - }, - "string_flag_with_special_characters": { - "key": "string_flag_with_special_characters", - "enabled": true, - "comment": "Testing the string with special characters and spaces", - "variationType": "STRING", - "variations": { - "string_with_spaces": { - "key": "string_with_spaces", - "value": " a b c d e f " - }, - "string_with_only_one_space": { - "key": "string_with_only_one_space", - "value": " " - }, - "string_with_only_multiple_spaces": { - "key": "string_with_only_multiple_spaces", - "value": " " - }, - "string_with_dots": { - "key": "string_with_dots", - "value": ".a.b.c.d.e.f." - }, - "string_with_only_one_dot": { - "key": "string_with_only_one_dot", - "value": "." - }, - "string_with_only_multiple_dots": { - "key": "string_with_only_multiple_dots", - "value": "......." - }, - "string_with_comas": { - "key": "string_with_comas", - "value": ",a,b,c,d,e,f," - }, - "string_with_only_one_coma": { - "key": "string_with_only_one_coma", - "value": "," - }, - "string_with_only_multiple_comas": { - "key": "string_with_only_multiple_comas", - "value": ",,,,,,," - }, - "string_with_colons": { - "key": "string_with_colons", - "value": ":a:b:c:d:e:f:" - }, - "string_with_only_one_colon": { - "key": "string_with_only_one_colon", - "value": ":" - }, - "string_with_only_multiple_colons": { - "key": "string_with_only_multiple_colons", - "value": ":::::::" - }, - "string_with_semicolons": { - "key": "string_with_semicolons", - "value": ";a;b;c;d;e;f;" - }, - "string_with_only_one_semicolon": { - "key": "string_with_only_one_semicolon", - "value": ";" - }, - "string_with_only_multiple_semicolons": { - "key": "string_with_only_multiple_semicolons", - "value": ";;;;;;;" - }, - "string_with_slashes": { - "key": "string_with_slashes", - "value": "/a/b/c/d/e/f/" - }, - "string_with_only_one_slash": { - "key": "string_with_only_one_slash", - "value": "/" - }, - "string_with_only_multiple_slashes": { - "key": "string_with_only_multiple_slashes", - "value": "///////" - }, - "string_with_dashes": { - "key": "string_with_dashes", - "value": "-a-b-c-d-e-f-" - }, - "string_with_only_one_dash": { - "key": "string_with_only_one_dash", - "value": "-" - }, - "string_with_only_multiple_dashes": { - "key": "string_with_only_multiple_dashes", - "value": "-------" - }, - "string_with_underscores": { - "key": "string_with_underscores", - "value": "_a_b_c_d_e_f_" - }, - "string_with_only_one_underscore": { - "key": "string_with_only_one_underscore", - "value": "_" - }, - "string_with_only_multiple_underscores": { - "key": "string_with_only_multiple_underscores", - "value": "_______" - }, - "string_with_plus_signs": { - "key": "string_with_plus_signs", - "value": "+a+b+c+d+e+f+" - }, - "string_with_only_one_plus_sign": { - "key": "string_with_only_one_plus_sign", - "value": "+" - }, - "string_with_only_multiple_plus_signs": { - "key": "string_with_only_multiple_plus_signs", - "value": "+++++++" - }, - "string_with_equal_signs": { - "key": "string_with_equal_signs", - "value": "=a=b=c=d=e=f=" - }, - "string_with_only_one_equal_sign": { - "key": "string_with_only_one_equal_sign", - "value": "=" - }, - "string_with_only_multiple_equal_signs": { - "key": "string_with_only_multiple_equal_signs", - "value": "=======" - }, - "string_with_dollar_signs": { - "key": "string_with_dollar_signs", - "value": "$a$b$c$d$e$f$" - }, - "string_with_only_one_dollar_sign": { - "key": "string_with_only_one_dollar_sign", - "value": "$" - }, - "string_with_only_multiple_dollar_signs": { - "key": "string_with_only_multiple_dollar_signs", - "value": "$$$$$$$" - }, - "string_with_at_signs": { - "key": "string_with_at_signs", - "value": "@a@b@c@d@e@f@" - }, - "string_with_only_one_at_sign": { - "key": "string_with_only_one_at_sign", - "value": "@" - }, - "string_with_only_multiple_at_signs": { - "key": "string_with_only_multiple_at_signs", - "value": "@@@@@@@" - }, - "string_with_amp_signs": { - "key": "string_with_amp_signs", - "value": "&a&b&c&d&e&f&" - }, - "string_with_only_one_amp_sign": { - "key": "string_with_only_one_amp_sign", - "value": "&" - }, - "string_with_only_multiple_amp_signs": { - "key": "string_with_only_multiple_amp_signs", - "value": "&&&&&&&" - }, - "string_with_hash_signs": { - "key": "string_with_hash_signs", - "value": "#a#b#c#d#e#f#" - }, - "string_with_only_one_hash_sign": { - "key": "string_with_only_one_hash_sign", - "value": "#" - }, - "string_with_only_multiple_hash_signs": { - "key": "string_with_only_multiple_hash_signs", - "value": "#######" - }, - "string_with_percentage_signs": { - "key": "string_with_percentage_signs", - "value": "%a%b%c%d%e%f%" - }, - "string_with_only_one_percentage_sign": { - "key": "string_with_only_one_percentage_sign", - "value": "%" - }, - "string_with_only_multiple_percentage_signs": { - "key": "string_with_only_multiple_percentage_signs", - "value": "%%%%%%%" - }, - "string_with_tilde_signs": { - "key": "string_with_tilde_signs", - "value": "~a~b~c~d~e~f~" - }, - "string_with_only_one_tilde_sign": { - "key": "string_with_only_one_tilde_sign", - "value": "~" - }, - "string_with_only_multiple_tilde_signs": { - "key": "string_with_only_multiple_tilde_signs", - "value": "~~~~~~~" - }, - "string_with_asterix_signs": { - "key": "string_with_asterix_signs", - "value": "*a*b*c*d*e*f*" - }, - "string_with_only_one_asterix_sign": { - "key": "string_with_only_one_asterix_sign", - "value": "*" - }, - "string_with_only_multiple_asterix_signs": { - "key": "string_with_only_multiple_asterix_signs", - "value": "*******" - }, - "string_with_single_quotes": { - "key": "string_with_single_quotes", - "value": "'a'b'c'd'e'f'" - }, - "string_with_only_one_single_quote": { - "key": "string_with_only_one_single_quote", - "value": "'" - }, - "string_with_only_multiple_single_quotes": { - "key": "string_with_only_multiple_single_quotes", - "value": "'''''''" - }, - "string_with_question_marks": { - "key": "string_with_question_marks", - "value": "?a?b?c?d?e?f?" - }, - "string_with_only_one_question_mark": { - "key": "string_with_only_one_question_mark", - "value": "?" - }, - "string_with_only_multiple_question_marks": { - "key": "string_with_only_multiple_question_marks", - "value": "???????" - }, - "string_with_exclamation_marks": { - "key": "string_with_exclamation_marks", - "value": "!a!b!c!d!e!f!" - }, - "string_with_only_one_exclamation_mark": { - "key": "string_with_only_one_exclamation_mark", - "value": "!" - }, - "string_with_only_multiple_exclamation_marks": { - "key": "string_with_only_multiple_exclamation_marks", - "value": "!!!!!!!" - }, - "string_with_opening_parentheses": { - "key": "string_with_opening_parentheses", - "value": "(a(b(c(d(e(f(" - }, - "string_with_only_one_opening_parenthese": { - "key": "string_with_only_one_opening_parenthese", - "value": "(" - }, - "string_with_only_multiple_opening_parentheses": { - "key": "string_with_only_multiple_opening_parentheses", - "value": "(((((((" - }, - "string_with_closing_parentheses": { - "key": "string_with_closing_parentheses", - "value": ")a)b)c)d)e)f)" - }, - "string_with_only_one_closing_parenthese": { - "key": "string_with_only_one_closing_parenthese", - "value": ")" - }, - "string_with_only_multiple_closing_parentheses": { - "key": "string_with_only_multiple_closing_parentheses", - "value": ")))))))" - } - }, - "allocations": [ - { - "key": "allocation-test-string_with_spaces", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_spaces", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_spaces", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_only_one_space", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_only_one_space", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_only_one_space", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_only_multiple_spaces", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_only_multiple_spaces", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_only_multiple_spaces", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_dots", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_dots", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_dots", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_only_one_dot", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_only_one_dot", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_only_one_dot", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_only_multiple_dots", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_only_multiple_dots", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_only_multiple_dots", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_comas", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_comas", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_comas", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_only_one_coma", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_only_one_coma", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_only_one_coma", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_only_multiple_comas", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_only_multiple_comas", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_only_multiple_comas", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_colons", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_colons", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_colons", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_only_one_colon", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_only_one_colon", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_only_one_colon", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_only_multiple_colons", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_only_multiple_colons", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_only_multiple_colons", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_semicolons", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_semicolons", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_semicolons", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_only_one_semicolon", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_only_one_semicolon", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_only_one_semicolon", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_only_multiple_semicolons", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_only_multiple_semicolons", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_only_multiple_semicolons", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_slashes", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_slashes", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_slashes", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_only_one_slash", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_only_one_slash", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_only_one_slash", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_only_multiple_slashes", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_only_multiple_slashes", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_only_multiple_slashes", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_dashes", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_dashes", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_dashes", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_only_one_dash", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_only_one_dash", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_only_one_dash", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_only_multiple_dashes", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_only_multiple_dashes", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_only_multiple_dashes", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_underscores", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_underscores", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_underscores", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_only_one_underscore", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_only_one_underscore", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_only_one_underscore", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_only_multiple_underscores", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_only_multiple_underscores", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_only_multiple_underscores", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_plus_signs", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_plus_signs", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_plus_signs", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_only_one_plus_sign", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_only_one_plus_sign", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_only_one_plus_sign", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_only_multiple_plus_signs", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_only_multiple_plus_signs", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_only_multiple_plus_signs", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_equal_signs", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_equal_signs", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_equal_signs", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_only_one_equal_sign", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_only_one_equal_sign", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_only_one_equal_sign", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_only_multiple_equal_signs", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_only_multiple_equal_signs", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_only_multiple_equal_signs", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_dollar_signs", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_dollar_signs", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_dollar_signs", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_only_one_dollar_sign", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_only_one_dollar_sign", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_only_one_dollar_sign", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_only_multiple_dollar_signs", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_only_multiple_dollar_signs", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_only_multiple_dollar_signs", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_at_signs", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_at_signs", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_at_signs", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_only_one_at_sign", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_only_one_at_sign", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_only_one_at_sign", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_only_multiple_at_signs", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_only_multiple_at_signs", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_only_multiple_at_signs", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_amp_signs", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_amp_signs", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_amp_signs", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_only_one_amp_sign", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_only_one_amp_sign", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_only_one_amp_sign", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_only_multiple_amp_signs", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_only_multiple_amp_signs", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_only_multiple_amp_signs", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_hash_signs", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_hash_signs", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_hash_signs", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_only_one_hash_sign", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_only_one_hash_sign", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_only_one_hash_sign", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_only_multiple_hash_signs", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_only_multiple_hash_signs", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_only_multiple_hash_signs", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_percentage_signs", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_percentage_signs", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_percentage_signs", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_only_one_percentage_sign", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_only_one_percentage_sign", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_only_one_percentage_sign", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_only_multiple_percentage_signs", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_only_multiple_percentage_signs", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_only_multiple_percentage_signs", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_tilde_signs", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_tilde_signs", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_tilde_signs", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_only_one_tilde_sign", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_only_one_tilde_sign", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_only_one_tilde_sign", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_only_multiple_tilde_signs", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_only_multiple_tilde_signs", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_only_multiple_tilde_signs", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_asterix_signs", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_asterix_signs", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_asterix_signs", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_only_one_asterix_sign", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_only_one_asterix_sign", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_only_one_asterix_sign", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_only_multiple_asterix_signs", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_only_multiple_asterix_signs", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_only_multiple_asterix_signs", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_single_quotes", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_single_quotes", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_single_quotes", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_only_one_single_quote", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_only_one_single_quote", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_only_one_single_quote", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_only_multiple_single_quotes", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_only_multiple_single_quotes", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_only_multiple_single_quotes", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_question_marks", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_question_marks", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_question_marks", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_only_one_question_mark", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_only_one_question_mark", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_only_one_question_mark", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_only_multiple_question_marks", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_only_multiple_question_marks", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_only_multiple_question_marks", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_exclamation_marks", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_exclamation_marks", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_exclamation_marks", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_only_one_exclamation_mark", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_only_one_exclamation_mark", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_only_one_exclamation_mark", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_only_multiple_exclamation_marks", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_only_multiple_exclamation_marks", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_only_multiple_exclamation_marks", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_opening_parentheses", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_opening_parentheses", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_opening_parentheses", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_only_one_opening_parenthese", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_only_one_opening_parenthese", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_only_one_opening_parenthese", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_only_multiple_opening_parentheses", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_only_multiple_opening_parentheses", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_only_multiple_opening_parentheses", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_closing_parentheses", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_closing_parentheses", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_closing_parentheses", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_only_one_closing_parenthese", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_only_one_closing_parenthese", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_only_one_closing_parenthese", - "shards": [] - } - ], - "doLog": true - }, - { - "key": "allocation-test-string_with_only_multiple_closing_parentheses", - "rules": [ - { - "conditions": [ - { - "attribute": "string_with_only_multiple_closing_parentheses", - "operator": "ONE_OF", - "value": ["true"] - } - ] - } - ], - "splits": [ - { - "variationKey": "string_with_only_multiple_closing_parentheses", - "shards": [] - } - ], - "doLog": true - } - ] - }, - "microsecond-date-test": { - "key": "microsecond-date-test", - "enabled": true, - "variationType": "STRING", - "variations": { - "expired": { - "key": "expired", - "value": "expired" - }, - "active": { - "key": "active", - "value": "active" - }, - "future": { - "key": "future", - "value": "future" - } - }, - "allocations": [ - { - "key": "expired-allocation", - "splits": [ - { - "variationKey": "expired", - "shards": [] - } - ], - "endAt": "2002-10-31T09:00:00.594321Z", - "doLog": true - }, - { - "key": "future-allocation", - "splits": [ - { - "variationKey": "future", - "shards": [] - } - ], - "startAt": "2052-10-31T09:00:00.123456Z", - "doLog": true - }, - { - "key": "active-allocation", - "splits": [ - { - "variationKey": "active", - "shards": [] - } - ], - "startAt": "2022-10-31T09:00:00.235982Z", - "endAt": "2050-10-31T09:00:00.987654Z", - "doLog": true - } - ] - } - } - } - } -} diff --git a/dd-smoke-tests/openfeature/src/test/resources/data/test-case-boolean-one-of-matches.json b/dd-smoke-tests/openfeature/src/test/resources/data/test-case-boolean-one-of-matches.json deleted file mode 100644 index 6bfbf0effad..00000000000 --- a/dd-smoke-tests/openfeature/src/test/resources/data/test-case-boolean-one-of-matches.json +++ /dev/null @@ -1,240 +0,0 @@ -[ - { - "flag": "boolean-one-of-matches", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "alice", - "attributes": { - "one_of_flag": true - }, - "result": { - "value": 1, - "variant": "1", - "flagMetadata": { - "allocationKey": "1-for-one-of", - "variationType": "number", - "doLog": true - } - } - }, - { - "flag": "boolean-one-of-matches", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "bob", - "attributes": { - "one_of_flag": false - }, - "result": { - "value": 0 - } - }, - { - "flag": "boolean-one-of-matches", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "charlie", - "attributes": { - "one_of_flag": "True" - }, - "result": { - "value": 0 - } - }, - { - "flag": "boolean-one-of-matches", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "derek", - "attributes": { - "matches_flag": true - }, - "result": { - "value": 2, - "variant": "2", - "flagMetadata": { - "allocationKey": "2-for-matches", - "variationType": "number", - "doLog": true - } - } - }, - { - "flag": "boolean-one-of-matches", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "erica", - "attributes": { - "matches_flag": false - }, - "result": { - "value": 0 - } - }, - { - "flag": "boolean-one-of-matches", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "frank", - "attributes": { - "not_matches_flag": false - }, - "result": { - "value": 0 - } - }, - { - "flag": "boolean-one-of-matches", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "george", - "attributes": { - "not_matches_flag": true - }, - "result": { - "value": 4, - "variant": "4", - "flagMetadata": { - "allocationKey": "4-for-not-matches", - "variationType": "number", - "doLog": true - } - } - }, - { - "flag": "boolean-one-of-matches", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "haley", - "attributes": { - "not_matches_flag": "False" - }, - "result": { - "value": 4, - "variant": "4", - "flagMetadata": { - "allocationKey": "4-for-not-matches", - "variationType": "number", - "doLog": true - } - } - }, - { - "flag": "boolean-one-of-matches", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "ivy", - "attributes": { - "not_one_of_flag": true - }, - "result": { - "value": 3, - "variant": "3", - "flagMetadata": { - "allocationKey": "3-for-not-one-of", - "variationType": "number", - "doLog": true - } - } - }, - { - "flag": "boolean-one-of-matches", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "julia", - "attributes": { - "not_one_of_flag": false - }, - "result": { - "value": 0 - } - }, - { - "flag": "boolean-one-of-matches", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "kim", - "attributes": { - "not_one_of_flag": "False" - }, - "result": { - "value": 3, - "variant": "3", - "flagMetadata": { - "allocationKey": "3-for-not-one-of", - "variationType": "number", - "doLog": true - } - } - }, - { - "flag": "boolean-one-of-matches", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "lucas", - "attributes": { - "not_one_of_flag": "true" - }, - "result": { - "value": 3, - "variant": "3", - "flagMetadata": { - "allocationKey": "3-for-not-one-of", - "variationType": "number", - "doLog": true - } - } - }, - { - "flag": "boolean-one-of-matches", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "mike", - "attributes": { - "not_one_of_flag": "false" - }, - "result": { - "value": 0 - } - }, - { - "flag": "boolean-one-of-matches", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "nicole", - "attributes": { - "null_flag": "null" - }, - "result": { - "value": 5, - "variant": "5", - "flagMetadata": { - "allocationKey": "5-for-matches-null", - "variationType": "number", - "doLog": true - } - } - }, - { - "flag": "boolean-one-of-matches", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "owen", - "attributes": { - "null_flag": null - }, - "result": { - "value": 0 - } - }, - { - "flag": "boolean-one-of-matches", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "pete", - "attributes": {}, - "result": { - "value": 0 - } - } -] diff --git a/dd-smoke-tests/openfeature/src/test/resources/data/test-case-comparator-operator-flag.json b/dd-smoke-tests/openfeature/src/test/resources/data/test-case-comparator-operator-flag.json deleted file mode 100644 index a5c8ef07cd4..00000000000 --- a/dd-smoke-tests/openfeature/src/test/resources/data/test-case-comparator-operator-flag.json +++ /dev/null @@ -1,82 +0,0 @@ -[ - { - "flag": "comparator-operator-test", - "variationType": "STRING", - "defaultValue": "unknown", - "targetingKey": "alice", - "attributes": { - "size": 5, - "country": "US" - }, - "result": { - "value": "small", - "variant": "small", - "flagMetadata": { - "allocationKey": "small-size", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "comparator-operator-test", - "variationType": "STRING", - "defaultValue": "unknown", - "targetingKey": "bob", - "attributes": { - "size": 10, - "country": "Canada" - }, - "result": { - "value": "medium", - "variant": "medium", - "flagMetadata": { - "allocationKey": "medum-size", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "comparator-operator-test", - "variationType": "STRING", - "defaultValue": "unknown", - "targetingKey": "charlie", - "attributes": { - "size": 25 - }, - "result": { - "value": "unknown" - } - }, - { - "flag": "comparator-operator-test", - "variationType": "STRING", - "defaultValue": "unknown", - "targetingKey": "david", - "attributes": { - "size": 26 - }, - "result": { - "value": "large", - "variant": "large", - "flagMetadata": { - "allocationKey": "large-size", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "comparator-operator-test", - "variationType": "STRING", - "defaultValue": "unknown", - "targetingKey": "elize", - "attributes": { - "country": "UK" - }, - "result": { - "value": "unknown" - } - } -] diff --git a/dd-smoke-tests/openfeature/src/test/resources/data/test-case-disabled-flag.json b/dd-smoke-tests/openfeature/src/test/resources/data/test-case-disabled-flag.json deleted file mode 100644 index 0da79189ade..00000000000 --- a/dd-smoke-tests/openfeature/src/test/resources/data/test-case-disabled-flag.json +++ /dev/null @@ -1,40 +0,0 @@ -[ - { - "flag": "disabled_flag", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "alice", - "attributes": { - "email": "alice@mycompany.com", - "country": "US" - }, - "result": { - "value": 0 - } - }, - { - "flag": "disabled_flag", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "bob", - "attributes": { - "email": "bob@example.com", - "country": "Canada" - }, - "result": { - "value": 0 - } - }, - { - "flag": "disabled_flag", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "charlie", - "attributes": { - "age": 50 - }, - "result": { - "value": 0 - } - } -] diff --git a/dd-smoke-tests/openfeature/src/test/resources/data/test-case-empty-flag.json b/dd-smoke-tests/openfeature/src/test/resources/data/test-case-empty-flag.json deleted file mode 100644 index 52100b1fe47..00000000000 --- a/dd-smoke-tests/openfeature/src/test/resources/data/test-case-empty-flag.json +++ /dev/null @@ -1,40 +0,0 @@ -[ - { - "flag": "empty_flag", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "alice", - "attributes": { - "email": "alice@mycompany.com", - "country": "US" - }, - "result": { - "value": "default_value" - } - }, - { - "flag": "empty_flag", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "bob", - "attributes": { - "email": "bob@example.com", - "country": "Canada" - }, - "result": { - "value": "default_value" - } - }, - { - "flag": "empty_flag", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "charlie", - "attributes": { - "age": 50 - }, - "result": { - "value": "default_value" - } - } -] diff --git a/dd-smoke-tests/openfeature/src/test/resources/data/test-case-flag-with-empty-string.json b/dd-smoke-tests/openfeature/src/test/resources/data/test-case-flag-with-empty-string.json deleted file mode 100644 index 32a1c1febb7..00000000000 --- a/dd-smoke-tests/openfeature/src/test/resources/data/test-case-flag-with-empty-string.json +++ /dev/null @@ -1,36 +0,0 @@ -[ - { - "flag": "empty_string_flag", - "variationType": "STRING", - "defaultValue": "default", - "targetingKey": "alice", - "attributes": { - "country": "US" - }, - "result": { - "value": "", - "variant": "empty_string", - "flagMetadata": { - "allocationKey": "allocation-empty", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "empty_string_flag", - "variationType": "STRING", - "defaultValue": "default", - "targetingKey": "bob", - "attributes": {}, - "result": { - "value": "non_empty", - "variant": "non_empty", - "flagMetadata": { - "allocationKey": "allocation-test", - "variationType": "string", - "doLog": true - } - } - } -] diff --git a/dd-smoke-tests/openfeature/src/test/resources/data/test-case-integer-flag.json b/dd-smoke-tests/openfeature/src/test/resources/data/test-case-integer-flag.json deleted file mode 100644 index 4a41d042f62..00000000000 --- a/dd-smoke-tests/openfeature/src/test/resources/data/test-case-integer-flag.json +++ /dev/null @@ -1,382 +0,0 @@ -[ - { - "flag": "integer-flag", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "alice", - "attributes": { - "email": "alice@mycompany.com", - "country": "US" - }, - "result": { - "value": 3, - "variant": "three", - "flagMetadata": { - "allocationKey": "targeted allocation", - "variationType": "number", - "doLog": true - } - } - }, - { - "flag": "integer-flag", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "bob", - "attributes": { - "email": "bob@example.com", - "country": "Canada" - }, - "result": { - "value": 3, - "variant": "three", - "flagMetadata": { - "allocationKey": "targeted allocation", - "variationType": "number", - "doLog": true - } - } - }, - { - "flag": "integer-flag", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "charlie", - "attributes": { - "age": 50 - }, - "result": { - "value": 2, - "variant": "two", - "flagMetadata": { - "allocationKey": "50/50 split", - "variationType": "number", - "doLog": true - } - } - }, - { - "flag": "integer-flag", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "debra", - "attributes": { - "email": "test@test.com", - "country": "Mexico", - "age": 25 - }, - "result": { - "value": 3, - "variant": "three", - "flagMetadata": { - "allocationKey": "targeted allocation", - "variationType": "number", - "doLog": true - } - } - }, - { - "flag": "integer-flag", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "1", - "attributes": {}, - "result": { - "value": 2, - "variant": "two", - "flagMetadata": { - "allocationKey": "50/50 split", - "variationType": "number", - "doLog": true - } - } - }, - { - "flag": "integer-flag", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "2", - "attributes": {}, - "result": { - "value": 2, - "variant": "two", - "flagMetadata": { - "allocationKey": "50/50 split", - "variationType": "number", - "doLog": true - } - } - }, - { - "flag": "integer-flag", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "3", - "attributes": {}, - "result": { - "value": 2, - "variant": "two", - "flagMetadata": { - "allocationKey": "50/50 split", - "variationType": "number", - "doLog": true - } - } - }, - { - "flag": "integer-flag", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "4", - "attributes": {}, - "result": { - "value": 2, - "variant": "two", - "flagMetadata": { - "allocationKey": "50/50 split", - "variationType": "number", - "doLog": true - } - } - }, - { - "flag": "integer-flag", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "5", - "attributes": {}, - "result": { - "value": 1, - "variant": "one", - "flagMetadata": { - "allocationKey": "50/50 split", - "variationType": "number", - "doLog": true - } - } - }, - { - "flag": "integer-flag", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "6", - "attributes": {}, - "result": { - "value": 2, - "variant": "two", - "flagMetadata": { - "allocationKey": "50/50 split", - "variationType": "number", - "doLog": true - } - } - }, - { - "flag": "integer-flag", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "7", - "attributes": {}, - "result": { - "value": 1, - "variant": "one", - "flagMetadata": { - "allocationKey": "50/50 split", - "variationType": "number", - "doLog": true - } - } - }, - { - "flag": "integer-flag", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "8", - "attributes": {}, - "result": { - "value": 1, - "variant": "one", - "flagMetadata": { - "allocationKey": "50/50 split", - "variationType": "number", - "doLog": true - } - } - }, - { - "flag": "integer-flag", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "9", - "attributes": {}, - "result": { - "value": 2, - "variant": "two", - "flagMetadata": { - "allocationKey": "50/50 split", - "variationType": "number", - "doLog": true - } - } - }, - { - "flag": "integer-flag", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "10", - "attributes": {}, - "result": { - "value": 2, - "variant": "two", - "flagMetadata": { - "allocationKey": "50/50 split", - "variationType": "number", - "doLog": true - } - } - }, - { - "flag": "integer-flag", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "11", - "attributes": {}, - "result": { - "value": 1, - "variant": "one", - "flagMetadata": { - "allocationKey": "50/50 split", - "variationType": "number", - "doLog": true - } - } - }, - { - "flag": "integer-flag", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "12", - "attributes": {}, - "result": { - "value": 1, - "variant": "one", - "flagMetadata": { - "allocationKey": "50/50 split", - "variationType": "number", - "doLog": true - } - } - }, - { - "flag": "integer-flag", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "13", - "attributes": {}, - "result": { - "value": 2, - "variant": "two", - "flagMetadata": { - "allocationKey": "50/50 split", - "variationType": "number", - "doLog": true - } - } - }, - { - "flag": "integer-flag", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "14", - "attributes": {}, - "result": { - "value": 1, - "variant": "one", - "flagMetadata": { - "allocationKey": "50/50 split", - "variationType": "number", - "doLog": true - } - } - }, - { - "flag": "integer-flag", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "15", - "attributes": {}, - "result": { - "value": 2, - "variant": "two", - "flagMetadata": { - "allocationKey": "50/50 split", - "variationType": "number", - "doLog": true - } - } - }, - { - "flag": "integer-flag", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "16", - "attributes": {}, - "result": { - "value": 2, - "variant": "two", - "flagMetadata": { - "allocationKey": "50/50 split", - "variationType": "number", - "doLog": true - } - } - }, - { - "flag": "integer-flag", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "17", - "attributes": {}, - "result": { - "value": 1, - "variant": "one", - "flagMetadata": { - "allocationKey": "50/50 split", - "variationType": "number", - "doLog": true - } - } - }, - { - "flag": "integer-flag", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "18", - "attributes": {}, - "result": { - "value": 1, - "variant": "one", - "flagMetadata": { - "allocationKey": "50/50 split", - "variationType": "number", - "doLog": true - } - } - }, - { - "flag": "integer-flag", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "19", - "attributes": {}, - "result": { - "value": 1, - "variant": "one", - "flagMetadata": { - "allocationKey": "50/50 split", - "variationType": "number", - "doLog": true - } - } - } -] diff --git a/dd-smoke-tests/openfeature/src/test/resources/data/test-case-kill-switch-flag.json b/dd-smoke-tests/openfeature/src/test/resources/data/test-case-kill-switch-flag.json deleted file mode 100644 index 29e65ba5bb4..00000000000 --- a/dd-smoke-tests/openfeature/src/test/resources/data/test-case-kill-switch-flag.json +++ /dev/null @@ -1,434 +0,0 @@ -[ - { - "flag": "kill-switch", - "variationType": "BOOLEAN", - "defaultValue": false, - "targetingKey": "alice", - "attributes": { - "email": "alice@mycompany.com", - "country": "US" - }, - "result": { - "value": true, - "variant": "on", - "flagMetadata": { - "allocationKey": "on-for-NA", - "variationType": "boolean", - "doLog": true - } - } - }, - { - "flag": "kill-switch", - "variationType": "BOOLEAN", - "defaultValue": false, - "targetingKey": "bob", - "attributes": { - "email": "bob@example.com", - "country": "Canada" - }, - "result": { - "value": true, - "variant": "on", - "flagMetadata": { - "allocationKey": "on-for-NA", - "variationType": "boolean", - "doLog": true - } - } - }, - { - "flag": "kill-switch", - "variationType": "BOOLEAN", - "defaultValue": false, - "targetingKey": "barbara", - "attributes": { - "email": "barbara@example.com", - "country": "canada" - }, - "result": { - "value": false, - "variant": "off", - "flagMetadata": { - "allocationKey": "off-for-all", - "variationType": "boolean", - "doLog": true - } - } - }, - { - "flag": "kill-switch", - "variationType": "BOOLEAN", - "defaultValue": false, - "targetingKey": "charlie", - "attributes": { - "age": 40 - }, - "result": { - "value": false, - "variant": "off", - "flagMetadata": { - "allocationKey": "off-for-all", - "variationType": "boolean", - "doLog": true - } - } - }, - { - "flag": "kill-switch", - "variationType": "BOOLEAN", - "defaultValue": false, - "targetingKey": "debra", - "attributes": { - "email": "test@test.com", - "country": "Mexico", - "age": 25 - }, - "result": { - "value": true, - "variant": "on", - "flagMetadata": { - "allocationKey": "on-for-NA", - "variationType": "boolean", - "doLog": true - } - } - }, - { - "flag": "kill-switch", - "variationType": "BOOLEAN", - "defaultValue": false, - "targetingKey": "1", - "attributes": {}, - "result": { - "value": false, - "variant": "off", - "flagMetadata": { - "allocationKey": "off-for-all", - "variationType": "boolean", - "doLog": true - } - } - }, - { - "flag": "kill-switch", - "variationType": "BOOLEAN", - "defaultValue": false, - "targetingKey": "2", - "attributes": { - "country": "Mexico" - }, - "result": { - "value": true, - "variant": "on", - "flagMetadata": { - "allocationKey": "on-for-NA", - "variationType": "boolean", - "doLog": true - } - } - }, - { - "flag": "kill-switch", - "variationType": "BOOLEAN", - "defaultValue": false, - "targetingKey": "3", - "attributes": { - "country": "UK", - "age": 50 - }, - "result": { - "value": true, - "variant": "on", - "flagMetadata": { - "allocationKey": "on-for-age-50+", - "variationType": "boolean", - "doLog": true - } - } - }, - { - "flag": "kill-switch", - "variationType": "BOOLEAN", - "defaultValue": false, - "targetingKey": "4", - "attributes": { - "country": "Germany" - }, - "result": { - "value": false, - "variant": "off", - "flagMetadata": { - "allocationKey": "off-for-all", - "variationType": "boolean", - "doLog": true - } - } - }, - { - "flag": "kill-switch", - "variationType": "BOOLEAN", - "defaultValue": false, - "targetingKey": "5", - "attributes": { - "country": "Germany" - }, - "result": { - "value": false, - "variant": "off", - "flagMetadata": { - "allocationKey": "off-for-all", - "variationType": "boolean", - "doLog": true - } - } - }, - { - "flag": "kill-switch", - "variationType": "BOOLEAN", - "defaultValue": false, - "targetingKey": "6", - "attributes": { - "country": "Germany" - }, - "result": { - "value": false, - "variant": "off", - "flagMetadata": { - "allocationKey": "off-for-all", - "variationType": "boolean", - "doLog": true - } - } - }, - { - "flag": "kill-switch", - "variationType": "BOOLEAN", - "defaultValue": false, - "targetingKey": "7", - "attributes": { - "country": "US", - "age": 12 - }, - "result": { - "value": true, - "variant": "on", - "flagMetadata": { - "allocationKey": "on-for-NA", - "variationType": "boolean", - "doLog": true - } - } - }, - { - "flag": "kill-switch", - "variationType": "BOOLEAN", - "defaultValue": false, - "targetingKey": "8", - "attributes": { - "country": "Italy", - "age": 60 - }, - "result": { - "value": true, - "variant": "on", - "flagMetadata": { - "allocationKey": "on-for-age-50+", - "variationType": "boolean", - "doLog": true - } - } - }, - { - "flag": "kill-switch", - "variationType": "BOOLEAN", - "defaultValue": false, - "targetingKey": "9", - "attributes": { - "email": "email@email.com" - }, - "result": { - "value": false, - "variant": "off", - "flagMetadata": { - "allocationKey": "off-for-all", - "variationType": "boolean", - "doLog": true - } - } - }, - { - "flag": "kill-switch", - "variationType": "BOOLEAN", - "defaultValue": false, - "targetingKey": "10", - "attributes": {}, - "result": { - "value": false, - "variant": "off", - "flagMetadata": { - "allocationKey": "off-for-all", - "variationType": "boolean", - "doLog": true - } - } - }, - { - "flag": "kill-switch", - "variationType": "BOOLEAN", - "defaultValue": false, - "targetingKey": "11", - "attributes": {}, - "result": { - "value": false, - "variant": "off", - "flagMetadata": { - "allocationKey": "off-for-all", - "variationType": "boolean", - "doLog": true - } - } - }, - { - "flag": "kill-switch", - "variationType": "BOOLEAN", - "defaultValue": false, - "targetingKey": "12", - "attributes": { - "country": "US" - }, - "result": { - "value": true, - "variant": "on", - "flagMetadata": { - "allocationKey": "on-for-NA", - "variationType": "boolean", - "doLog": true - } - } - }, - { - "flag": "kill-switch", - "variationType": "BOOLEAN", - "defaultValue": false, - "targetingKey": "13", - "attributes": { - "country": "Canada" - }, - "result": { - "value": true, - "variant": "on", - "flagMetadata": { - "allocationKey": "on-for-NA", - "variationType": "boolean", - "doLog": true - } - } - }, - { - "flag": "kill-switch", - "variationType": "BOOLEAN", - "defaultValue": false, - "targetingKey": "14", - "attributes": {}, - "result": { - "value": false, - "variant": "off", - "flagMetadata": { - "allocationKey": "off-for-all", - "variationType": "boolean", - "doLog": true - } - } - }, - { - "flag": "kill-switch", - "variationType": "BOOLEAN", - "defaultValue": false, - "targetingKey": "15", - "attributes": { - "country": "Denmark" - }, - "result": { - "value": false, - "variant": "off", - "flagMetadata": { - "allocationKey": "off-for-all", - "variationType": "boolean", - "doLog": true - } - } - }, - { - "flag": "kill-switch", - "variationType": "BOOLEAN", - "defaultValue": false, - "targetingKey": "16", - "attributes": { - "country": "Norway" - }, - "result": { - "value": false, - "variant": "off", - "flagMetadata": { - "allocationKey": "off-for-all", - "variationType": "boolean", - "doLog": true - } - } - }, - { - "flag": "kill-switch", - "variationType": "BOOLEAN", - "defaultValue": false, - "targetingKey": "17", - "attributes": { - "country": "UK" - }, - "result": { - "value": false, - "variant": "off", - "flagMetadata": { - "allocationKey": "off-for-all", - "variationType": "boolean", - "doLog": true - } - } - }, - { - "flag": "kill-switch", - "variationType": "BOOLEAN", - "defaultValue": false, - "targetingKey": "18", - "attributes": { - "country": "UK" - }, - "result": { - "value": false, - "variant": "off", - "flagMetadata": { - "allocationKey": "off-for-all", - "variationType": "boolean", - "doLog": true - } - } - }, - { - "flag": "kill-switch", - "variationType": "BOOLEAN", - "defaultValue": false, - "targetingKey": "19", - "attributes": { - "country": "UK" - }, - "result": { - "value": false, - "variant": "off", - "flagMetadata": { - "allocationKey": "off-for-all", - "variationType": "boolean", - "doLog": true - } - } - } -] diff --git a/dd-smoke-tests/openfeature/src/test/resources/data/test-case-microsecond-date-flag.json b/dd-smoke-tests/openfeature/src/test/resources/data/test-case-microsecond-date-flag.json deleted file mode 100644 index d363b260c42..00000000000 --- a/dd-smoke-tests/openfeature/src/test/resources/data/test-case-microsecond-date-flag.json +++ /dev/null @@ -1,54 +0,0 @@ -[ - { - "flag": "microsecond-date-test", - "variationType": "STRING", - "defaultValue": "unknown", - "targetingKey": "alice", - "attributes": {}, - "result": { - "value": "active", - "variant": "active", - "flagMetadata": { - "allocationKey": "active-allocation", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "microsecond-date-test", - "variationType": "STRING", - "defaultValue": "unknown", - "targetingKey": "bob", - "attributes": { - "country": "US" - }, - "result": { - "value": "active", - "variant": "active", - "flagMetadata": { - "allocationKey": "active-allocation", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "microsecond-date-test", - "variationType": "STRING", - "defaultValue": "unknown", - "targetingKey": "charlie", - "attributes": { - "version": "1.0.0" - }, - "result": { - "value": "active", - "variant": "active", - "flagMetadata": { - "allocationKey": "active-allocation", - "variationType": "string", - "doLog": true - } - } - } -] diff --git a/dd-smoke-tests/openfeature/src/test/resources/data/test-case-new-user-onboarding-flag.json b/dd-smoke-tests/openfeature/src/test/resources/data/test-case-new-user-onboarding-flag.json deleted file mode 100644 index 3845597270e..00000000000 --- a/dd-smoke-tests/openfeature/src/test/resources/data/test-case-new-user-onboarding-flag.json +++ /dev/null @@ -1,420 +0,0 @@ -[ - { - "flag": "new-user-onboarding", - "variationType": "STRING", - "defaultValue": "default", - "targetingKey": "alice", - "attributes": { - "email": "alice@mycompany.com", - "country": "US" - }, - "result": { - "value": "green", - "variant": "green", - "flagMetadata": { - "allocationKey": "internal users", - "variationType": "string", - "doLog": false - } - } - }, - { - "flag": "new-user-onboarding", - "variationType": "STRING", - "defaultValue": "default", - "targetingKey": "bob", - "attributes": { - "email": "bob@example.com", - "country": "Canada" - }, - "result": { - "value": "default" - } - }, - { - "flag": "new-user-onboarding", - "variationType": "STRING", - "defaultValue": "default", - "targetingKey": "charlie", - "attributes": { - "age": 50 - }, - "result": { - "value": "default" - } - }, - { - "flag": "new-user-onboarding", - "variationType": "STRING", - "defaultValue": "default", - "targetingKey": "debra", - "attributes": { - "email": "test@test.com", - "country": "Mexico", - "age": 25 - }, - "result": { - "value": "blue", - "variant": "blue", - "flagMetadata": { - "allocationKey": "rollout", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "new-user-onboarding", - "variationType": "STRING", - "defaultValue": "default", - "targetingKey": "zach", - "attributes": { - "email": "test@test.com", - "country": "Mexico", - "age": 25 - }, - "result": { - "value": "purple", - "variant": "purple", - "flagMetadata": { - "allocationKey": "id rule", - "variationType": "string", - "doLog": false - } - } - }, - { - "flag": "new-user-onboarding", - "variationType": "STRING", - "defaultValue": "default", - "targetingKey": "zach", - "attributes": { - "id": "override-id", - "email": "test@test.com", - "country": "Mexico", - "age": 25 - }, - "result": { - "value": "blue", - "variant": "blue", - "flagMetadata": { - "allocationKey": "rollout", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "new-user-onboarding", - "variationType": "STRING", - "defaultValue": "default", - "targetingKey": "Zach", - "attributes": { - "email": "test@test.com", - "country": "Mexico", - "age": 25 - }, - "result": { - "value": "default" - } - }, - { - "flag": "new-user-onboarding", - "variationType": "STRING", - "defaultValue": "default", - "targetingKey": "1", - "attributes": {}, - "result": { - "value": "default" - } - }, - { - "flag": "new-user-onboarding", - "variationType": "STRING", - "defaultValue": "default", - "targetingKey": "2", - "attributes": { - "country": "Mexico" - }, - "result": { - "value": "blue", - "variant": "blue", - "flagMetadata": { - "allocationKey": "rollout", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "new-user-onboarding", - "variationType": "STRING", - "defaultValue": "default", - "targetingKey": "3", - "attributes": { - "country": "UK", - "age": 33 - }, - "result": { - "value": "control", - "variant": "control", - "flagMetadata": { - "allocationKey": "experiment", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "new-user-onboarding", - "variationType": "STRING", - "defaultValue": "default", - "targetingKey": "4", - "attributes": { - "country": "Germany" - }, - "result": { - "value": "red", - "variant": "red", - "flagMetadata": { - "allocationKey": "experiment", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "new-user-onboarding", - "variationType": "STRING", - "defaultValue": "default", - "targetingKey": "5", - "attributes": { - "country": "Germany" - }, - "result": { - "value": "yellow", - "variant": "yellow", - "flagMetadata": { - "allocationKey": "experiment", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "new-user-onboarding", - "variationType": "STRING", - "defaultValue": "default", - "targetingKey": "6", - "attributes": { - "country": "Germany" - }, - "result": { - "value": "yellow", - "variant": "yellow", - "flagMetadata": { - "allocationKey": "experiment", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "new-user-onboarding", - "variationType": "STRING", - "defaultValue": "default", - "targetingKey": "7", - "attributes": { - "country": "US" - }, - "result": { - "value": "blue", - "variant": "blue", - "flagMetadata": { - "allocationKey": "rollout", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "new-user-onboarding", - "variationType": "STRING", - "defaultValue": "default", - "targetingKey": "8", - "attributes": { - "country": "Italy" - }, - "result": { - "value": "red", - "variant": "red", - "flagMetadata": { - "allocationKey": "experiment", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "new-user-onboarding", - "variationType": "STRING", - "defaultValue": "default", - "targetingKey": "9", - "attributes": { - "email": "email@email.com" - }, - "result": { - "value": "default" - } - }, - { - "flag": "new-user-onboarding", - "variationType": "STRING", - "defaultValue": "default", - "targetingKey": "10", - "attributes": {}, - "result": { - "value": "default" - } - }, - { - "flag": "new-user-onboarding", - "variationType": "STRING", - "defaultValue": "default", - "targetingKey": "11", - "attributes": {}, - "result": { - "value": "default" - } - }, - { - "flag": "new-user-onboarding", - "variationType": "STRING", - "defaultValue": "default", - "targetingKey": "12", - "attributes": { - "country": "US" - }, - "result": { - "value": "blue", - "variant": "blue", - "flagMetadata": { - "allocationKey": "rollout", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "new-user-onboarding", - "variationType": "STRING", - "defaultValue": "default", - "targetingKey": "13", - "attributes": { - "country": "Canada" - }, - "result": { - "value": "blue", - "variant": "blue", - "flagMetadata": { - "allocationKey": "rollout", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "new-user-onboarding", - "variationType": "STRING", - "defaultValue": "default", - "targetingKey": "14", - "attributes": {}, - "result": { - "value": "default" - } - }, - { - "flag": "new-user-onboarding", - "variationType": "STRING", - "defaultValue": "default", - "targetingKey": "15", - "attributes": { - "country": "Denmark" - }, - "result": { - "value": "yellow", - "variant": "yellow", - "flagMetadata": { - "allocationKey": "experiment", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "new-user-onboarding", - "variationType": "STRING", - "defaultValue": "default", - "targetingKey": "16", - "attributes": { - "country": "Norway" - }, - "result": { - "value": "control", - "variant": "control", - "flagMetadata": { - "allocationKey": "experiment", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "new-user-onboarding", - "variationType": "STRING", - "defaultValue": "default", - "targetingKey": "17", - "attributes": { - "country": "UK" - }, - "result": { - "value": "control", - "variant": "control", - "flagMetadata": { - "allocationKey": "experiment", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "new-user-onboarding", - "variationType": "STRING", - "defaultValue": "default", - "targetingKey": "18", - "attributes": { - "country": "UK" - }, - "result": { - "value": "default" - } - }, - { - "flag": "new-user-onboarding", - "variationType": "STRING", - "defaultValue": "default", - "targetingKey": "19", - "attributes": { - "country": "UK" - }, - "result": { - "value": "red", - "variant": "red", - "flagMetadata": { - "allocationKey": "experiment", - "variationType": "string", - "doLog": true - } - } - } -] diff --git a/dd-smoke-tests/openfeature/src/test/resources/data/test-case-no-allocations-flag.json b/dd-smoke-tests/openfeature/src/test/resources/data/test-case-no-allocations-flag.json deleted file mode 100644 index 132c39db32a..00000000000 --- a/dd-smoke-tests/openfeature/src/test/resources/data/test-case-no-allocations-flag.json +++ /dev/null @@ -1,52 +0,0 @@ -[ - { - "flag": "no_allocations_flag", - "variationType": "JSON", - "defaultValue": { - "hello": "world" - }, - "targetingKey": "alice", - "attributes": { - "email": "alice@mycompany.com", - "country": "US" - }, - "result": { - "value": { - "hello": "world" - } - } - }, - { - "flag": "no_allocations_flag", - "variationType": "JSON", - "defaultValue": { - "hello": "world" - }, - "targetingKey": "bob", - "attributes": { - "email": "bob@example.com", - "country": "Canada" - }, - "result": { - "value": { - "hello": "world" - } - } - }, - { - "flag": "no_allocations_flag", - "variationType": "JSON", - "defaultValue": { - "hello": "world" - }, - "targetingKey": "charlie", - "attributes": { - "age": 50 - }, - "result": { - "value": { - "hello": "world" - } - } - } -] diff --git a/dd-smoke-tests/openfeature/src/test/resources/data/test-case-null-operator-flag.json b/dd-smoke-tests/openfeature/src/test/resources/data/test-case-null-operator-flag.json deleted file mode 100644 index dd5c687b893..00000000000 --- a/dd-smoke-tests/openfeature/src/test/resources/data/test-case-null-operator-flag.json +++ /dev/null @@ -1,94 +0,0 @@ -[ - { - "flag": "null-operator-test", - "variationType": "STRING", - "defaultValue": "default-null", - "targetingKey": "alice", - "attributes": { - "size": 5, - "country": "US" - }, - "result": { - "value": "old", - "variant": "old", - "flagMetadata": { - "allocationKey": "null-operator", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "null-operator-test", - "variationType": "STRING", - "defaultValue": "default-null", - "targetingKey": "bob", - "attributes": { - "size": 10, - "country": "Canada" - }, - "result": { - "value": "new", - "variant": "new", - "flagMetadata": { - "allocationKey": "not-null-operator", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "null-operator-test", - "variationType": "STRING", - "defaultValue": "default-null", - "targetingKey": "charlie", - "attributes": { - "size": null - }, - "result": { - "value": "old", - "variant": "old", - "flagMetadata": { - "allocationKey": "null-operator", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "null-operator-test", - "variationType": "STRING", - "defaultValue": "default-null", - "targetingKey": "david", - "attributes": { - "size": 26 - }, - "result": { - "value": "new", - "variant": "new", - "flagMetadata": { - "allocationKey": "not-null-operator", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "null-operator-test", - "variationType": "STRING", - "defaultValue": "default-null", - "targetingKey": "elize", - "attributes": { - "country": "UK" - }, - "result": { - "value": "old", - "variant": "old", - "flagMetadata": { - "allocationKey": "null-operator", - "variationType": "string", - "doLog": true - } - } - } -] diff --git a/dd-smoke-tests/openfeature/src/test/resources/data/test-case-numeric-flag.json b/dd-smoke-tests/openfeature/src/test/resources/data/test-case-numeric-flag.json deleted file mode 100644 index 0e6ed8b1b3a..00000000000 --- a/dd-smoke-tests/openfeature/src/test/resources/data/test-case-numeric-flag.json +++ /dev/null @@ -1,58 +0,0 @@ -[ - { - "flag": "numeric_flag", - "variationType": "NUMERIC", - "defaultValue": 0.0, - "targetingKey": "alice", - "attributes": { - "email": "alice@mycompany.com", - "country": "US" - }, - "result": { - "value": 3.1415926, - "variant": "pi", - "flagMetadata": { - "allocationKey": "rollout", - "variationType": "number", - "doLog": true - } - } - }, - { - "flag": "numeric_flag", - "variationType": "NUMERIC", - "defaultValue": 0.0, - "targetingKey": "bob", - "attributes": { - "email": "bob@example.com", - "country": "Canada" - }, - "result": { - "value": 3.1415926, - "variant": "pi", - "flagMetadata": { - "allocationKey": "rollout", - "variationType": "number", - "doLog": true - } - } - }, - { - "flag": "numeric_flag", - "variationType": "NUMERIC", - "defaultValue": 0.0, - "targetingKey": "charlie", - "attributes": { - "age": 50 - }, - "result": { - "value": 3.1415926, - "variant": "pi", - "flagMetadata": { - "allocationKey": "rollout", - "variationType": "number", - "doLog": true - } - } - } -] diff --git a/dd-smoke-tests/openfeature/src/test/resources/data/test-case-numeric-one-of.json b/dd-smoke-tests/openfeature/src/test/resources/data/test-case-numeric-one-of.json deleted file mode 100644 index 5ab68af5196..00000000000 --- a/dd-smoke-tests/openfeature/src/test/resources/data/test-case-numeric-one-of.json +++ /dev/null @@ -1,122 +0,0 @@ -[ - { - "flag": "numeric-one-of", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "alice", - "attributes": { - "number": 1 - }, - "result": { - "value": 1, - "variant": "1", - "flagMetadata": { - "allocationKey": "1-for-1", - "variationType": "number", - "doLog": true - } - } - }, - { - "flag": "numeric-one-of", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "bob", - "attributes": { - "number": 2 - }, - "result": { - "value": 0 - } - }, - { - "flag": "numeric-one-of", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "charlie", - "attributes": { - "number": 3 - }, - "result": { - "value": 3, - "variant": "3", - "flagMetadata": { - "allocationKey": "3-for-not-2", - "variationType": "number", - "doLog": true - } - } - }, - { - "flag": "numeric-one-of", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "derek", - "attributes": { - "number": 4 - }, - "result": { - "value": 3, - "variant": "3", - "flagMetadata": { - "allocationKey": "3-for-not-2", - "variationType": "number", - "doLog": true - } - } - }, - { - "flag": "numeric-one-of", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "erica", - "attributes": { - "number": "1" - }, - "result": { - "value": 1, - "variant": "1", - "flagMetadata": { - "allocationKey": "1-for-1", - "variationType": "number", - "doLog": true - } - } - }, - { - "flag": "numeric-one-of", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "frank", - "attributes": { - "number": 1 - }, - "result": { - "value": 1, - "variant": "1", - "flagMetadata": { - "allocationKey": "1-for-1", - "variationType": "number", - "doLog": true - } - } - }, - { - "flag": "numeric-one-of", - "variationType": "INTEGER", - "defaultValue": 0, - "targetingKey": "george", - "attributes": { - "number": 123456789 - }, - "result": { - "value": 2, - "variant": "2", - "flagMetadata": { - "allocationKey": "2-for-123456789", - "variationType": "number", - "doLog": true - } - } - } -] diff --git a/dd-smoke-tests/openfeature/src/test/resources/data/test-case-race-conditions.json b/dd-smoke-tests/openfeature/src/test/resources/data/test-case-race-conditions.json deleted file mode 100644 index fa940c843b4..00000000000 --- a/dd-smoke-tests/openfeature/src/test/resources/data/test-case-race-conditions.json +++ /dev/null @@ -1,10 +0,0 @@ -[ - { - "flag": "numeric-one-of", - "variationType": "INTEGER", - "defaultValue": 0, - "result": { - "value": 0 - } - } -] diff --git a/dd-smoke-tests/openfeature/src/test/resources/data/test-case-regex-flag.json b/dd-smoke-tests/openfeature/src/test/resources/data/test-case-regex-flag.json deleted file mode 100644 index 952a37aabcf..00000000000 --- a/dd-smoke-tests/openfeature/src/test/resources/data/test-case-regex-flag.json +++ /dev/null @@ -1,65 +0,0 @@ -[ - { - "flag": "regex-flag", - "variationType": "STRING", - "defaultValue": "none", - "targetingKey": "alice", - "attributes": { - "version": "1.15.0", - "email": "alice@example.com" - }, - "result": { - "value": "partial-example", - "variant": "partial-example", - "flagMetadata": { - "allocationKey": "partial-example", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "regex-flag", - "variationType": "STRING", - "defaultValue": "none", - "targetingKey": "bob", - "attributes": { - "version": "0.20.1", - "email": "bob@test.com" - }, - "result": { - "value": "test", - "variant": "test", - "flagMetadata": { - "allocationKey": "test", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "regex-flag", - "variationType": "STRING", - "defaultValue": "none", - "targetingKey": "charlie", - "attributes": { - "version": "2.1.13" - }, - "result": { - "value": "none" - } - }, - { - "flag": "regex-flag", - "variationType": "STRING", - "defaultValue": "none", - "targetingKey": "derek", - "attributes": { - "version": "2.1.13", - "email": "derek@gmail.com" - }, - "result": { - "value": "none" - } - } -] diff --git a/dd-smoke-tests/openfeature/src/test/resources/data/test-case-start-and-end-date-flag.json b/dd-smoke-tests/openfeature/src/test/resources/data/test-case-start-and-end-date-flag.json deleted file mode 100644 index caf805d1432..00000000000 --- a/dd-smoke-tests/openfeature/src/test/resources/data/test-case-start-and-end-date-flag.json +++ /dev/null @@ -1,58 +0,0 @@ -[ - { - "flag": "start-and-end-date-test", - "variationType": "STRING", - "defaultValue": "unknown", - "targetingKey": "alice", - "attributes": { - "version": "1.15.0", - "country": "US" - }, - "result": { - "value": "current", - "variant": "current", - "flagMetadata": { - "allocationKey": "current-versions", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "start-and-end-date-test", - "variationType": "STRING", - "defaultValue": "unknown", - "targetingKey": "bob", - "attributes": { - "version": "0.20.1", - "country": "Canada" - }, - "result": { - "value": "current", - "variant": "current", - "flagMetadata": { - "allocationKey": "current-versions", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "start-and-end-date-test", - "variationType": "STRING", - "defaultValue": "unknown", - "targetingKey": "charlie", - "attributes": { - "version": "2.1.13" - }, - "result": { - "value": "current", - "variant": "current", - "flagMetadata": { - "allocationKey": "current-versions", - "variationType": "string", - "doLog": true - } - } - } -] diff --git a/dd-smoke-tests/openfeature/src/test/resources/data/test-flag-that-does-not-exist.json b/dd-smoke-tests/openfeature/src/test/resources/data/test-flag-that-does-not-exist.json deleted file mode 100644 index 7499bba1c50..00000000000 --- a/dd-smoke-tests/openfeature/src/test/resources/data/test-flag-that-does-not-exist.json +++ /dev/null @@ -1,40 +0,0 @@ -[ - { - "flag": "flag-that-does-not-exist", - "variationType": "NUMERIC", - "defaultValue": 0.0, - "targetingKey": "alice", - "attributes": { - "email": "alice@mycompany.com", - "country": "US" - }, - "result": { - "value": 0.0 - } - }, - { - "flag": "flag-that-does-not-exist", - "variationType": "NUMERIC", - "defaultValue": 0.0, - "targetingKey": "bob", - "attributes": { - "email": "bob@example.com", - "country": "Canada" - }, - "result": { - "value": 0.0 - } - }, - { - "flag": "flag-that-does-not-exist", - "variationType": "NUMERIC", - "defaultValue": 0.0, - "targetingKey": "charlie", - "attributes": { - "age": 50 - }, - "result": { - "value": 0.0 - } - } -] diff --git a/dd-smoke-tests/openfeature/src/test/resources/data/test-json-config-flag.json b/dd-smoke-tests/openfeature/src/test/resources/data/test-json-config-flag.json deleted file mode 100644 index 3d4478ff711..00000000000 --- a/dd-smoke-tests/openfeature/src/test/resources/data/test-json-config-flag.json +++ /dev/null @@ -1,96 +0,0 @@ -[ - { - "flag": "json-config-flag", - "variationType": "JSON", - "defaultValue": { - "foo": "bar" - }, - "targetingKey": "alice", - "attributes": { - "email": "alice@mycompany.com", - "country": "US" - }, - "result": { - "value": { - "integer": 1, - "string": "one", - "float": 1.0 - }, - "variant": "one", - "flagMetadata": { - "allocationKey": "50/50 split", - "variationType": "object", - "doLog": true - } - } - }, - { - "flag": "json-config-flag", - "variationType": "JSON", - "defaultValue": { - "foo": "bar" - }, - "targetingKey": "bob", - "attributes": { - "email": "bob@example.com", - "country": "Canada" - }, - "result": { - "value": { - "integer": 2, - "string": "two", - "float": 2.0 - }, - "variant": "two", - "flagMetadata": { - "allocationKey": "50/50 split", - "variationType": "object", - "doLog": true - } - } - }, - { - "flag": "json-config-flag", - "variationType": "JSON", - "defaultValue": { - "foo": "bar" - }, - "targetingKey": "charlie", - "attributes": { - "age": 50 - }, - "result": { - "value": { - "integer": 2, - "string": "two", - "float": 2.0 - }, - "variant": "two", - "flagMetadata": { - "allocationKey": "50/50 split", - "variationType": "object", - "doLog": true - } - } - }, - { - "flag": "json-config-flag", - "variationType": "JSON", - "defaultValue": { - "foo": "bar" - }, - "targetingKey": "diana", - "attributes": { - "Force Empty": true - }, - "result": { - "value": {}, - "variant": "empty", - "flagMetadata": { - "allocationKey": "Optionally Force Empty", - "variationType": "object", - "doLog": true - } - } - } -] diff --git a/dd-smoke-tests/openfeature/src/test/resources/data/test-no-allocations-flag.json b/dd-smoke-tests/openfeature/src/test/resources/data/test-no-allocations-flag.json deleted file mode 100644 index 45867e5897c..00000000000 --- a/dd-smoke-tests/openfeature/src/test/resources/data/test-no-allocations-flag.json +++ /dev/null @@ -1,52 +0,0 @@ -[ - { - "flag": "no_allocations_flag", - "variationType": "JSON", - "defaultValue": { - "message": "Hello, world!" - }, - "targetingKey": "alice", - "attributes": { - "email": "alice@mycompany.com", - "country": "US" - }, - "result": { - "value": { - "message": "Hello, world!" - } - } - }, - { - "flag": "no_allocations_flag", - "variationType": "JSON", - "defaultValue": { - "message": "Hello, world!" - }, - "targetingKey": "bob", - "attributes": { - "email": "bob@example.com", - "country": "Canada" - }, - "result": { - "value": { - "message": "Hello, world!" - } - } - }, - { - "flag": "no_allocations_flag", - "variationType": "JSON", - "defaultValue": { - "message": "Hello, world!" - }, - "targetingKey": "charlie", - "attributes": { - "age": 50 - }, - "result": { - "value": { - "message": "Hello, world!" - } - } - } -] diff --git a/dd-smoke-tests/openfeature/src/test/resources/data/test-special-characters.json b/dd-smoke-tests/openfeature/src/test/resources/data/test-special-characters.json deleted file mode 100644 index 59ef5cbe87d..00000000000 --- a/dd-smoke-tests/openfeature/src/test/resources/data/test-special-characters.json +++ /dev/null @@ -1,78 +0,0 @@ -[ - { - "flag": "special-characters", - "variationType": "JSON", - "defaultValue": {}, - "targetingKey": "ash", - "attributes": {}, - "result": { - "value": { - "a": "kümmert", - "b": "schön" - }, - "variant": "de", - "flagMetadata": { - "allocationKey": "allocation-test", - "variationType": "object", - "doLog": true - } - } - }, - { - "flag": "special-characters", - "variationType": "JSON", - "defaultValue": {}, - "targetingKey": "ben", - "attributes": {}, - "result": { - "value": { - "a": "піклуватися", - "b": "любов" - }, - "variant": "ua", - "flagMetadata": { - "allocationKey": "allocation-test", - "variationType": "object", - "doLog": true - } - } - }, - { - "flag": "special-characters", - "variationType": "JSON", - "defaultValue": {}, - "targetingKey": "cameron", - "attributes": {}, - "result": { - "value": { - "a": "照顾", - "b": "漂亮" - }, - "variant": "zh", - "flagMetadata": { - "allocationKey": "allocation-test", - "variationType": "object", - "doLog": true - } - } - }, - { - "flag": "special-characters", - "variationType": "JSON", - "defaultValue": {}, - "targetingKey": "darryl", - "attributes": {}, - "result": { - "value": { - "a": "🤗", - "b": "🌸" - }, - "variant": "emoji", - "flagMetadata": { - "allocationKey": "allocation-test", - "variationType": "object", - "doLog": true - } - } - } -] diff --git a/dd-smoke-tests/openfeature/src/test/resources/data/test-string-with-special-characters.json b/dd-smoke-tests/openfeature/src/test/resources/data/test-string-with-special-characters.json deleted file mode 100644 index 27d063122c0..00000000000 --- a/dd-smoke-tests/openfeature/src/test/resources/data/test-string-with-special-characters.json +++ /dev/null @@ -1,1190 +0,0 @@ -[ - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_spaces", - "attributes": { - "string_with_spaces": true - }, - "result": { - "value": " a b c d e f ", - "variant": "string_with_spaces", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_spaces", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_only_one_space", - "attributes": { - "string_with_only_one_space": true - }, - "result": { - "value": " ", - "variant": "string_with_only_one_space", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_only_one_space", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_only_multiple_spaces", - "attributes": { - "string_with_only_multiple_spaces": true - }, - "result": { - "value": " ", - "variant": "string_with_only_multiple_spaces", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_only_multiple_spaces", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_dots", - "attributes": { - "string_with_dots": true - }, - "result": { - "value": ".a.b.c.d.e.f.", - "variant": "string_with_dots", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_dots", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_only_one_dot", - "attributes": { - "string_with_only_one_dot": true - }, - "result": { - "value": ".", - "variant": "string_with_only_one_dot", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_only_one_dot", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_only_multiple_dots", - "attributes": { - "string_with_only_multiple_dots": true - }, - "result": { - "value": ".......", - "variant": "string_with_only_multiple_dots", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_only_multiple_dots", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_comas", - "attributes": { - "string_with_comas": true - }, - "result": { - "value": ",a,b,c,d,e,f,", - "variant": "string_with_comas", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_comas", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_only_one_coma", - "attributes": { - "string_with_only_one_coma": true - }, - "result": { - "value": ",", - "variant": "string_with_only_one_coma", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_only_one_coma", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_only_multiple_comas", - "attributes": { - "string_with_only_multiple_comas": true - }, - "result": { - "value": ",,,,,,,", - "variant": "string_with_only_multiple_comas", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_only_multiple_comas", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_colons", - "attributes": { - "string_with_colons": true - }, - "result": { - "value": ":a:b:c:d:e:f:", - "variant": "string_with_colons", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_colons", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_only_one_colon", - "attributes": { - "string_with_only_one_colon": true - }, - "result": { - "value": ":", - "variant": "string_with_only_one_colon", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_only_one_colon", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_only_multiple_colons", - "attributes": { - "string_with_only_multiple_colons": true - }, - "result": { - "value": ":::::::", - "variant": "string_with_only_multiple_colons", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_only_multiple_colons", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_semicolons", - "attributes": { - "string_with_semicolons": true - }, - "result": { - "value": ";a;b;c;d;e;f;", - "variant": "string_with_semicolons", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_semicolons", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_only_one_semicolon", - "attributes": { - "string_with_only_one_semicolon": true - }, - "result": { - "value": ";", - "variant": "string_with_only_one_semicolon", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_only_one_semicolon", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_only_multiple_semicolons", - "attributes": { - "string_with_only_multiple_semicolons": true - }, - "result": { - "value": ";;;;;;;", - "variant": "string_with_only_multiple_semicolons", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_only_multiple_semicolons", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_slashes", - "attributes": { - "string_with_slashes": true - }, - "result": { - "value": "/a/b/c/d/e/f/", - "variant": "string_with_slashes", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_slashes", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_only_one_slash", - "attributes": { - "string_with_only_one_slash": true - }, - "result": { - "value": "/", - "variant": "string_with_only_one_slash", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_only_one_slash", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_only_multiple_slashes", - "attributes": { - "string_with_only_multiple_slashes": true - }, - "result": { - "value": "///////", - "variant": "string_with_only_multiple_slashes", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_only_multiple_slashes", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_dashes", - "attributes": { - "string_with_dashes": true - }, - "result": { - "value": "-a-b-c-d-e-f-", - "variant": "string_with_dashes", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_dashes", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_only_one_dash", - "attributes": { - "string_with_only_one_dash": true - }, - "result": { - "value": "-", - "variant": "string_with_only_one_dash", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_only_one_dash", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_only_multiple_dashes", - "attributes": { - "string_with_only_multiple_dashes": true - }, - "result": { - "value": "-------", - "variant": "string_with_only_multiple_dashes", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_only_multiple_dashes", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_underscores", - "attributes": { - "string_with_underscores": true - }, - "result": { - "value": "_a_b_c_d_e_f_", - "variant": "string_with_underscores", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_underscores", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_only_one_underscore", - "attributes": { - "string_with_only_one_underscore": true - }, - "result": { - "value": "_", - "variant": "string_with_only_one_underscore", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_only_one_underscore", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_only_multiple_underscores", - "attributes": { - "string_with_only_multiple_underscores": true - }, - "result": { - "value": "_______", - "variant": "string_with_only_multiple_underscores", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_only_multiple_underscores", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_plus_signs", - "attributes": { - "string_with_plus_signs": true - }, - "result": { - "value": "+a+b+c+d+e+f+", - "variant": "string_with_plus_signs", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_plus_signs", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_only_one_plus_sign", - "attributes": { - "string_with_only_one_plus_sign": true - }, - "result": { - "value": "+", - "variant": "string_with_only_one_plus_sign", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_only_one_plus_sign", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_only_multiple_plus_signs", - "attributes": { - "string_with_only_multiple_plus_signs": true - }, - "result": { - "value": "+++++++", - "variant": "string_with_only_multiple_plus_signs", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_only_multiple_plus_signs", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_equal_signs", - "attributes": { - "string_with_equal_signs": true - }, - "result": { - "value": "=a=b=c=d=e=f=", - "variant": "string_with_equal_signs", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_equal_signs", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_only_one_equal_sign", - "attributes": { - "string_with_only_one_equal_sign": true - }, - "result": { - "value": "=", - "variant": "string_with_only_one_equal_sign", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_only_one_equal_sign", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_only_multiple_equal_signs", - "attributes": { - "string_with_only_multiple_equal_signs": true - }, - "result": { - "value": "=======", - "variant": "string_with_only_multiple_equal_signs", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_only_multiple_equal_signs", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_dollar_signs", - "attributes": { - "string_with_dollar_signs": true - }, - "result": { - "value": "$a$b$c$d$e$f$", - "variant": "string_with_dollar_signs", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_dollar_signs", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_only_one_dollar_sign", - "attributes": { - "string_with_only_one_dollar_sign": true - }, - "result": { - "value": "$", - "variant": "string_with_only_one_dollar_sign", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_only_one_dollar_sign", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_only_multiple_dollar_signs", - "attributes": { - "string_with_only_multiple_dollar_signs": true - }, - "result": { - "value": "$$$$$$$", - "variant": "string_with_only_multiple_dollar_signs", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_only_multiple_dollar_signs", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_at_signs", - "attributes": { - "string_with_at_signs": true - }, - "result": { - "value": "@a@b@c@d@e@f@", - "variant": "string_with_at_signs", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_at_signs", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_only_one_at_sign", - "attributes": { - "string_with_only_one_at_sign": true - }, - "result": { - "value": "@", - "variant": "string_with_only_one_at_sign", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_only_one_at_sign", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_only_multiple_at_signs", - "attributes": { - "string_with_only_multiple_at_signs": true - }, - "result": { - "value": "@@@@@@@", - "variant": "string_with_only_multiple_at_signs", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_only_multiple_at_signs", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_amp_signs", - "attributes": { - "string_with_amp_signs": true - }, - "result": { - "value": "&a&b&c&d&e&f&", - "variant": "string_with_amp_signs", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_amp_signs", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_only_one_amp_sign", - "attributes": { - "string_with_only_one_amp_sign": true - }, - "result": { - "value": "&", - "variant": "string_with_only_one_amp_sign", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_only_one_amp_sign", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_only_multiple_amp_signs", - "attributes": { - "string_with_only_multiple_amp_signs": true - }, - "result": { - "value": "&&&&&&&", - "variant": "string_with_only_multiple_amp_signs", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_only_multiple_amp_signs", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_hash_signs", - "attributes": { - "string_with_hash_signs": true - }, - "result": { - "value": "#a#b#c#d#e#f#", - "variant": "string_with_hash_signs", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_hash_signs", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_only_one_hash_sign", - "attributes": { - "string_with_only_one_hash_sign": true - }, - "result": { - "value": "#", - "variant": "string_with_only_one_hash_sign", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_only_one_hash_sign", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_only_multiple_hash_signs", - "attributes": { - "string_with_only_multiple_hash_signs": true - }, - "result": { - "value": "#######", - "variant": "string_with_only_multiple_hash_signs", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_only_multiple_hash_signs", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_percentage_signs", - "attributes": { - "string_with_percentage_signs": true - }, - "result": { - "value": "%a%b%c%d%e%f%", - "variant": "string_with_percentage_signs", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_percentage_signs", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_only_one_percentage_sign", - "attributes": { - "string_with_only_one_percentage_sign": true - }, - "result": { - "value": "%", - "variant": "string_with_only_one_percentage_sign", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_only_one_percentage_sign", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_only_multiple_percentage_signs", - "attributes": { - "string_with_only_multiple_percentage_signs": true - }, - "result": { - "value": "%%%%%%%", - "variant": "string_with_only_multiple_percentage_signs", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_only_multiple_percentage_signs", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_tilde_signs", - "attributes": { - "string_with_tilde_signs": true - }, - "result": { - "value": "~a~b~c~d~e~f~", - "variant": "string_with_tilde_signs", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_tilde_signs", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_only_one_tilde_sign", - "attributes": { - "string_with_only_one_tilde_sign": true - }, - "result": { - "value": "~", - "variant": "string_with_only_one_tilde_sign", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_only_one_tilde_sign", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_only_multiple_tilde_signs", - "attributes": { - "string_with_only_multiple_tilde_signs": true - }, - "result": { - "value": "~~~~~~~", - "variant": "string_with_only_multiple_tilde_signs", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_only_multiple_tilde_signs", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_asterix_signs", - "attributes": { - "string_with_asterix_signs": true - }, - "result": { - "value": "*a*b*c*d*e*f*", - "variant": "string_with_asterix_signs", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_asterix_signs", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_only_one_asterix_sign", - "attributes": { - "string_with_only_one_asterix_sign": true - }, - "result": { - "value": "*", - "variant": "string_with_only_one_asterix_sign", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_only_one_asterix_sign", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_only_multiple_asterix_signs", - "attributes": { - "string_with_only_multiple_asterix_signs": true - }, - "result": { - "value": "*******", - "variant": "string_with_only_multiple_asterix_signs", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_only_multiple_asterix_signs", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_single_quotes", - "attributes": { - "string_with_single_quotes": true - }, - "result": { - "value": "'a'b'c'd'e'f'", - "variant": "string_with_single_quotes", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_single_quotes", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_only_one_single_quote", - "attributes": { - "string_with_only_one_single_quote": true - }, - "result": { - "value": "'", - "variant": "string_with_only_one_single_quote", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_only_one_single_quote", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_only_multiple_single_quotes", - "attributes": { - "string_with_only_multiple_single_quotes": true - }, - "result": { - "value": "'''''''", - "variant": "string_with_only_multiple_single_quotes", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_only_multiple_single_quotes", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_question_marks", - "attributes": { - "string_with_question_marks": true - }, - "result": { - "value": "?a?b?c?d?e?f?", - "variant": "string_with_question_marks", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_question_marks", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_only_one_question_mark", - "attributes": { - "string_with_only_one_question_mark": true - }, - "result": { - "value": "?", - "variant": "string_with_only_one_question_mark", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_only_one_question_mark", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_only_multiple_question_marks", - "attributes": { - "string_with_only_multiple_question_marks": true - }, - "result": { - "value": "???????", - "variant": "string_with_only_multiple_question_marks", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_only_multiple_question_marks", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_exclamation_marks", - "attributes": { - "string_with_exclamation_marks": true - }, - "result": { - "value": "!a!b!c!d!e!f!", - "variant": "string_with_exclamation_marks", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_exclamation_marks", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_only_one_exclamation_mark", - "attributes": { - "string_with_only_one_exclamation_mark": true - }, - "result": { - "value": "!", - "variant": "string_with_only_one_exclamation_mark", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_only_one_exclamation_mark", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_only_multiple_exclamation_marks", - "attributes": { - "string_with_only_multiple_exclamation_marks": true - }, - "result": { - "value": "!!!!!!!", - "variant": "string_with_only_multiple_exclamation_marks", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_only_multiple_exclamation_marks", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_opening_parentheses", - "attributes": { - "string_with_opening_parentheses": true - }, - "result": { - "value": "(a(b(c(d(e(f(", - "variant": "string_with_opening_parentheses", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_opening_parentheses", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_only_one_opening_parenthese", - "attributes": { - "string_with_only_one_opening_parenthese": true - }, - "result": { - "value": "(", - "variant": "string_with_only_one_opening_parenthese", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_only_one_opening_parenthese", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_only_multiple_opening_parentheses", - "attributes": { - "string_with_only_multiple_opening_parentheses": true - }, - "result": { - "value": "(((((((", - "variant": "string_with_only_multiple_opening_parentheses", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_only_multiple_opening_parentheses", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_closing_parentheses", - "attributes": { - "string_with_closing_parentheses": true - }, - "result": { - "value": ")a)b)c)d)e)f)", - "variant": "string_with_closing_parentheses", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_closing_parentheses", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_only_one_closing_parenthese", - "attributes": { - "string_with_only_one_closing_parenthese": true - }, - "result": { - "value": ")", - "variant": "string_with_only_one_closing_parenthese", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_only_one_closing_parenthese", - "variationType": "string", - "doLog": true - } - } - }, - { - "flag": "string_flag_with_special_characters", - "variationType": "STRING", - "defaultValue": "default_value", - "targetingKey": "string_with_only_multiple_closing_parentheses", - "attributes": { - "string_with_only_multiple_closing_parentheses": true - }, - "result": { - "value": ")))))))", - "variant": "string_with_only_multiple_closing_parentheses", - "flagMetadata": { - "allocationKey": "allocation-test-string_with_only_multiple_closing_parentheses", - "variationType": "string", - "doLog": true - } - } - } -] diff --git a/dd-smoke-tests/openfeature/src/test/resources/ffe-system-test-data b/dd-smoke-tests/openfeature/src/test/resources/ffe-system-test-data new file mode 160000 index 00000000000..b42c4a104ea --- /dev/null +++ b/dd-smoke-tests/openfeature/src/test/resources/ffe-system-test-data @@ -0,0 +1 @@ +Subproject commit b42c4a104ea70695c8fc3516780951f7434b7906 diff --git a/products/feature-flagging/feature-flagging-api/src/test/java/datadog/trace/api/openfeature/DDEvaluatorTest.java b/products/feature-flagging/feature-flagging-api/src/test/java/datadog/trace/api/openfeature/DDEvaluatorTest.java index bb86c409bad..3421fe3454e 100644 --- a/products/feature-flagging/feature-flagging-api/src/test/java/datadog/trace/api/openfeature/DDEvaluatorTest.java +++ b/products/feature-flagging/feature-flagging-api/src/test/java/datadog/trace/api/openfeature/DDEvaluatorTest.java @@ -1,13 +1,6 @@ package datadog.trace.api.openfeature; -import static dev.openfeature.sdk.ErrorCode.FLAG_NOT_FOUND; -import static dev.openfeature.sdk.ErrorCode.TARGETING_KEY_MISSING; -import static dev.openfeature.sdk.Reason.DEFAULT; -import static dev.openfeature.sdk.Reason.DISABLED; import static dev.openfeature.sdk.Reason.ERROR; -import static dev.openfeature.sdk.Reason.SPLIT; -import static dev.openfeature.sdk.Reason.STATIC; -import static dev.openfeature.sdk.Reason.TARGETING_MATCH; import static java.util.Arrays.asList; import static java.util.Collections.emptyList; import static java.util.Collections.emptyMap; @@ -17,75 +10,59 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.hasEntry; -import static org.hamcrest.Matchers.oneOf; import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import datadog.trace.api.featureflag.FeatureFlaggingGateway; -import datadog.trace.api.featureflag.exposure.ExposureEvent; -import datadog.trace.api.featureflag.ufc.v1.Allocation; -import datadog.trace.api.featureflag.ufc.v1.ConditionConfiguration; -import datadog.trace.api.featureflag.ufc.v1.ConditionOperator; +import com.squareup.moshi.JsonAdapter; +import com.squareup.moshi.JsonDataException; +import com.squareup.moshi.JsonReader; +import com.squareup.moshi.JsonWriter; +import com.squareup.moshi.Moshi; +import com.squareup.moshi.Types; import datadog.trace.api.featureflag.ufc.v1.Flag; -import datadog.trace.api.featureflag.ufc.v1.Rule; import datadog.trace.api.featureflag.ufc.v1.ServerConfiguration; -import datadog.trace.api.featureflag.ufc.v1.Shard; -import datadog.trace.api.featureflag.ufc.v1.ShardRange; -import datadog.trace.api.featureflag.ufc.v1.Split; -import datadog.trace.api.featureflag.ufc.v1.ValueType; -import datadog.trace.api.featureflag.ufc.v1.Variant; -import datadog.trace.api.openfeature.util.TestCase; -import datadog.trace.api.openfeature.util.TestCase.Result; import dev.openfeature.sdk.ErrorCode; import dev.openfeature.sdk.EvaluationContext; import dev.openfeature.sdk.MutableContext; import dev.openfeature.sdk.ProviderEvaluation; import dev.openfeature.sdk.Value; -import java.text.ParseException; -import java.text.SimpleDateFormat; +import java.io.IOException; +import java.lang.reflect.Type; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.time.OffsetDateTime; import java.util.ArrayList; -import java.util.Arrays; import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.TimeZone; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; +import java.util.stream.Collectors; +import java.util.stream.Stream; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.mockito.ArgumentCaptor; -import org.mockito.Captor; -import org.mockito.junit.jupiter.MockitoExtension; -@ExtendWith(MockitoExtension.class) public class DDEvaluatorTest { - @Captor private ArgumentCaptor exposureEventCaptor; - - private FeatureFlaggingGateway.ExposureListener exposureListener; - - @BeforeEach - public void setup() { - exposureListener = mock(FeatureFlaggingGateway.ExposureListener.class); - FeatureFlaggingGateway.addExposureListener(exposureListener); - } - - @AfterEach - public void tearDown() { - FeatureFlaggingGateway.removeExposureListener(exposureListener); - FeatureFlaggingGateway.dispatch((ServerConfiguration) null); - } + private static final String CANONICAL_FIXTURE_PATH = + "dd-smoke-tests/openfeature/src/test/resources/ffe-system-test-data"; + private static final Moshi MOSHI = new Moshi.Builder().add(Date.class, new DateAdapter()).build(); + private static final JsonAdapter CONFIG_ADAPTER = + MOSHI.adapter(ServerConfiguration.class); + private static final Type FIXTURE_LIST_TYPE = + Types.newParameterizedType(List.class, FixtureCase.class); + private static final JsonAdapter> FIXTURE_LIST_ADAPTER = + MOSHI.adapter(FIXTURE_LIST_TYPE); private static Arguments[] valueMappingTestCases() { return new Arguments[] { @@ -214,7 +191,7 @@ public void testNoAllocations() { details = evaluator.evaluate(Integer.class, "empty-allocation", 23, ctx); assertThat(details.getValue(), equalTo(23)); - assertThat(details.getReason(), equalTo(DEFAULT.name())); + assertThat(details.getReason(), equalTo("DEFAULT")); assertThat(details.getErrorCode(), nullValue()); } @@ -250,1111 +227,128 @@ public void testFlattening( } } - private static List> evaluateTestCases() { - return Arrays.asList( - // OF spec 3.1.1: targeting key is optional; static flags must evaluate successfully without - // it - new TestCase<>("default") - .flag("simple-string") - // no .targetingKey() -- null by default - .result(new Result<>("test-value").reason(STATIC.name()).variant("on")), - // Null targeting key on sharded flag must return TARGETING_KEY_MISSING - new TestCase<>("default") - .flag("shard-flag") - // no .targetingKey() -- null - .result(new Result<>("default").reason(ERROR.name()).errorCode(TARGETING_KEY_MISSING)), - // Null targeting key on rule-only flag (matching on non-id attribute) must succeed - new TestCase<>("default") - .flag("country-rule-flag") - // no .targetingKey() -- null - .context("country", "US") - .result(new Result<>("us-value").reason(TARGETING_MATCH.name()).variant("us")), - // OF.7: Empty string is a valid targeting key - evaluation should proceed as normal - new TestCase<>("default") - .flag("simple-string") - .targetingKey("") - .result(new Result<>("test-value").reason(STATIC.name()).variant("on")), - new TestCase<>("default") - .flag("non-existent-flag") - .targetingKey("user-123") - .result(new Result<>("default").reason(ERROR.name()).errorCode(FLAG_NOT_FOUND)), - new TestCase<>("default") - .flag("disabled-flag") - .targetingKey("user-123") - .result(new Result<>("default").reason(DISABLED.name())), - new TestCase<>("default") - .flag("simple-string") - .targetingKey("user-123") - .result(new Result<>("test-value").reason(STATIC.name()).variant("on")), - new TestCase<>(false) - .flag("boolean-flag") - .targetingKey("user-123") - .result(new Result<>(true).reason(STATIC.name()).variant("enabled")), - new TestCase<>(0) - .flag("integer-flag") - .targetingKey("user-123") - .result(new Result<>(42).reason(STATIC.name()).variant("forty-two")), - new TestCase<>("default") - .flag("rule-based-flag") - .targetingKey("user-premium") - .context("email", "john@company.com") - .result(new Result<>("premium").reason(TARGETING_MATCH.name()).variant("premium")), - new TestCase<>("default") - .flag("rule-based-flag") - .targetingKey("user-basic") - .context("email", "john@gmail.com") - .result(new Result<>("basic").reason(STATIC.name()).variant("basic")), - new TestCase<>("default") - .flag("numeric-rule-flag") - .targetingKey("user-vip") - .context("score", 850) - .result(new Result<>("vip").reason(TARGETING_MATCH.name()).variant("vip")), - new TestCase<>("default") - .flag("null-check-flag") - .targetingKey("user-no-beta") - .result(new Result<>("no-beta").reason(TARGETING_MATCH.name()).variant("no-beta")), - new TestCase<>("default") - .flag("region-flag") - .targetingKey("user-regional") - .context("region", "us-east-1") - .result(new Result<>("regional").reason(TARGETING_MATCH.name()).variant("regional")), - new TestCase<>("default") - .flag("time-based-flag") - .targetingKey("user-regional") - .context("region", "us-east-1") - .result(new Result<>("default").reason(DEFAULT.name())), - new TestCase<>("default") - .flag("shard-flag") - .targetingKey("user-shard-test") - .result( - new Result<>("default") - // Result depends on shard calculation - either match or default - .reason(SPLIT.name(), DEFAULT.name())), - // Type mismatch: STRING flag evaluated as Integer - new TestCase<>(0) - .flag("string-number-flag") - .targetingKey("user-123") - .result(new Result<>(0).reason(ERROR.name()).errorCode(ErrorCode.TYPE_MISMATCH)), - // Type mismatch: STRING flag evaluated as Boolean - new TestCase<>(false) - .flag("simple-string") - .targetingKey("user-123") - .result(new Result<>(false).reason(ERROR.name()).errorCode(ErrorCode.TYPE_MISMATCH)), - // Type mismatch: BOOLEAN flag evaluated as String - new TestCase<>("default") - .flag("boolean-flag") - .targetingKey("user-123") - .result( - new Result<>("default").reason(ERROR.name()).errorCode(ErrorCode.TYPE_MISMATCH)), - // Type mismatch: NUMERIC flag evaluated as Integer - new TestCase<>(0) - .flag("double-flag") - .targetingKey("user-123") - .result(new Result<>(0).reason(ERROR.name()).errorCode(ErrorCode.TYPE_MISMATCH)), - // Type mismatch: INTEGER flag evaluated as Double - new TestCase<>(0.0) - .flag("integer-flag") - .targetingKey("user-123") - .result(new Result<>(0.0).reason(ERROR.name()).errorCode(ErrorCode.TYPE_MISMATCH)), - // Variant stores "not-a-number" for an INTEGER flag; Double.parseDouble fails -> - // PARSE_ERROR - new TestCase<>(0) - .flag("integer-string-variant-flag") - .targetingKey("user-123") - .result(new Result<>(0).reason(ERROR.name()).errorCode(ErrorCode.PARSE_ERROR)), - new TestCase<>("default") - .flag("broken-flag") - .targetingKey("user-123") - .result(new Result<>("default").reason(ERROR.name()).errorCode(ErrorCode.GENERAL)), - new TestCase<>("default") - .flag("lt-flag") - .targetingKey("user-123") - .context("score", 750) - .result(new Result<>("low-score").reason(TARGETING_MATCH.name()).variant("low")), - new TestCase<>("default") - .flag("lte-flag") - .targetingKey("user-123") - .context("score", 800) - .result(new Result<>("medium-score").reason(TARGETING_MATCH.name()).variant("medium")), - new TestCase<>("default") - .flag("gt-flag") - .targetingKey("user-123") - .context("score", 950) - .result(new Result<>("high-score").reason(TARGETING_MATCH.name()).variant("high")), - new TestCase<>("default") - .flag("not-matches-flag") - .targetingKey("user-123") - .context("email", "user@yahoo.com") - .result(new Result<>("external").reason(TARGETING_MATCH.name()).variant("external")), - new TestCase<>("default") - .flag("not-one-of-flag") - .targetingKey("user-123") - .context("region", "ap-south-1") - .result(new Result<>("other-region").reason(TARGETING_MATCH.name()).variant("other")), - new TestCase<>("default") - .flag("double-equals-flag") - .targetingKey("user-123") - .context("rate", 3.14159) - .result(new Result<>("pi-value").reason(TARGETING_MATCH.name()).variant("pi")), - new TestCase<>("default") - .flag("nested-attr-flag") - .targetingKey("user-123") - .context("user.profile.level", "premium") - .result(new Result<>("premium-user").reason(TARGETING_MATCH.name()).variant("premium")), - new TestCase<>("default") - .flag("lt-flag") - .targetingKey("user-123") - .context("score", "not-a-number") - .result( - new Result<>("default").reason(ERROR.name()).errorCode(ErrorCode.TYPE_MISMATCH)), - new TestCase<>("default") - .flag("exposure-flag") - .targetingKey("user-123") - .result( - new Result<>("tracked-value") - .reason(STATIC.name()) - .variant("tracked") - .flagMetadata("allocationKey", "exposure-alloc") - .flagMetadata("doLog", true)), - new TestCase<>("default") - .flag("exposure-logging-flag") - .targetingKey("user-exposure") - .context("feature", "premium") - .result( - new Result<>("logged-value") - .reason(TARGETING_MATCH.name()) - .variant("logged") - .flagMetadata("allocationKey", "logged-alloc") - .flagMetadata("doLog", true)), - new TestCase<>("default") - .flag("double-comparison-flag") - .targetingKey("user-123") - .context("score", 3.14159) - .result(new Result<>("exact-match").reason(TARGETING_MATCH.name()).variant("exact")), - new TestCase<>("default") - .flag("numeric-one-of-flag") - .targetingKey("user-123") - .context("score", 3.14159) - .result( - new Result<>("numeric-matched") - .reason(TARGETING_MATCH.name()) - .variant("numeric-match")), - new TestCase<>("default") - .flag("numeric-not-one-of-flag") - .targetingKey("user-123") - .context("score", 42.0) - .result(new Result<>("not-in-set").reason(TARGETING_MATCH.name()).variant("excluded")), - new TestCase<>("default") - .flag("is-null-false-flag") - .targetingKey("user-123") - .context("attr", "value") - .result(new Result<>("not-null").reason(TARGETING_MATCH.name()).variant("not-null")), - new TestCase<>("default") - .flag("is-null-non-boolean-flag") - .targetingKey("user-123") - .result( - new Result<>("null-match").reason(TARGETING_MATCH.name()).variant("null-match")), - new TestCase<>("default") - .flag("null-attribute-flag") - .targetingKey("user-123") - .result(new Result<>("default").reason(DEFAULT.name())), - new TestCase<>("default") - .flag("not-matches-positive-flag") - .targetingKey("user-123") - .context("email", "user@gmail.com") - .result( - new Result<>("external-email").reason(TARGETING_MATCH.name()).variant("external")), - new TestCase<>("default") - .flag("not-one-of-positive-flag") - .targetingKey("user-123") - .context("region", "ap-south-1") - .result(new Result<>("other-region").reason(TARGETING_MATCH.name()).variant("other")), - new TestCase<>("default") - .flag("false-numeric-comparisons-flag") - .targetingKey("user-123") - .context("score", 750) - .result(new Result<>("default").reason(DEFAULT.name())), - new TestCase<>("default") - .flag("empty-splits-flag") - .targetingKey("user-123") - .result(new Result<>("default").reason(DEFAULT.name())), - new TestCase<>("default") - .flag("empty-conditions-flag") - .targetingKey("user-123") - .result(new Result<>("default").reason(DEFAULT.name())), - new TestCase<>("default") - .flag("shard-matching-flag") - .targetingKey("specific-key-that-matches-shard") - .result(new Result<>("shard-matched").reason(SPLIT.name()).variant("matched")), - new TestCase<>("default") - .flag("future-allocation-flag") - .targetingKey("user-123") - .result(new Result<>("default").reason(DEFAULT.name())), - new TestCase<>("default") - .flag("id-attribute-flag") - .targetingKey("user-special-id") - .result(new Result<>("id-resolved").reason(TARGETING_MATCH.name()).variant("id-match")), - new TestCase<>("default") - .flag("non-iterable-condition-flag") - .targetingKey("user-123") - .context("attr", "test-value") - .result(new Result<>("default").reason(DEFAULT.name())), - new TestCase<>("default") - .flag("gt-false-flag") - .targetingKey("user-123") - .context("score", 500) - .result(new Result<>("default").reason(DEFAULT.name())), - new TestCase<>("default") - .flag("lte-false-flag") - .targetingKey("user-123") - .context("score", 600) - .result(new Result<>("default").reason(DEFAULT.name())), - new TestCase<>("default") - .flag("lt-false-flag") - .targetingKey("user-123") - .context("score", 700) - .result(new Result<>("default").reason(DEFAULT.name())), - new TestCase<>("default") - .flag("not-matches-false-flag") - .targetingKey("user-123") - .context("email", "user@company.com") - .result(new Result<>("default").reason(DEFAULT.name())), - new TestCase<>("default") - .flag("not-one-of-false-flag") - .targetingKey("user-123") - .context("region", "us-east-1") - .result(new Result<>("default").reason(DEFAULT.name())), - new TestCase<>("default") - .flag("null-context-values-flag") - .targetingKey("user-123") - .context("nullAttr", (String) null) - .result( - new Result<>("null-handled") - .reason(TARGETING_MATCH.name()) - .variant("null-variant")), - new TestCase<>("default") - .flag("invalid-regex-flag") - .targetingKey("user-123") - .context("email", "user@example.com") - .result(new Result<>("default").reason(ERROR.name()).errorCode(ErrorCode.PARSE_ERROR)), - new TestCase<>("default") - .flag("invalid-regex-not-matches-flag") - .targetingKey("user-123") - .context("email", "user@example.com") - .result(new Result<>("default").reason(ERROR.name()).errorCode(ErrorCode.PARSE_ERROR))); + @Test + public void testCanonicalFixturesArePresent() throws IOException { + assertThat(canonicalTestCases().size(), greaterThan(0)); } - @MethodSource("evaluateTestCases") - @ParameterizedTest - public void testEvaluate(final TestCase testCase) { + @MethodSource("canonicalTestCases") + @ParameterizedTest(name = "{0}") + public void testEvaluateCanonicalFixture(final FixtureCase testCase) throws IOException { final DDEvaluator evaluator = new DDEvaluator(mock(Runnable.class)); - evaluator.accept(createTestConfiguration()); - final ProviderEvaluation details = - evaluator.evaluate(testCase.type, testCase.flag, testCase.defaultValue, testCase.context); - final Result expected = testCase.result; - assertThat(details.getValue(), equalTo(expected.value)); - assertThat(details.getReason(), oneOf(expected.reason)); - assertThat(details.getVariant(), equalTo(expected.variant)); - assertThat(details.getErrorCode(), equalTo(expected.errorCode)); - assertThat(details.getErrorCode(), equalTo(expected.errorCode)); - final String expectedAllocation = (String) expected.flagMetadata.get("allocationKey"); - if (expectedAllocation != null) { - assertThat(details.getFlagMetadata().getString("allocationKey"), equalTo(expectedAllocation)); - } - if (shouldDispatchExposure(expected)) { - verify(exposureListener, times(1)).accept(exposureEventCaptor.capture()); - final ExposureEvent capturedEvent = exposureEventCaptor.getValue(); - assertThat(capturedEvent.flag.key, equalTo(testCase.flag)); - assertThat(capturedEvent.allocation.key, equalTo(expectedAllocation)); - assertThat(capturedEvent.variant.key, equalTo(testCase.result.variant)); - assertThat(capturedEvent.subject.id, equalTo(testCase.context.getTargetingKey())); - for (final Map.Entry entry : testCase.context.asObjectMap().entrySet()) { - assertThat(capturedEvent.subject.attributes, hasEntry(entry.getKey(), entry.getValue())); - } - } else { - verify(exposureListener, times(0)).accept(any(ExposureEvent.class)); - } - } - - private static boolean shouldDispatchExposure(final Result result) { - final Boolean doLog = (Boolean) result.flagMetadata.get("doLog"); - return doLog != null && doLog; - } - - private ServerConfiguration createTestConfiguration() { - final Map flags = new HashMap<>(); - flags.put( - "simple-string", createSimpleFlag("simple-string", ValueType.STRING, "test-value", "on")); - flags.put("boolean-flag", createSimpleFlag("boolean-flag", ValueType.BOOLEAN, true, "enabled")); - flags.put("integer-flag", createSimpleFlag("integer-flag", ValueType.INTEGER, 42, "forty-two")); - flags.put("double-flag", createSimpleFlag("double-flag", ValueType.NUMERIC, 3.14, "pi")); - flags.put( - "string-number-flag", - createSimpleFlag("string-number-flag", ValueType.STRING, "123", "string-num")); - flags.put("disabled-flag", new Flag("disabled-flag", false, ValueType.BOOLEAN, null, null)); - flags.put("rule-based-flag", createRuleBasedFlag()); - flags.put("numeric-rule-flag", createNumericRuleFlag()); - flags.put("null-check-flag", createNullCheckFlag()); - flags.put("region-flag", createOneOfRuleFlag()); - flags.put("time-based-flag", createTimeBasedFlag()); - flags.put("shard-flag", createShardBasedFlag()); - flags.put("broken-flag", createBrokenFlag()); - flags.put("lt-flag", createLessThanFlag()); - flags.put("lte-flag", createLessThanOrEqualFlag()); - flags.put("gt-flag", createGreaterThanFlag()); - flags.put("not-matches-flag", createNotMatchesFlag()); - flags.put("not-one-of-flag", createNotOneOfFlag()); - flags.put("double-equals-flag", createDoubleEqualsFlag()); - flags.put("nested-attr-flag", createNestedAttributeFlag()); - flags.put("exposure-flag", createExposureFlag()); - flags.put("exposure-logging-flag", createExposureLoggingFlag()); - flags.put("double-comparison-flag", createDoubleComparisonFlag()); - flags.put("numeric-one-of-flag", createNumericOneOfFlag()); - flags.put("numeric-not-one-of-flag", createNumericNotOneOfFlag()); - flags.put("is-null-false-flag", createIsNullFalseFlag()); - flags.put("is-null-non-boolean-flag", createIsNullNonBooleanFlag()); - flags.put("null-attribute-flag", createNullAttributeFlag()); - flags.put("not-matches-positive-flag", createNotMatchesPositiveFlag()); - flags.put("not-one-of-positive-flag", createNotOneOfPositiveFlag()); - flags.put("false-numeric-comparisons-flag", createFalseNumericComparisonsFlag()); - flags.put("empty-splits-flag", createEmptySplitsFlag()); - flags.put("empty-conditions-flag", createEmptyConditionsFlag()); - flags.put("shard-matching-flag", createShardMatchingFlag()); - flags.put("future-allocation-flag", createFutureAllocationFlag()); - flags.put("id-attribute-flag", createIdAttributeFlag()); - flags.put("non-iterable-condition-flag", createNonIterableConditionFlag()); - flags.put("gt-false-flag", createGtFalseFlag()); - flags.put("lte-false-flag", createLteFalseFlag()); - flags.put("lt-false-flag", createLtFalseFlag()); - flags.put("not-matches-false-flag", createNotMatchesFalseFlag()); - flags.put("not-one-of-false-flag", createNotOneOfFalseFlag()); - flags.put("null-context-values-flag", createNullContextValuesFlag()); - flags.put("country-rule-flag", createCountryRuleFlag()); - flags.put( - "integer-string-variant-flag", - createSimpleFlag("integer-string-variant-flag", ValueType.INTEGER, "not-a-number", "bad")); - flags.put("invalid-regex-flag", createInvalidRegexFlag()); - flags.put("invalid-regex-not-matches-flag", createInvalidRegexNotMatchesFlag()); - return new ServerConfiguration(null, null, null, flags); - } - - private Flag createSimpleFlag(String key, ValueType type, Object value, String variantKey) { - final Map variants = new HashMap<>(); - variants.put(variantKey, new Variant(variantKey, value)); - final List splits = singletonList(new Split(emptyList(), variantKey, null)); - final List allocations = - singletonList(new Allocation("alloc1", null, null, null, splits, false)); - return new Flag(key, true, type, variants, allocations); - } - - private Flag createRuleBasedFlag() { - final Map variants = new HashMap<>(); - variants.put("premium", new Variant("premium", "premium")); - variants.put("basic", new Variant("basic", "basic")); - - // Rule: email MATCHES @company.com$ -> premium - final List premiumConditions = - singletonList( - new ConditionConfiguration(ConditionOperator.MATCHES, "email", "@company\\.com$")); - final List premiumRules = singletonList(new Rule(premiumConditions)); - final List premiumSplits = singletonList(new Split(emptyList(), "premium", null)); - final Allocation premiumAllocation = - new Allocation("premium-alloc", premiumRules, null, null, premiumSplits, false); - - // Fallback allocation for basic - final List basicSplits = singletonList(new Split(emptyList(), "basic", null)); - final Allocation basicAllocation = - new Allocation("basic-alloc", null, null, null, basicSplits, false); - - final List allocations = asList(premiumAllocation, basicAllocation); - - return new Flag("rule-based-flag", true, ValueType.STRING, variants, allocations); - } - - private Flag createNumericRuleFlag() { - final Map variants = new HashMap<>(); - variants.put("vip", new Variant("vip", "vip")); - variants.put("regular", new Variant("regular", "regular")); - - // Rule: score >= 800 -> vip - final List vipConditions = - singletonList(new ConditionConfiguration(ConditionOperator.GTE, "score", 800)); - final List vipRules = singletonList(new Rule(vipConditions)); - final List vipSplits = singletonList(new Split(emptyList(), "vip", null)); - final Allocation vipAllocation = - new Allocation("vip-alloc", vipRules, null, null, vipSplits, false); - - // Fallback - final List regularSplits = singletonList(new Split(emptyList(), "regular", null)); - final Allocation regularAllocation = - new Allocation("regular-alloc", null, null, null, regularSplits, false); - - return new Flag( - "numeric-rule-flag", - true, - ValueType.STRING, - variants, - asList(vipAllocation, regularAllocation)); - } - - private Flag createNullCheckFlag() { - final Map variants = new HashMap<>(); - variants.put("no-beta", new Variant("no-beta", "no-beta")); - variants.put("has-beta", new Variant("has-beta", "has-beta")); - - // Rule: beta_feature IS_NULL (true) -> no-beta - final List noBetaConditions = - singletonList(new ConditionConfiguration(ConditionOperator.IS_NULL, "beta_feature", true)); - final List noBetaRules = singletonList(new Rule(noBetaConditions)); - final List noBetaSplits = singletonList(new Split(emptyList(), "no-beta", null)); - final Allocation noBetaAllocation = - new Allocation("no-beta-alloc", noBetaRules, null, null, noBetaSplits, false); - - // Fallback - final List hasBetaSplits = singletonList(new Split(emptyList(), "has-beta", null)); - final Allocation hasBetaAllocation = - new Allocation("has-beta-alloc", null, null, null, hasBetaSplits, false); - - return new Flag( - "null-check-flag", - true, - ValueType.STRING, - variants, - asList(noBetaAllocation, hasBetaAllocation)); - } - - private Flag createOneOfRuleFlag() { - final Map variants = new HashMap<>(); - variants.put("regional", new Variant("regional", "regional")); - variants.put("global", new Variant("global", "global")); - - // Rule: region ONE_OF [us-east-1, us-west-2, eu-west-1] -> regional - final List allowedRegions = asList("us-east-1", "us-west-2", "eu-west-1"); - final List regionalConditions = - singletonList( - new ConditionConfiguration(ConditionOperator.ONE_OF, "region", allowedRegions)); - final List regionalRules = singletonList(new Rule(regionalConditions)); - final List regionalSplits = singletonList(new Split(emptyList(), "regional", null)); - final Allocation regionalAllocation = - new Allocation("regional-alloc", regionalRules, null, null, regionalSplits, false); - - // Fallback - final List globalSplits = singletonList(new Split(emptyList(), "global", null)); - final Allocation globalAllocation = - new Allocation("global-alloc", null, null, null, globalSplits, false); - - return new Flag( - "region-flag", - true, - ValueType.STRING, - variants, - asList(regionalAllocation, globalAllocation)); - } - - private Flag createTimeBasedFlag() { - final Map variants = new HashMap<>(); - variants.put("time-limited", new Variant("time-limited", "time-limited")); - - final List splits = singletonList(new Split(emptyList(), "time-limited", null)); - - // Allocation that ended in 2022 (should be inactive) - final List allocations = - singletonList( - new Allocation( - "time-alloc", - null, - parseDate("2022-01-01T00:00:00Z"), - parseDate("2022-12-31T23:59:59Z"), - splits, - false)); - - return new Flag("time-based-flag", true, ValueType.STRING, variants, allocations); - } - - private Flag createShardBasedFlag() { - final Map variants = new HashMap<>(); - variants.put("shard-variant", new Variant("shard-variant", "shard-value")); - - // Create a shard that includes some range - final List ranges = singletonList(new ShardRange(0, 50)); // 0-49 out of 100 - final List shards = singletonList(new Shard("test-salt", ranges, 100)); - - final List splits = singletonList(new Split(shards, "shard-variant", null)); - - final List allocations = - singletonList(new Allocation("shard-alloc", null, null, null, splits, false)); + evaluator.accept(loadCanonicalConfiguration()); - return new Flag("shard-flag", true, ValueType.STRING, variants, allocations); - } - - private Flag createBrokenFlag() { - // Create a flag with missing variant - final Map variants = new HashMap<>(); - variants.put("existing", new Variant("existing", "value")); - - final List splits = singletonList(new Split(emptyList(), "missing-variant", null)); - - final List allocations = - singletonList(new Allocation("alloc1", null, null, null, splits, false)); - - return new Flag("broken-flag", true, ValueType.STRING, variants, allocations); - } - - private Flag createComparisonFlag( - String flagKey, - String allocKey, - String variantKey, - String variantValue, - ConditionOperator operator, - String attribute, - Object threshold) { - final Map variants = new HashMap<>(); - variants.put(variantKey, new Variant(variantKey, variantValue)); - - final List conditions = - singletonList(new ConditionConfiguration(operator, attribute, threshold)); - final List rules = singletonList(new Rule(conditions)); - final List splits = singletonList(new Split(emptyList(), variantKey, null)); - final Allocation allocation = new Allocation(allocKey, rules, null, null, splits, false); - - return new Flag(flagKey, true, ValueType.STRING, variants, singletonList(allocation)); - } - - private Flag createLessThanFlag() { - return createComparisonFlag( - "lt-flag", "low-alloc", "low", "low-score", ConditionOperator.LT, "score", 800); - } - - private Flag createLessThanOrEqualFlag() { - return createComparisonFlag( - "lte-flag", "medium-alloc", "medium", "medium-score", ConditionOperator.LTE, "score", 800); - } - - private Flag createGreaterThanFlag() { - return createComparisonFlag( - "gt-flag", "high-alloc", "high", "high-score", ConditionOperator.GT, "score", 900); - } - - private Flag createNotOperatorFlag( - String flagKey, - String allocKey, - String variantKey, - String variantValue, - ConditionOperator operator, - String attribute, - Object value) { - final Map variants = new HashMap<>(); - variants.put(variantKey, new Variant(variantKey, variantValue)); - - final List conditions = - singletonList(new ConditionConfiguration(operator, attribute, value)); - final List rules = singletonList(new Rule(conditions)); - final List splits = singletonList(new Split(emptyList(), variantKey, null)); - final Allocation allocation = new Allocation(allocKey, rules, null, null, splits, false); - - return new Flag(flagKey, true, ValueType.STRING, variants, singletonList(allocation)); - } - - private Flag createNotMatchesFlag() { - return createNotOperatorFlag( - "not-matches-flag", - "external-alloc", - "external", - "external", - ConditionOperator.NOT_MATCHES, - "email", - "@company\\.com$"); - } - - private Flag createNotOneOfFlag() { - final List disallowedRegions = asList("us-east-1", "us-west-2", "eu-west-1"); - return createNotOperatorFlag( - "not-one-of-flag", - "other-alloc", - "other", - "other-region", - ConditionOperator.NOT_ONE_OF, - "region", - disallowedRegions); - } - - private Flag createDoubleEqualsFlag() { - final Map variants = new HashMap<>(); - variants.put("pi", new Variant("pi", "pi-value")); - - // This will test the double comparison in valuesEqual - match exact double value - final List piConditions = - singletonList(new ConditionConfiguration(ConditionOperator.MATCHES, "rate", "3.14159")); - final List piRules = singletonList(new Rule(piConditions)); - final List piSplits = singletonList(new Split(emptyList(), "pi", null)); - final Allocation piAllocation = - new Allocation("pi-alloc", piRules, null, null, piSplits, false); - - return new Flag( - "double-equals-flag", true, ValueType.STRING, variants, singletonList(piAllocation)); - } - - private Flag createNestedAttributeFlag() { - final Map variants = new HashMap<>(); - variants.put("premium", new Variant("premium", "premium-user")); - - // Rule: user.profile.level MATCHES premium -> premium - final List premiumConditions = - singletonList( - new ConditionConfiguration(ConditionOperator.MATCHES, "user.profile.level", "premium")); - final List premiumRules = singletonList(new Rule(premiumConditions)); - final List premiumSplits = singletonList(new Split(emptyList(), "premium", null)); - final Allocation premiumAllocation = - new Allocation("premium-nested-alloc", premiumRules, null, null, premiumSplits, false); - - return new Flag( - "nested-attr-flag", true, ValueType.STRING, variants, singletonList(premiumAllocation)); - } - - private Flag createExposureFlag() { - final Map variants = new HashMap<>(); - variants.put("tracked", new Variant("tracked", "tracked-value")); - - final List splits = singletonList(new Split(emptyList(), "tracked", null)); - // Create allocation with doLog=true to trigger exposure logging - final List allocations = - singletonList(new Allocation("exposure-alloc", null, null, null, splits, true)); - - return new Flag("exposure-flag", true, ValueType.STRING, variants, allocations); - } - - private Flag createDoubleComparisonFlag() { - final Map variants = new HashMap<>(); - variants.put("exact", new Variant("exact", "exact-match")); - - // This flag uses numeric comparison that will trigger the double comparison lambda - final List exactConditions = - singletonList(new ConditionConfiguration(ConditionOperator.LTE, "score", 3.14159)); - final List exactRules = singletonList(new Rule(exactConditions)); - final List exactSplits = singletonList(new Split(emptyList(), "exact", null)); - final Allocation exactAllocation = - new Allocation("exact-alloc", exactRules, null, null, exactSplits, false); - - return new Flag( - "double-comparison-flag", true, ValueType.STRING, variants, singletonList(exactAllocation)); - } - - private Flag createExposureLoggingFlag() { - final Map variants = new HashMap<>(); - variants.put("logged", new Variant("logged", "logged-value")); - - // Rule: feature MATCHES premium -> logged - final List loggedConditions = - singletonList(new ConditionConfiguration(ConditionOperator.MATCHES, "feature", "premium")); - final List loggedRules = singletonList(new Rule(loggedConditions)); - final List loggedSplits = singletonList(new Split(emptyList(), "logged", null)); - // Create allocation with doLog=true to trigger exposure logging and allocationKey method - final Allocation loggedAllocation = - new Allocation("logged-alloc", loggedRules, null, null, loggedSplits, true); - - return new Flag( - "exposure-logging-flag", true, ValueType.STRING, variants, singletonList(loggedAllocation)); - } - - private Flag createNumericOneOfFlag() { - final Map variants = new HashMap<>(); - variants.put("numeric-match", new Variant("numeric-match", "numeric-matched")); - - // Rule: score ONE_OF [3.14159, 2.71828] -> numeric-match - // This will trigger valuesEqual with numeric comparison via lambda$valuesEqual$4 - final List numericValues = asList(3.14159, 2.71828); - final List numericConditions = - singletonList(new ConditionConfiguration(ConditionOperator.ONE_OF, "score", numericValues)); - final List numericRules = singletonList(new Rule(numericConditions)); - final List numericSplits = singletonList(new Split(emptyList(), "numeric-match", null)); - final Allocation numericAllocation = - new Allocation("numeric-alloc", numericRules, null, null, numericSplits, false); - - return new Flag( - "numeric-one-of-flag", true, ValueType.STRING, variants, singletonList(numericAllocation)); - } - - private Flag createNumericNotOneOfFlag() { - final Map variants = new HashMap<>(); - variants.put("excluded", new Variant("excluded", "not-in-set")); - - // Rule: score NOT_ONE_OF [1.0, 2.0, 3.0] -> excluded - // This will trigger valuesEqual with numeric comparison via lambda$valuesEqual$4 - final List excludedValues = asList(1.0, 2.0, 3.0); - final List excludedConditions = - singletonList( - new ConditionConfiguration(ConditionOperator.NOT_ONE_OF, "score", excludedValues)); - final List excludedRules = singletonList(new Rule(excludedConditions)); - final List excludedSplits = singletonList(new Split(emptyList(), "excluded", null)); - final Allocation excludedAllocation = - new Allocation("excluded-alloc", excludedRules, null, null, excludedSplits, false); - - return new Flag( - "numeric-not-one-of-flag", - true, - ValueType.STRING, - variants, - singletonList(excludedAllocation)); - } - - private Flag createIsNullFalseFlag() { - final Map variants = new HashMap<>(); - variants.put("not-null", new Variant("not-null", "not-null")); - - // Rule: attr IS_NULL false -> not-null (checks if attr is NOT null) - final List notNullConditions = - singletonList(new ConditionConfiguration(ConditionOperator.IS_NULL, "attr", false)); - final List notNullRules = singletonList(new Rule(notNullConditions)); - final List notNullSplits = singletonList(new Split(emptyList(), "not-null", null)); - final Allocation notNullAllocation = - new Allocation("not-null-alloc", notNullRules, null, null, notNullSplits, false); - - return new Flag( - "is-null-false-flag", true, ValueType.STRING, variants, singletonList(notNullAllocation)); - } - - private Flag createIsNullNonBooleanFlag() { - final Map variants = new HashMap<>(); - variants.put("null-match", new Variant("null-match", "null-match")); - - // Rule: missing_attr IS_NULL "string" -> null-match (non-boolean expectedNull value) - final List nullConditions = - singletonList( - new ConditionConfiguration(ConditionOperator.IS_NULL, "missing_attr", "string")); - final List nullRules = singletonList(new Rule(nullConditions)); - final List nullSplits = singletonList(new Split(emptyList(), "null-match", null)); - final Allocation nullAllocation = - new Allocation("null-alloc", nullRules, null, null, nullSplits, false); - - return new Flag( - "is-null-non-boolean-flag", - true, - ValueType.STRING, - variants, - singletonList(nullAllocation)); - } - - private Flag createNullAttributeFlag() { - final Map variants = new HashMap<>(); - variants.put("fallback", new Variant("fallback", "fallback")); - - // Rule: null_attribute MATCHES "test" -> should not match due to null attribute - final List nullAttrConditions = - singletonList(new ConditionConfiguration(ConditionOperator.MATCHES, null, "test")); - final List nullAttrRules = singletonList(new Rule(nullAttrConditions)); - final List nullAttrSplits = singletonList(new Split(emptyList(), "fallback", null)); - final Allocation nullAttrAllocation = - new Allocation("null-attr-alloc", nullAttrRules, null, null, nullAttrSplits, false); - - return new Flag( - "null-attribute-flag", true, ValueType.STRING, variants, singletonList(nullAttrAllocation)); - } - - private Flag createNotMatchesPositiveFlag() { - final Map variants = new HashMap<>(); - variants.put("external", new Variant("external", "external-email")); - - // Rule: email NOT_MATCHES "@company.com" -> external (should match gmail.com) - final List externalConditions = - singletonList( - new ConditionConfiguration(ConditionOperator.NOT_MATCHES, "email", "@company\\.com")); - final List externalRules = singletonList(new Rule(externalConditions)); - final List externalSplits = singletonList(new Split(emptyList(), "external", null)); - final Allocation externalAllocation = - new Allocation("external-alloc", externalRules, null, null, externalSplits, false); - - return new Flag( - "not-matches-positive-flag", - true, - ValueType.STRING, - variants, - singletonList(externalAllocation)); - } - - private Flag createNotOneOfPositiveFlag() { - final Map variants = new HashMap<>(); - variants.put("other", new Variant("other", "other-region")); - - // Rule: region NOT_ONE_OF ["us-east-1", "us-west-2", "eu-west-1"] -> other - final List excludedRegions = asList("us-east-1", "us-west-2", "eu-west-1"); - final List otherConditions = - singletonList( - new ConditionConfiguration(ConditionOperator.NOT_ONE_OF, "region", excludedRegions)); - final List otherRules = singletonList(new Rule(otherConditions)); - final List otherSplits = singletonList(new Split(emptyList(), "other", null)); - final Allocation otherAllocation = - new Allocation("other-alloc", otherRules, null, null, otherSplits, false); - - return new Flag( - "not-one-of-positive-flag", - true, - ValueType.STRING, - variants, - singletonList(otherAllocation)); - } - - private Flag createFalseNumericComparisonsFlag() { - final Map variants = new HashMap<>(); - variants.put("high-score", new Variant("high-score", "high-score")); - - // Rule: score GTE 800 -> high-score (test will provide 750, should fail) - final List highScoreConditions = - singletonList(new ConditionConfiguration(ConditionOperator.GTE, "score", 800)); - final List highScoreRules = singletonList(new Rule(highScoreConditions)); - final List highScoreSplits = singletonList(new Split(emptyList(), "high-score", null)); - final Allocation highScoreAllocation = - new Allocation("high-score-alloc", highScoreRules, null, null, highScoreSplits, false); - - return new Flag( - "false-numeric-comparisons-flag", - true, - ValueType.STRING, - variants, - singletonList(highScoreAllocation)); - } - - private Flag createEmptySplitsFlag() { - final Map variants = new HashMap<>(); - variants.put("default", new Variant("default", "default")); - - // Allocation with null splits - final Allocation allocation = - new Allocation("empty-splits-alloc", null, null, null, null, false); - - return new Flag( - "empty-splits-flag", true, ValueType.STRING, variants, singletonList(allocation)); - } - - private Flag createEmptyConditionsFlag() { - final Map variants = new HashMap<>(); - variants.put("default", new Variant("default", "default")); - - // Rule with empty conditions list - this will be skipped, causing allocation to not match - final Rule emptyConditionsRule = new Rule(emptyList()); - final List splits = singletonList(new Split(emptyList(), "default", null)); - final Allocation allocation = - new Allocation( - "empty-conditions-alloc", - singletonList(emptyConditionsRule), - null, - null, - splits, - false); - - return new Flag( - "empty-conditions-flag", true, ValueType.STRING, variants, singletonList(allocation)); - } - - private Flag createShardMatchingFlag() { - final Map variants = new HashMap<>(); - variants.put("matched", new Variant("matched", "shard-matched")); - - // Create shard that will match the specific targeting key - final List ranges = - singletonList(new ShardRange(0, 100)); // Full range to ensure match - final List shards = singletonList(new Shard("test-salt", ranges, 100)); - final List splits = singletonList(new Split(shards, "matched", null)); - final Allocation allocation = - new Allocation("shard-matching-alloc", null, null, null, splits, false); - - return new Flag( - "shard-matching-flag", true, ValueType.STRING, variants, singletonList(allocation)); - } - - private Flag createFutureAllocationFlag() { - final Map variants = new HashMap<>(); - variants.put("future", new Variant("future", "future-value")); - - final List splits = singletonList(new Split(emptyList(), "future", null)); - - // Allocation that starts in the future (2050) - final Allocation allocation = - new Allocation( - "future-alloc", null, parseDate("2050-01-01T00:00:00Z"), null, splits, false); - - return new Flag( - "future-allocation-flag", true, ValueType.STRING, variants, singletonList(allocation)); - } - - private Flag createIdAttributeFlag() { - final Map variants = new HashMap<>(); - variants.put("id-match", new Variant("id-match", "id-resolved")); - - // Rule that checks for "id" attribute (will use targeting key if not provided) - final List conditions = - singletonList( - new ConditionConfiguration(ConditionOperator.MATCHES, "id", "user-special-id")); - final List rules = singletonList(new Rule(conditions)); - final List splits = singletonList(new Split(emptyList(), "id-match", null)); - final Allocation allocation = new Allocation("id-attr-alloc", rules, null, null, splits, false); - - return new Flag( - "id-attribute-flag", true, ValueType.STRING, variants, singletonList(allocation)); - } - - private Flag createNonIterableConditionFlag() { - final Map variants = new HashMap<>(); - variants.put("no-match", new Variant("no-match", "no-match")); - - // Rule with ONE_OF condition but non-iterable value (String instead of List) - final List conditions = - singletonList(new ConditionConfiguration(ConditionOperator.ONE_OF, "attr", "single-value")); - final List rules = singletonList(new Rule(conditions)); - final List splits = singletonList(new Split(emptyList(), "no-match", null)); - final Allocation allocation = - new Allocation("non-iterable-alloc", rules, null, null, splits, false); - - return new Flag( - "non-iterable-condition-flag", true, ValueType.STRING, variants, singletonList(allocation)); - } - - private Flag createGtFalseFlag() { - return createComparisonFlag( - "gt-false-flag", - "gt-false-alloc", - "high", - "high-value", - ConditionOperator.GT, - "score", - 600); - } - - private Flag createLteFalseFlag() { - return createComparisonFlag( - "lte-false-flag", - "lte-false-alloc", - "low", - "low-value", - ConditionOperator.LTE, - "score", - 500); - } - - private Flag createLtFalseFlag() { - return createComparisonFlag( - "lt-false-flag", - "lt-false-alloc", - "very-low", - "very-low-value", - ConditionOperator.LT, - "score", - 600); - } - - private Flag createNotMatchesFalseFlag() { - final Map variants = new HashMap<>(); - variants.put("internal", new Variant("internal", "internal-email")); - - // Rule: email NOT_MATCHES "@company.com" -> internal (test provides company.com, should fail) - final List conditions = - singletonList( - new ConditionConfiguration(ConditionOperator.NOT_MATCHES, "email", "@company\\.com")); - final List rules = singletonList(new Rule(conditions)); - final List splits = singletonList(new Split(emptyList(), "internal", null)); - final Allocation allocation = - new Allocation("not-matches-false-alloc", rules, null, null, splits, false); + final Class targetType = targetType(testCase.variationType); + final Object defaultValue = mapFixtureValue(targetType, testCase.defaultValue); + final Object expectedValue = mapFixtureValue(targetType, testCase.result.value); + final ProviderEvaluation details = + evaluate(evaluator, targetType, testCase.flag, defaultValue, context(testCase)); - return new Flag( - "not-matches-false-flag", true, ValueType.STRING, variants, singletonList(allocation)); + assertThat(details.getValue(), equalTo(expectedValue)); + assertThat(details.getReason(), equalTo(testCase.result.reason)); + if (testCase.result.variant != null) { + assertThat(details.getVariant(), equalTo(testCase.result.variant)); + } + if (testCase.result.errorCode != null) { + assertThat(details.getErrorCode(), equalTo(ErrorCode.valueOf(testCase.result.errorCode))); + } + if (testCase.result.flagMetadata != null + && testCase.result.flagMetadata.get("allocationKey") != null) { + assertThat( + details.getFlagMetadata().getString("allocationKey"), + equalTo(String.valueOf(testCase.result.flagMetadata.get("allocationKey")))); + } } - private Flag createNotOneOfFalseFlag() { - final Map variants = new HashMap<>(); - variants.put("excluded", new Variant("excluded", "excluded-region")); - - // Rule: region NOT_ONE_OF ["us-east-1", "us-west-2"] -> excluded (test provides us-east-1, - // should fail) - final List excludedRegions = asList("us-east-1", "us-west-2"); - final List conditions = - singletonList( - new ConditionConfiguration(ConditionOperator.NOT_ONE_OF, "region", excludedRegions)); - final List rules = singletonList(new Rule(conditions)); - final List splits = singletonList(new Split(emptyList(), "excluded", null)); - final Allocation allocation = - new Allocation("not-one-of-false-alloc", rules, null, null, splits, false); + @SuppressWarnings({"rawtypes", "unchecked"}) + private static ProviderEvaluation evaluate( + final DDEvaluator evaluator, + final Class targetType, + final String flag, + final Object defaultValue, + final EvaluationContext context) { + return evaluator.evaluate((Class) targetType, flag, defaultValue, context); + } + + private static ServerConfiguration loadCanonicalConfiguration() throws IOException { + return CONFIG_ADAPTER.fromJson(read(fixtureRoot().resolve("ufc-config.json"))); + } + + private static List canonicalTestCases() throws IOException { + final Path evaluationCases = fixtureRoot().resolve("evaluation-cases"); + final List result = new ArrayList<>(); + + try (final Stream paths = Files.list(evaluationCases)) { + final List files = + paths + .filter(path -> path.getFileName().toString().endsWith(".json")) + .sorted((left, right) -> left.getFileName().compareTo(right.getFileName())) + .collect(Collectors.toList()); + for (final Path file : files) { + final List testCases = FIXTURE_LIST_ADAPTER.fromJson(read(file)); + if (testCases == null) { + throw new JsonDataException("Fixture file did not contain an array: " + file); + } + for (int index = 0; index < testCases.size(); index++) { + final FixtureCase testCase = testCases.get(index); + testCase.fileName = file.getFileName().toString(); + testCase.index = index; + result.add(testCase); + } + } + } - return new Flag( - "not-one-of-false-flag", true, ValueType.STRING, variants, singletonList(allocation)); + assertThat(result.size(), greaterThan(0)); + return result; } - private Flag createNullContextValuesFlag() { - final Map variants = new HashMap<>(); - variants.put("null-variant", new Variant("null-variant", "null-handled")); - - // Rule that will handle null context values in flattening - final List conditions = - singletonList(new ConditionConfiguration(ConditionOperator.IS_NULL, "nullAttr", true)); - final List rules = singletonList(new Rule(conditions)); - final List splits = singletonList(new Split(emptyList(), "null-variant", null)); - final Allocation allocation = - new Allocation("null-context-alloc", rules, null, null, splits, false); - - return new Flag( - "null-context-values-flag", true, ValueType.STRING, variants, singletonList(allocation)); + private static Path fixtureRoot() { + Path directory = Paths.get("").toAbsolutePath(); + while (directory != null) { + final Path candidate = directory.resolve(CANONICAL_FIXTURE_PATH); + if (Files.exists(candidate.resolve("ufc-config.json")) + && Files.isDirectory(candidate.resolve("evaluation-cases"))) { + return candidate; + } + directory = directory.getParent(); + } + throw new IllegalStateException("Unable to find canonical FFE fixtures"); } - private Flag createCountryRuleFlag() { - final Map variants = new HashMap<>(); - variants.put("us", new Variant("us", "us-value")); - variants.put("global", new Variant("global", "global-value")); - - // Rule: country ONE_OF ["US"] -> us (no shards, so null targeting key is fine) - final List usCountries = singletonList("US"); - final List usConditions = - singletonList(new ConditionConfiguration(ConditionOperator.ONE_OF, "country", usCountries)); - final List usRules = singletonList(new Rule(usConditions)); - final List usSplits = singletonList(new Split(emptyList(), "us", null)); - final Allocation usAllocation = - new Allocation("us-alloc", usRules, null, null, usSplits, false); - - // Fallback allocation (no rules, no shards) - final List globalSplits = singletonList(new Split(emptyList(), "global", null)); - final Allocation globalAllocation = - new Allocation("global-alloc", null, null, null, globalSplits, false); - - return new Flag( - "country-rule-flag", - true, - ValueType.STRING, - variants, - asList(usAllocation, globalAllocation)); + private static String read(final Path path) throws IOException { + return new String(Files.readAllBytes(path), StandardCharsets.UTF_8); } - private Flag createInvalidRegexFlag() { - final Map variants = new HashMap<>(); - variants.put("matched", new Variant("matched", "matched-value")); - - // Condition with an intentionally invalid regex pattern (unclosed bracket) - final List conditions = - singletonList(new ConditionConfiguration(ConditionOperator.MATCHES, "email", "[invalid")); - final List rules = singletonList(new Rule(conditions)); - final List splits = singletonList(new Split(emptyList(), "matched", null)); - final Allocation allocation = - new Allocation("invalid-regex-alloc", rules, null, null, splits, false); - - return new Flag( - "invalid-regex-flag", true, ValueType.STRING, variants, singletonList(allocation)); + private static EvaluationContext context(final FixtureCase testCase) { + final Map attributes = + testCase.attributes == null ? emptyMap() : testCase.attributes; + final MutableContext context = + new MutableContext(Value.objectToValue(attributes).asStructure().asMap()); + if (testCase.targetingKey != null) { + context.setTargetingKey(testCase.targetingKey); + } + return context; + } + + private static Class targetType(final String variationType) { + switch (variationType) { + case "BOOLEAN": + return Boolean.class; + case "INTEGER": + return Integer.class; + case "NUMERIC": + return Double.class; + case "STRING": + return String.class; + case "JSON": + return Value.class; + default: + throw new IllegalArgumentException("Unsupported variationType: " + variationType); + } } - private Flag createInvalidRegexNotMatchesFlag() { - final Map variants = new HashMap<>(); - variants.put("excluded", new Variant("excluded", "excluded-value")); - - // Condition with an intentionally invalid regex pattern (unclosed bracket) under NOT_MATCHES - final List conditions = - singletonList( - new ConditionConfiguration(ConditionOperator.NOT_MATCHES, "email", "[invalid")); - final List rules = singletonList(new Rule(conditions)); - final List splits = singletonList(new Split(emptyList(), "excluded", null)); - final Allocation allocation = - new Allocation("invalid-regex-not-matches-alloc", rules, null, null, splits, false); - - return new Flag( - "invalid-regex-not-matches-flag", - true, - ValueType.STRING, - variants, - singletonList(allocation)); + private static Object mapFixtureValue(final Class targetType, final Object value) { + return DDEvaluator.mapValue(targetType, value); } private static Map mapOf(final Object... props) { @@ -1368,13 +362,50 @@ private static Map mapOf(final Object... props) { return result; } - private static Date parseDate(String dateString) { - try { - SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'"); - formatter.setTimeZone(TimeZone.getTimeZone("UTC")); - return formatter.parse(dateString); - } catch (ParseException e) { - throw new RuntimeException("Failed to parse date: " + dateString, e); + private static final class FixtureCase { + Map attributes = emptyMap(); + Object defaultValue; + String flag; + FixtureResult result; + String targetingKey; + String variationType; + transient String fileName; + transient int index; + + @Override + public String toString() { + return fileName + "[" + index + "] flag=" + flag; + } + } + + private static final class FixtureResult { + Object value; + String reason; + String errorCode; + String variant; + Map flagMetadata = emptyMap(); + } + + private static final class DateAdapter extends JsonAdapter { + @Override + public Date fromJson(final JsonReader reader) throws IOException { + if (reader.peek() == JsonReader.Token.NULL) { + return reader.nextNull(); + } + try { + return Date.from(OffsetDateTime.parse(reader.nextString()).toInstant()); + } catch (final Exception ignored) { + return null; + } + } + + @Override + public void toJson(final JsonWriter writer, final Date value) throws IOException { + if (value == null) { + writer.nullValue(); + return; + } + writer.value(value.toInstant().toString()); } } } diff --git a/products/feature-flagging/feature-flagging-api/src/test/java/datadog/trace/api/openfeature/util/TestCase.java b/products/feature-flagging/feature-flagging-api/src/test/java/datadog/trace/api/openfeature/util/TestCase.java deleted file mode 100644 index b19f85bf84e..00000000000 --- a/products/feature-flagging/feature-flagging-api/src/test/java/datadog/trace/api/openfeature/util/TestCase.java +++ /dev/null @@ -1,114 +0,0 @@ -package datadog.trace.api.openfeature.util; - -import dev.openfeature.sdk.ErrorCode; -import dev.openfeature.sdk.MutableContext; -import dev.openfeature.sdk.Structure; -import dev.openfeature.sdk.Value; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -public class TestCase { - - public Class type; - public String flag; - public E defaultValue; - public final MutableContext context = new MutableContext(); - public Result result; - - @SuppressWarnings("unchecked") - public TestCase(final E defaultValue) { - this.type = (Class) defaultValue.getClass(); - this.defaultValue = defaultValue; - } - - public TestCase flag(String flag) { - this.flag = flag; - return this; - } - - public TestCase targetingKey(final String targetingKey) { - context.setTargetingKey(targetingKey); - return this; - } - - public TestCase context(final String key, final String value) { - context.add(key, value); - return this; - } - - public TestCase context(final String key, final Integer value) { - context.add(key, value); - return this; - } - - public TestCase context(final String key, final Double value) { - context.add(key, value); - return this; - } - - public TestCase context(final String key, final Boolean value) { - context.add(key, value); - return this; - } - - public TestCase context(final String key, final Structure value) { - context.add(key, value); - return this; - } - - public TestCase context(final String key, final List value) { - context.add(key, value); - return this; - } - - public TestCase result(final Result result) { - this.result = result; - return this; - } - - @Override - public String toString() { - return "TestCase{" - + "flag='" - + flag - + '\'' - + ", defaultValue=" - + defaultValue - + ", targetingKey=" - + context.getTargetingKey() - + '}'; - } - - public static class Result { - public E value; - public String variant; - public String[] reason; - public ErrorCode errorCode; - public final Map flagMetadata = new HashMap<>(); - - public Result(final E value) { - this.value = value; - } - - public Result variant(final String variant) { - this.variant = variant; - return this; - } - - public Result errorCode(final ErrorCode errorCode) { - this.errorCode = errorCode; - return this; - } - - public Result reason(final String... reason) { - this.reason = reason; - return this; - } - - public Result flagMetadata(final String name, final Object value) { - flagMetadata.put(name, value); - return this; - } - } -} From c05e1a9750f388d81d955e0792352087418ac45b Mon Sep 17 00:00:00 2001 From: jean-philippe bempel Date: Fri, 5 Jun 2026 08:54:04 +0200 Subject: [PATCH 134/139] Migrate dd-trace-core groovy files to java part 12 we migrate 20 tests: - TraceMapperV04PayloadTest - TraceMapperV05PayloadTest - TraceMapperV1PayloadTest - DDEvpProxyApiTest - DDIntakeApiTest - DDIntakeTraceInterceptorTest - DDIntakeTrackTypeResolverTest - DDAgentApiTest - DDAgentWriterCombinedTest - DDAgentWriterTest - DDIntakeWriterCombinedTest - DDIntakeWriterTest - MultiWriterTest - PayloadDispatcherImplTest - PrioritizationTest - SerializationTest - SpanSamplingWorkerTest - TraceMapperTest - TraceProcessingWorkerTest - WriterFactoryTest # Conflicts: # utils/junit-utils/src/main/java/datadog/trace/junit/utils/tabletest/SamplingMechanismConverter.java # Conflicts: # dd-trace-core/src/test/groovy/datadog/trace/common/writer/TraceMapperTest.groovy # dd-trace-core/src/test/groovy/datadog/trace/common/writer/ddagent/TraceMapperV1PayloadTest.groovy --- .../common/writer/TraceProcessingWorker.java | 6 + .../trace/common/writer/DDAgentApiTest.groovy | 493 ----- .../writer/DDAgentWriterCombinedTest.groovy | 753 ------- .../common/writer/DDAgentWriterTest.groovy | 222 -- .../writer/DDIntakeWriterCombinedTest.groovy | 769 ------- .../common/writer/DDIntakeWriterTest.groovy | 215 -- .../common/writer/MultiWriterTest.groovy | 69 - .../writer/PayloadDispatcherImplTest.groovy | 176 -- .../common/writer/PrioritizationTest.groovy | 258 --- .../common/writer/SerializationTest.groovy | 49 - .../writer/SpanSamplingWorkerTest.groovy | 397 ---- .../common/writer/TraceMapperTest.groovy | 101 - .../writer/TraceProcessingWorkerTest.groovy | 430 ---- .../common/writer/WriterFactoryTest.groovy | 242 --- .../ddagent/TraceMapperV04PayloadTest.groovy | 425 ---- .../ddagent/TraceMapperV05PayloadTest.groovy | 389 ---- .../ddagent/TraceMapperV1PayloadTest.groovy | 1209 ----------- .../writer/ddintake/DDEvpProxyApiTest.groovy | 338 --- .../writer/ddintake/DDIntakeApiTest.groovy | 360 ---- .../DDIntakeTraceInterceptorTest.groovy | 89 - .../DDIntakeTrackTypeResolverTest.groovy | 24 - .../trace/common/writer/DDAgentApiTest.java | 742 +++++++ .../writer/DDAgentWriterCombinedTest.java | 837 ++++++++ .../common/writer/DDAgentWriterTest.java | 226 ++ .../writer/DDIntakeWriterCombinedTest.java | 825 ++++++++ .../common/writer/DDIntakeWriterTest.java | 222 ++ .../trace/common/writer/MultiWriterTest.java | 79 + .../writer/PayloadDispatcherImplTest.java | 228 ++ .../common/writer/PrioritizationTest.java | 307 +++ .../common/writer/SerializationTest.java | 65 + .../common/writer/SpanSamplingWorkerTest.java | 373 ++++ .../trace/common/writer/TraceMapperTest.java | 124 ++ .../writer/TraceProcessingWorkerTest.java | 645 ++++++ .../common/writer/WriterFactoryTest.java | 295 +++ .../ddagent/TraceMapperV04PayloadTest.java | 451 ++++ .../ddagent/TraceMapperV05PayloadTest.java | 402 ++++ .../ddagent/TraceMapperV1PayloadTest.java | 1827 +++++++++++++++++ .../writer/ddintake/DDEvpProxyApiTest.java | 457 +++++ .../writer/ddintake/DDIntakeApiTest.java | 463 +++++ .../DDIntakeTraceInterceptorTest.java | 101 + .../DDIntakeTrackTypeResolverTest.java | 30 + .../tabletest/TableTestTypeConverters.java | 26 + 42 files changed, 8731 insertions(+), 7008 deletions(-) delete mode 100644 dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDAgentApiTest.groovy delete mode 100644 dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDAgentWriterCombinedTest.groovy delete mode 100644 dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDAgentWriterTest.groovy delete mode 100644 dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDIntakeWriterCombinedTest.groovy delete mode 100644 dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDIntakeWriterTest.groovy delete mode 100644 dd-trace-core/src/test/groovy/datadog/trace/common/writer/MultiWriterTest.groovy delete mode 100644 dd-trace-core/src/test/groovy/datadog/trace/common/writer/PayloadDispatcherImplTest.groovy delete mode 100644 dd-trace-core/src/test/groovy/datadog/trace/common/writer/PrioritizationTest.groovy delete mode 100644 dd-trace-core/src/test/groovy/datadog/trace/common/writer/SerializationTest.groovy delete mode 100644 dd-trace-core/src/test/groovy/datadog/trace/common/writer/SpanSamplingWorkerTest.groovy delete mode 100644 dd-trace-core/src/test/groovy/datadog/trace/common/writer/TraceMapperTest.groovy delete mode 100644 dd-trace-core/src/test/groovy/datadog/trace/common/writer/TraceProcessingWorkerTest.groovy delete mode 100644 dd-trace-core/src/test/groovy/datadog/trace/common/writer/WriterFactoryTest.groovy delete mode 100644 dd-trace-core/src/test/groovy/datadog/trace/common/writer/ddagent/TraceMapperV04PayloadTest.groovy delete mode 100644 dd-trace-core/src/test/groovy/datadog/trace/common/writer/ddagent/TraceMapperV05PayloadTest.groovy delete mode 100644 dd-trace-core/src/test/groovy/datadog/trace/common/writer/ddagent/TraceMapperV1PayloadTest.groovy delete mode 100644 dd-trace-core/src/test/groovy/datadog/trace/common/writer/ddintake/DDEvpProxyApiTest.groovy delete mode 100644 dd-trace-core/src/test/groovy/datadog/trace/common/writer/ddintake/DDIntakeApiTest.groovy delete mode 100644 dd-trace-core/src/test/groovy/datadog/trace/common/writer/ddintake/DDIntakeTraceInterceptorTest.groovy delete mode 100644 dd-trace-core/src/test/groovy/datadog/trace/common/writer/ddintake/DDIntakeTrackTypeResolverTest.groovy create mode 100644 dd-trace-core/src/test/java/datadog/trace/common/writer/DDAgentApiTest.java create mode 100644 dd-trace-core/src/test/java/datadog/trace/common/writer/DDAgentWriterCombinedTest.java create mode 100644 dd-trace-core/src/test/java/datadog/trace/common/writer/DDAgentWriterTest.java create mode 100644 dd-trace-core/src/test/java/datadog/trace/common/writer/DDIntakeWriterCombinedTest.java create mode 100644 dd-trace-core/src/test/java/datadog/trace/common/writer/DDIntakeWriterTest.java create mode 100644 dd-trace-core/src/test/java/datadog/trace/common/writer/MultiWriterTest.java create mode 100644 dd-trace-core/src/test/java/datadog/trace/common/writer/PayloadDispatcherImplTest.java create mode 100644 dd-trace-core/src/test/java/datadog/trace/common/writer/PrioritizationTest.java create mode 100644 dd-trace-core/src/test/java/datadog/trace/common/writer/SerializationTest.java create mode 100644 dd-trace-core/src/test/java/datadog/trace/common/writer/SpanSamplingWorkerTest.java create mode 100644 dd-trace-core/src/test/java/datadog/trace/common/writer/TraceMapperTest.java create mode 100644 dd-trace-core/src/test/java/datadog/trace/common/writer/TraceProcessingWorkerTest.java create mode 100644 dd-trace-core/src/test/java/datadog/trace/common/writer/WriterFactoryTest.java create mode 100644 dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV04PayloadTest.java create mode 100644 dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV05PayloadTest.java create mode 100644 dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV1PayloadTest.java create mode 100644 dd-trace-core/src/test/java/datadog/trace/common/writer/ddintake/DDEvpProxyApiTest.java create mode 100644 dd-trace-core/src/test/java/datadog/trace/common/writer/ddintake/DDIntakeApiTest.java create mode 100644 dd-trace-core/src/test/java/datadog/trace/common/writer/ddintake/DDIntakeTraceInterceptorTest.java create mode 100644 dd-trace-core/src/test/java/datadog/trace/common/writer/ddintake/DDIntakeTrackTypeResolverTest.java diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/TraceProcessingWorker.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/TraceProcessingWorker.java index 39430eac71c..9b70b09bc9e 100644 --- a/dd-trace-core/src/main/java/datadog/trace/common/writer/TraceProcessingWorker.java +++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/TraceProcessingWorker.java @@ -9,6 +9,7 @@ import datadog.common.queue.Queues; import datadog.communication.ddagent.DroppingPolicy; import datadog.trace.api.Config; +import datadog.trace.api.internal.VisibleForTesting; import datadog.trace.bootstrap.instrumentation.api.SpanPostProcessor; import datadog.trace.common.sampling.SingleSpanSampler; import datadog.trace.common.writer.ddagent.FlushEvent; @@ -122,6 +123,11 @@ public long getRemainingCapacity() { return primaryQueue.remainingCapacity(); } + @VisibleForTesting + MessagePassingBlockingQueue getPrimaryQueue() { + return primaryQueue; + } + private static MessagePassingBlockingQueue createQueue(int capacity) { return Queues.mpscBlockingConsumerArrayQueue(capacity); } diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDAgentApiTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDAgentApiTest.groovy deleted file mode 100644 index e4cc7d88fd3..00000000000 --- a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDAgentApiTest.groovy +++ /dev/null @@ -1,493 +0,0 @@ -package datadog.trace.common.writer - -import static datadog.trace.agent.test.server.http.TestHttpServer.httpServer -import static datadog.trace.api.ProtocolVersion.V0_4 -import static datadog.trace.api.ProtocolVersion.V0_5 -import static datadog.trace.api.ProtocolVersion.V1_0 - -import com.fasterxml.jackson.core.type.TypeReference -import com.fasterxml.jackson.databind.ObjectMapper -import datadog.communication.ddagent.DDAgentFeaturesDiscovery -import datadog.communication.http.OkHttpUtils -import datadog.communication.serialization.ByteBufferConsumer -import datadog.communication.serialization.FlushingBuffer -import datadog.communication.serialization.msgpack.MsgPackWriter -import datadog.metrics.api.Monitoring -import datadog.metrics.api.statsd.StatsDClient -import datadog.metrics.impl.MonitoringImpl -import datadog.trace.api.Config -import datadog.trace.api.ProcessTags -import datadog.trace.api.ProtocolVersion -import datadog.trace.bootstrap.instrumentation.api.InstrumentationTags -import datadog.trace.common.sampling.RateByServiceTraceSampler -import datadog.trace.common.writer.ddagent.DDAgentApi -import datadog.trace.common.writer.ddagent.TraceMapper -import datadog.trace.common.writer.ddagent.TraceMapperV0_4 -import datadog.trace.common.writer.ddagent.TraceMapperV0_5 -import datadog.trace.common.writer.ddagent.TraceMapperV1 -import datadog.trace.core.DDSpan -import datadog.trace.core.DDSpanContext -import datadog.trace.core.propagation.PropagationTags -import datadog.trace.core.test.DDCoreSpecification -import java.nio.ByteBuffer -import java.util.concurrent.RejectedExecutionException -import java.util.concurrent.TimeUnit -import java.util.concurrent.atomic.AtomicLong -import java.util.concurrent.atomic.AtomicReference -import okhttp3.HttpUrl -import okhttp3.OkHttpClient -import org.msgpack.jackson.dataformat.MessagePackFactory -import spock.lang.Shared -import spock.lang.Timeout - -@Timeout(20) -class DDAgentApiTest extends DDCoreSpecification { - - @Shared - Monitoring monitoring = new MonitoringImpl(StatsDClient.NO_OP, 1, TimeUnit.SECONDS) - static mapper = new ObjectMapper(new MessagePackFactory()) - - static newAgent(String latestVersion) { - httpServer { - handlers { - put(latestVersion) { - if (request.contentType != "application/msgpack") { - response.status(400).send("wrong type: $request.contentType") - } else if (request.contentLength <= 0) { - response.status(400).send("no content") - } else { - response.status(200).send() - } - } - } - } - } - - - def "sending an empty list of traces returns no errors"() { - setup: - def agent = newAgent(agentVersion) - def client = createAgentApi(agent.address.toString(), protocolVersion)[1] - def payload = prepareTraces(agentVersion, []) - - expect: - def response = client.sendSerializedTraces(payload) - response.success() - response.status().present - response.status().asInt == 200 - agent.getLastRequest().path == "/" + agentVersion - - cleanup: - agent.close() - - where: - agentVersion | protocolVersion - "v0.3/traces" | V0_4 - "v0.4/traces" | V0_4 - "v0.5/traces" | V0_5 - "v1.0/traces" | V1_0 - } - - def "response body propagated in case of non-200 response"() { - setup: - def agent = httpServer { - handlers { - put("v0.4/traces") { - response.status(400).send("Test error") - } - } - } - def client = createAgentApi(agent.address.toString())[1] - Payload payload = prepareTraces("v0.4/traces", []) - - expect: - def clientResponse = client.sendSerializedTraces(payload) - !clientResponse.success() - clientResponse.status().present - clientResponse.status().asInt == 400 - clientResponse.response == "Test error" - - cleanup: - agent.close() - } - - def "non-200 response"() { - setup: - def agent = httpServer { - handlers { - put("v0.4/traces") { - response.status(404).send() - } - - put("v0.3/traces") { - response.status(404).send() - } - } - } - def client = createAgentApi(agent.address.toString())[1] - Payload payload = prepareTraces("v0.3/traces", []) - expect: - def clientResponse = client.sendSerializedTraces(payload) - !clientResponse.success() - clientResponse.status().present - clientResponse.status().asInt == 404 - agent.getLastRequest().path == "/v0.3/traces" - - cleanup: - agent.close() - } - - def "content is sent as MSGPACK"() { - setup: - def agent = httpServer { - handlers { - put(agentVersion) { - response.send() - } - } - } - def client = createAgentApi(agent.address.toString())[1] - def payload = prepareTraces(agentVersion, traces) - - expect: - client.sendSerializedTraces(payload).success() - agent.lastRequest.contentType == "application/msgpack" - agent.lastRequest.headers.get("Datadog-Client-Computed-Top-Level") == "true" - agent.lastRequest.headers.get("Datadog-Meta-Lang") == "java" - agent.lastRequest.headers.get("Datadog-Meta-Lang-Version") == System.getProperty("java.version", "unknown") - agent.lastRequest.headers.get("Datadog-Meta-Tracer-Version") == "Stubbed-Test-Version" - agent.lastRequest.headers.get("X-Datadog-Trace-Count") == "${traces.size()}" - agent.lastRequest.headers.get("Datadog-Client-Dropped-P0-Traces") == "${payload.droppedTraces()}" - agent.lastRequest.headers.get("Datadog-Client-Dropped-P0-Spans") == "${payload.droppedSpans()}" - convertList(agentVersion, agent.lastRequest.body) == expectedRequestBody - - cleanup: - agent.close() - - // Populate thread info dynamically as it is different when run via gradle vs idea. - where: - // spotless:off - traces | expectedRequestBody - [] | [] - // service propagation enabled - [[buildSpan(1L, "service.name", "my-service", PropagationTags.factory().fromHeaderValue(PropagationTags.HeaderType.DATADOG, "_dd.p.usr=123"))]] | [[new TreeMap<>([ - "duration" : 10, - "error" : 0, - "meta" : ["thread.name": Thread.currentThread().getName(), "_dd.p.usr": "123", "_dd.p.dm": "-1", "_dd.p.ksr": "1", "_dd.svc_src" : "m"] + - (Config.get().isExperimentalPropagateProcessTagsEnabled() ? ["_dd.tags.process" : ProcessTags.getTagsForSerialization().toString()] : []), - "metrics" : [ - (DDSpanContext.PRIORITY_SAMPLING_KEY) : 1, - (InstrumentationTags.DD_TOP_LEVEL as String) : 1, - (RateByServiceTraceSampler.SAMPLING_AGENT_RATE): 1.0, - "thread.id" : Thread.currentThread().id - ], - "name" : "fakeOperation", - "parent_id": 0, - "resource" : "fakeResource", - "service" : "my-service", - "span_id" : 1, - "start" : 1000, - "trace_id" : 1, - "type" : "fakeType" - ])]] - // service propagation disabled - [[buildSpan(100L, "resource.name", "my-resource", PropagationTags.factory().fromHeaderValue(PropagationTags.HeaderType.DATADOG, "_dd.p.usr=123"))]] | [[new TreeMap<>([ - "duration" : 10, - "error" : 0, - "meta" : ["thread.name": Thread.currentThread().getName(), "_dd.p.usr": "123", "_dd.p.dm": "-1", "_dd.p.ksr": "1"] + - (Config.get().isExperimentalPropagateProcessTagsEnabled() ? ["_dd.tags.process" : ProcessTags.getTagsForSerialization().toString()] : []), - "metrics" : [ - (DDSpanContext.PRIORITY_SAMPLING_KEY) : 1, - (InstrumentationTags.DD_TOP_LEVEL as String) : 1, - (RateByServiceTraceSampler.SAMPLING_AGENT_RATE): 1.0, - "thread.id" : Thread.currentThread().id - ], - "name" : "fakeOperation", - "parent_id": 0, - "resource" : "my-resource", - "service" : "fakeService", - "span_id" : 1, - "start" : 100000, - "trace_id" : 1, - "type" : "fakeType" - ])]] - // spotless:on - - ignore = traces.each { - it.each { - it.finish() - it.@durationNano = 10 - } - } - agentVersion << ["v0.3/traces", "v0.4/traces", "v0.4/traces"] - } - - def "Api ResponseListeners see 200 responses"() { - setup: - def agentResponse = new AtomicReference(null) - RemoteResponseListener responseListener = { String endpoint, Map responseJson -> - agentResponse.set(responseJson) - } - def agent = httpServer { - handlers { - put(agentVersion) { - def status = request.contentLength > 0 ? 200 : 500 - response.status(status).send('{"hello":{}}') - } - } - } - def client = createAgentApi(agent.address.toString())[1] - client.addResponseListener(responseListener) - def payload = prepareTraces(agentVersion, [[], [], []]) - payload.withDroppedTraces(1) - payload.withDroppedTraces(3) - - when: - client.sendSerializedTraces(payload) - then: - agentResponse.get() == ["hello": [:]] - agent.lastRequest.headers.get("Datadog-Meta-Lang") == "java" - agent.lastRequest.headers.get("Datadog-Meta-Lang-Version") == System.getProperty("java.version", "unknown") - agent.lastRequest.headers.get("Datadog-Meta-Tracer-Version") == "Stubbed-Test-Version" - agent.lastRequest.headers.get("X-Datadog-Trace-Count") == "3" // false data shows the value provided via traceCounter. - agent.lastRequest.headers.get("Datadog-Client-Dropped-P0-Traces") == "${payload.droppedTraces()}" - agent.lastRequest.headers.get("Datadog-Client-Dropped-P0-Spans") == "${payload.droppedSpans()}" - - cleanup: - agent.close() - - where: - agentVersion << ["v0.3/traces", "v0.4/traces", "v0.5/traces"] - } - - def "Api Downgrades to v3 if v0.4 not available"() { - setup: - def v3Agent = httpServer { - handlers { - put("v0.3/traces") { - def status = request.contentLength > 0 ? 200 : 500 - response.status(status).send() - } - } - } - def client = createAgentApi(v3Agent.address.toString())[1] - def payload = prepareTraces("v0.4/traces", []) - expect: - client.sendSerializedTraces(payload).success() - v3Agent.getLastRequest().path == "/v0.3/traces" - - cleanup: - v3Agent.close() - } - - def "Api Downgrades to v3 if timeout exceeded (#delayTrace, #badPort)"() { - // This test is unfortunately only exercising the read timeout, not the connect timeout. - setup: - def agent = httpServer { - handlers { - put("v0.3/traces") { - def status = request.contentLength > 0 ? 200 : 500 - response.status(status).send() - } - put("v0.4/traces") { - Thread.sleep(delayTrace) - def status = request.contentLength > 0 ? 200 : 500 - response.status(status).send() - } - } - } - def port = badPort ? 999 : agent.address.port - def client = createAgentApi("http://" + agent.address.host + ":" + port)[1] - def payload = prepareTraces("v0.4/traces", []) - def result = client.sendSerializedTraces(payload) - - expect: - result.success() == !badPort // Expect success of port is ok - if (!badPort) { - assert agent.getLastRequest().path == "/$endpointVersion/traces" - } - - cleanup: - agent.close() - - where: - endpointVersion | delayTrace | badPort - "v0.4" | 0 | false - "v0.3" | 0 | true - "v0.4" | 500 | false - "v0.3" | 30000 | false - } - - def "verify content length"() { - setup: - def receivedContentLength = new AtomicLong() - def agent = httpServer { - handlers { - put(agentVersion) { - receivedContentLength.set(request.contentLength) - response.status(200).send() - } - } - } - def client = createAgentApi(agent.address.toString())[1] - def payload = prepareTraces(agentVersion, traces) - when: - def success = client.sendSerializedTraces(payload).success() - then: - success - receivedContentLength.get() == expectedLength - - cleanup: - agent.close() - - // all the tested traces are empty (why?) and it just so happens that - // arrays and maps take the same amount of space in messagepack, so - // all the sizes match, except in v0.5 where there is 1 byte for a - // 2 element array header and 1 byte for an empty dictionary - where: - // spotless:off - agentVersion | expectedLength | traces - "v0.4/traces" | 1 | [] - "v0.4/traces" | 3 | [[], []] - "v0.4/traces" | 16 | (1..15).collect { [] } - "v0.4/traces" | 19 | (1..16).collect { [] } - "v0.4/traces" | 65538 | (1..((1 << 16) - 1)).collect { [] } - "v0.4/traces" | 65541 | (1..(1 << 16)).collect { [] } - "v0.5/traces" | 1 + 1 + 1 | [] - "v0.5/traces" | 3 + 1 + 1 | [[], []] - "v0.5/traces" | 16 + 1 + 1 | (1..15).collect { [] } - "v0.5/traces" | 19 + 1 + 1 | (1..16).collect { [] } - "v0.5/traces" | 65538 + 1 + 1 | (1..((1 << 16) - 1)).collect { [] } - "v0.5/traces" | 65541 + 1 + 1 | (1..(1 << 16)).collect { [] } - // spotless:on - } - - def "Embedded HTTP client rejects async requests"() { - setup: - def agent = newAgent("v0.5/traces") - def (discovery, client) = createAgentApi(agent.address.toString()) - discovery.discover() - def httpExecutorService = client.httpClient.dispatcher().executorService() - when: - httpExecutorService.execute({}) - then: - thrown RejectedExecutionException - and: - httpExecutorService.isShutdown() - cleanup: - agent.close() - } - - void 'test metaStruct support on the encoded spans'() { - setup: - def agentVersion = 'v0.4/traces' - def meta1 = 'Hello World!' - def meta2 = [Hello: ' World!'] - def agent = httpServer { - handlers { - put(agentVersion) { - response.send() - } - } - } - def client = createAgentApi(agent.address.toString())[1] - def span = buildSpan(1L, "fakeType", [:]) - .setMetaStruct('meta_1', meta1) - .setMetaStruct('meta_2', meta2) - def payload = prepareTraces(agentVersion, [[span]]) - - expect: - client.sendSerializedTraces(payload).success() - def body = convertList(agentVersion, agent.lastRequest.body)[0][0] - def metaStruct = body['meta_struct'] as Map - assert metaStruct.size() == 2 - assert mapper.readValue(metaStruct['meta_1'], String) == meta1 - assert mapper.readValue(metaStruct['meta_2'], Map) == meta2 - - cleanup: - agent.close() - } - - static List>> convertList(String agentVersion, byte[] bytes) { - if (agentVersion.equals("v0.5/traces")) { - return convertListV5(bytes) - } - def returnVal = mapper.readValue(bytes, new TypeReference>>>() {}) - returnVal.each { - it.each { - it["meta"].remove("runtime-id") - it["meta"].remove("language") - } - } - - return returnVal - } - - static List>> convertListV5(byte[] bytes) { - List>> traces = mapper.readValue(bytes, new TypeReference>>>() {}) - List>> maps = new ArrayList<>(traces.size()) - for (List> trace : traces) { - List> mapTrace = new ArrayList<>() - for (List span : trace) { - TreeMap map = new TreeMap<>() - if (!span.isEmpty()) { - map.put("service", span.get(0)) - map.put("name", span.get(1)) - map.put("resource", span.get(2)) - map.put("trace_id", span.get(3)) - map.put("span_id", span.get(4)) - map.put("parent_id", span.get(5)) - map.put("start", span.get(6)) - map.put("duration", span.get(7)) - map.put("error", span.get(8)) - map.put("meta", span.get(9)) - map.put("metrics", span.get(10)) - map.put("type", span.get(11)) - - map.get("meta").remove("runtime-id") - map.get("meta").remove("language") - } - mapTrace.add(map) - } - maps.add(mapTrace) - } - return maps - } - - Payload prepareTraces(String agentVersion, List> traces) { - Traces traceCapture = new Traces() - def packer = new MsgPackWriter(new FlushingBuffer(1 << 20, traceCapture)) - - TraceMapper traceMapper = [ - "v1.0/traces": new TraceMapperV1(), - "v0.5/traces": new TraceMapperV0_5(), - ].get(agentVersion, new TraceMapperV0_4()) - - for (trace in traces) { - packer.format(trace, traceMapper) - } - packer.flush() - - return traceMapper.newPayload() - .withBody(traceCapture.traceCount, - traces.isEmpty() ? ByteBuffer.allocate(0) : traceCapture.buffer) - } - - static class Traces implements ByteBufferConsumer { - int traceCount - ByteBuffer buffer - - @Override - void accept(int messageCount, ByteBuffer buffer) { - this.buffer = buffer - this.traceCount = messageCount - } - } - - def createAgentApi(String url, ProtocolVersion protocolVersion = V0_5) { - HttpUrl agentUrl = HttpUrl.get(url) - OkHttpClient client = OkHttpUtils.buildHttpClient(agentUrl, 1000) - DDAgentFeaturesDiscovery discovery = new DDAgentFeaturesDiscovery(client, monitoring, agentUrl, protocolVersion, true, false) - return [discovery, new DDAgentApi(client, agentUrl, discovery, monitoring, false)] - } -} diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDAgentWriterCombinedTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDAgentWriterCombinedTest.groovy deleted file mode 100644 index 1659ab44da3..00000000000 --- a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDAgentWriterCombinedTest.groovy +++ /dev/null @@ -1,753 +0,0 @@ -package datadog.trace.common.writer - -import static datadog.trace.agent.test.server.http.TestHttpServer.httpServer -import static datadog.trace.api.ProtocolVersion.V0_5 -import static datadog.trace.api.config.GeneralConfig.EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED -import static datadog.trace.common.writer.DDAgentWriter.BUFFER_SIZE -import static datadog.trace.common.writer.ddagent.Prioritization.ENSURE_TRACE - -import datadog.communication.ddagent.DDAgentFeaturesDiscovery -import datadog.communication.http.OkHttpUtils -import datadog.communication.serialization.ByteBufferConsumer -import datadog.communication.serialization.FlushingBuffer -import datadog.communication.serialization.Mapper -import datadog.communication.serialization.msgpack.MsgPackWriter -import datadog.metrics.api.statsd.StatsDClient -import datadog.metrics.impl.MonitoringImpl -import datadog.trace.api.DDSpanId -import datadog.trace.api.DDTraceId -import datadog.trace.api.ProcessTags -import datadog.trace.api.datastreams.NoopPathwayContext -import datadog.trace.api.sampling.PrioritySampling -import datadog.trace.common.writer.ddagent.DDAgentApi -import datadog.trace.common.writer.ddagent.TraceMapperV0_4 -import datadog.trace.common.writer.ddagent.TraceMapperV0_5 -import datadog.trace.core.CoreTracer -import datadog.trace.core.DDSpan -import datadog.trace.core.DDSpanContext -import datadog.trace.core.PendingTrace -import datadog.trace.core.monitor.HealthMetrics -import datadog.trace.core.monitor.TracerHealthMetrics -import datadog.trace.core.propagation.PropagationTags -import datadog.trace.core.test.DDCoreSpecification -import datadog.trace.test.util.Flaky -import java.nio.ByteBuffer -import java.util.concurrent.CountDownLatch -import java.util.concurrent.Phaser -import java.util.concurrent.Semaphore -import java.util.concurrent.TimeUnit -import java.util.concurrent.atomic.AtomicInteger -import okhttp3.HttpUrl -import spock.lang.Timeout -import spock.util.concurrent.PollingConditions - -@Timeout(10) -class DDAgentWriterCombinedTest extends DDCoreSpecification { - - def conditions = new PollingConditions(timeout: 5, initialDelay: 0, factor: 1.25) - def monitoring = new MonitoringImpl(StatsDClient.NO_OP, 1, TimeUnit.SECONDS) - def phaser = new Phaser() - - // Only used to create spans - def dummyTracer = tracerBuilder().writer(new ListWriter()).build() - - def apiWithVersion(String version) { - return Mock(DDAgentApi) - } - - def setup() { - // Register for two threads. - phaser.register() - phaser.register() - } - - def cleanup() { - dummyTracer?.close() - } - - def "no interactions because of initial flush"() { - setup: - def api = apiWithVersion(agentVersion) - def writer = DDAgentWriter.builder() - .agentApi(api) - .traceBufferSize(8) - .monitoring(monitoring) - .flushIntervalMilliseconds(-1) - .build() - writer.start() - - when: - writer.flush() - - then: - 0 * _ - - cleanup: - writer.close() - - where: - agentVersion << ["v0.3/traces", "v0.4/traces", "v0.5/traces"] - } - - def "test happy path"() { - setup: - def api = Mock(DDAgentApi) - def discovery = Mock(DDAgentFeaturesDiscovery) - def writer = DDAgentWriter.builder() - .featureDiscovery(discovery) - .agentApi(api) - .traceBufferSize(1024) - .monitoring(monitoring) - .flushIntervalMilliseconds(-1) - .build() - writer.start() - def trace = [dummyTracer.buildSpan("datadog", "fakeOperation").start()] - - when: - writer.write(trace) - writer.write(trace) - writer.flush() - - then: - 2 * discovery.getTraceEndpoint() >> agentVersion - 1 * api.sendSerializedTraces({ it.traceCount() == 2 }) >> RemoteApi.Response.success(200) - 0 * _ - - cleanup: - writer.close() - - where: - agentVersion << ["v0.3/traces", "v0.4/traces", "v0.5/traces"] - } - - def "test flood of traces"() { - setup: - def api = Mock(DDAgentApi) - def discovery = Mock(DDAgentFeaturesDiscovery) - def writer = DDAgentWriter.builder() - .featureDiscovery(discovery) - .agentApi(api) - .traceBufferSize(bufferSize) - .monitoring(monitoring) - .flushIntervalMilliseconds(-1) - .build() - writer.start() - def trace = [dummyTracer.buildSpan("datadog", "fakeOperation").start()] - - when: - (1..traceCount).each { - writer.write(trace) - } - writer.flush() - - then: - 2 * discovery.getTraceEndpoint() >> agentVersion - 1 * api.sendSerializedTraces({ it.traceCount() <= traceCount }) >> RemoteApi.Response.success(200) - 0 * _ - - cleanup: - writer.close() - - where: - bufferSize = 1024 - traceCount = 100 // Shouldn't trigger payload, but bigger than the disruptor size. - agentVersion << ["v0.3/traces", "v0.4/traces", "v0.5/traces"] - } - - def "test flush by time"() { - setup: - def healthMetrics = Mock(HealthMetrics) - def api = Mock(DDAgentApi) - def discovery = Mock(DDAgentFeaturesDiscovery) - def writer = DDAgentWriter.builder() - .featureDiscovery(discovery) - .agentApi(api) - .healthMetrics(healthMetrics) - .monitoring(monitoring) - .flushIntervalMilliseconds(1000) - .build() - writer.start() - def span = dummyTracer.buildSpan("datadog", "fakeOperation").start() - def trace = (1..10).collect { span } - - when: - (1..5).each { - writer.write(trace) - } - phaser.awaitAdvanceInterruptibly(phaser.arriveAndDeregister()) - - then: - 2 * discovery.getTraceEndpoint() >> agentVersion - 1 * healthMetrics.onSerialize(_) - 1 * api.sendSerializedTraces({ it.traceCount() == 5 }) >> RemoteApi.Response.success(200) - _ * healthMetrics.onPublish(_, _) - 1 * healthMetrics.onSend(_, _, _) >> { - phaser.arrive() - } - 0 * _ - - cleanup: - writer.close() - - where: - agentVersion << ["v0.3/traces", "v0.4/traces", "v0.5/traces"] - } - - @Timeout(30) - def "test default buffer size for #agentVersion"() { - setup: - // disable process tags since they are only written on the first span and it will break the trace size estimation - injectSysConfig(EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, "false") - ProcessTags.reset() - def api = Mock(DDAgentApi) - def discovery = Mock(DDAgentFeaturesDiscovery) - def writer = DDAgentWriter.builder() - .featureDiscovery(discovery) - .agentApi(api) - .traceBufferSize(BUFFER_SIZE) - .prioritization(ENSURE_TRACE) - .monitoring(monitoring) - .flushIntervalMilliseconds(-1) - .build() - writer.start() - - when: - def mapper = agentVersion.equals("v0.5/traces") ? new TraceMapperV0_5() : new TraceMapperV0_4() - int traceSize = calculateSize(minimalTrace, mapper) - int maxedPayloadTraceCount = ((int) ((mapper.messageBufferSize()) / traceSize)) - (0..maxedPayloadTraceCount).each { - writer.write(minimalTrace) - } - writer.flush() - - then: - 2 * discovery.getTraceEndpoint() >> agentVersion - 1 * api.sendSerializedTraces({ it.traceCount() == maxedPayloadTraceCount }) >> RemoteApi.Response.success(200) - 1 * api.sendSerializedTraces({ it.traceCount() == 1 }) >> RemoteApi.Response.success(200) - 0 * _ - - cleanup: - injectSysConfig(EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, "true") - ProcessTags.reset() - writer.close() - - where: - minimalTrace = createMinimalTrace() - agentVersion << ["v0.3/traces", "v0.4/traces", "v0.5/traces"] - } - - def "check that there are no interactions after close"() { - setup: - def healthMetrics = Mock(HealthMetrics) - def api = Mock(DDAgentApi) - def discovery = Mock(DDAgentFeaturesDiscovery) - def writer = DDAgentWriter.builder() - .featureDiscovery(discovery) - .agentApi(api) - .healthMetrics(healthMetrics) - .monitoring(monitoring) - .build() - writer.start() - - when: - writer.close() - writer.write([]) - writer.flush() - - then: - // this will be checked during flushing - 1 * healthMetrics.onFailedPublish(_,_) - 1 * healthMetrics.onFlush(_) - 1 * healthMetrics.onShutdown(_) - 1 * healthMetrics.close() - 0 * _ - - cleanup: - writer.close() - - where: - agentVersion << ["v0.3/traces", "v0.4/traces", "v0.5/traces"] - } - - def createMinimalContext() { - def tracer = Stub(CoreTracer) - def trace = Stub(PendingTrace) - trace.mapServiceName(_) >> { String serviceName -> serviceName } - trace.getTracer() >> tracer - return new DDSpanContext( - DDTraceId.ONE, - 1, - DDSpanId.ZERO, - "", - "", - "", - "", - PrioritySampling.UNSET, - "", - [:], - false, - "", - 0, - trace, - null, - null, - NoopPathwayContext.INSTANCE, - false, - PropagationTags.factory().empty()) - } - - def createMinimalTrace() { - def context = createMinimalContext() - def minimalSpan = new DDSpan("test", 0, context, null) - context.getTraceCollector().getRootSpan() >> minimalSpan - def minimalTrace = [minimalSpan] - - return minimalTrace - } - - def "monitor happy path"() { - setup: - def healthMetrics = Mock(HealthMetrics) - def minimalTrace = createMinimalTrace() - - // DQH -- need to set-up a dummy agent for the final send callback to work - def agent = httpServer { - handlers { - put(agentVersion) { - response.status(200).send() - } - } - } - def agentUrl = HttpUrl.get(agent.address) - def client = OkHttpUtils.buildHttpClient(agentUrl, 1000) - def discovery = new DDAgentFeaturesDiscovery(client, monitoring, agentUrl, V0_5, true, false) - def api = new DDAgentApi(client, agentUrl, discovery, monitoring, true) - def writer = DDAgentWriter.builder() - .featureDiscovery(discovery) - .agentApi(api) - .monitoring(monitoring) - .healthMetrics(healthMetrics).build() - - when: - writer.start() - - then: - 1 * healthMetrics.onStart(writer.getCapacity()) - - when: - writer.write(minimalTrace) - writer.flush() - - then: - 1 * healthMetrics.onPublish(minimalTrace, _) - 1 * healthMetrics.onSerialize(_) - 1 * healthMetrics.onFlush(false) - 1 * healthMetrics.onSend(1, _, { response -> response.success() && response.status().present && response.status().asInt == 200 }) - - when: - writer.close() - - then: - 1 * healthMetrics.onShutdown(true) - - cleanup: - agent.close() - - where: - agentVersion << ["v0.3/traces", "v0.4/traces", "v0.5/traces"] - } - - def "monitor agent returns error"() { - setup: - def healthMetrics = Mock(HealthMetrics) - def minimalTrace = createMinimalTrace() - - // DQH -- need to set-up a dummy agent for the final send callback to work - def first = true - def agent = httpServer { - handlers { - put(agentVersion) { - // DQH - DDApi sniffs for end point existence, so respond with 200 the first time - if (first) { - response.status(200).send() - first = false - } else { - response.status(500).send() - } - } - } - } - def agentUrl = HttpUrl.get(agent.address) - def client = OkHttpUtils.buildHttpClient(agentUrl, 1000) - def discovery = new DDAgentFeaturesDiscovery(client, monitoring, agentUrl, V0_5, true, false) - def api = new DDAgentApi(client, agentUrl, discovery, monitoring, true) - def writer = DDAgentWriter.builder() - .featureDiscovery(discovery) - .agentApi(api) - .monitoring(monitoring) - .healthMetrics(healthMetrics).build() - - when: - writer.start() - - then: - 1 * healthMetrics.onStart(writer.getCapacity()) - - when: - writer.write(minimalTrace) - writer.flush() - - then: - 1 * healthMetrics.onPublish(minimalTrace, _) - 1 * healthMetrics.onSerialize(_) - 1 * healthMetrics.onFlush(false) - 1 * healthMetrics.onFailedSend(1, _, { response -> !response.success() && response.status().present && response.status().asInt == 500 }) - - when: - writer.close() - - then: - 1 * healthMetrics.onShutdown(true) - - cleanup: - agent.close() - - where: - agentVersion << ["v0.3/traces", "v0.4/traces", "v0.5/traces"] - } - - def "unreachable agent test"() { - setup: - def healthMetrics = Mock(HealthMetrics) - def minimalTrace = createMinimalTrace() - def version = agentVersion - def discovery = Stub(DDAgentFeaturesDiscovery) { - it.getTraceEndpoint() >> version - } - def api = Mock(DDAgentApi) { - it.sendSerializedTraces(_) >> { - // simulating a communication failure to a server - return RemoteApi.Response.failed(new IOException("comm error")) - } - } - - def writer = DDAgentWriter.builder() - .featureDiscovery(discovery) - .agentApi(api) - .monitoring(monitoring) - .healthMetrics(healthMetrics).build() - - when: - writer.start() - - then: - 1 * healthMetrics.onStart(writer.getCapacity()) - - when: - writer.write(minimalTrace) - writer.flush() - - then: - // if we know there's no agent, we'll drop the traces before serialising them - // but we also know that there's nowhere to send health metrics to - 1 * healthMetrics.onPublish(_, _) - 1 * healthMetrics.onFlush(false) - - when: - writer.close() - - then: - 1 * healthMetrics.onShutdown(true) - - where: - agentVersion << ["v0.3/traces", "v0.4/traces", "v0.5/traces"] - } - - @Flaky("If execution is too slow, the http client timeout may trigger") - def "slow response test"() { - def numWritten = 0 - def numFlushes = new AtomicInteger(0) - def numPublished = new AtomicInteger(0) - def numFailedPublish = new AtomicInteger(0) - def numRequests = new AtomicInteger(0) - def numFailedRequests = new AtomicInteger(0) - - def responseSemaphore = new Semaphore(1) - - setup: - def version = agentVersion - - // Need to set-up a dummy agent for the final send callback to work - def agent = httpServer { - handlers { - put(version) { - responseSemaphore.acquire() - try { - response.status(200).send() - } finally { - responseSemaphore.release() - } - } - } - } - - // This test focuses just on failed publish, so not verifying every callback - def healthMetrics = Stub(HealthMetrics) { - onPublish(_, _) >> { - numPublished.incrementAndGet() - } - onFailedPublish(_,_) >> { - numFailedPublish.incrementAndGet() - } - onFlush(_) >> { - numFlushes.incrementAndGet() - } - onSend(_, _, _) >> { - numRequests.incrementAndGet() - } - onFailedSend(_, _, _) >> { - numFailedRequests.incrementAndGet() - } - } - - def writer = DDAgentWriter.builder() - .traceAgentProtocolVersion(V0_5) - .traceAgentPort(agent.address.port) - .monitoring(monitoring) - .healthMetrics(healthMetrics) - .traceBufferSize(bufferSize).build() - writer.start() - - // gate responses - responseSemaphore.acquire() - - when: - // write a single trace and flush - // with responseSemaphore held, the response is blocked but may still time out - writer.write(minimalTrace) - numWritten += 1 - - // sanity check coordination mechanism of test - // release to allow response to be generated - responseSemaphore.release() - writer.flush() - - // reacquire semaphore to stall further responses - responseSemaphore.acquire() - - then: - numFailedPublish.get() == 0 - numPublished.get() == numWritten - numPublished.get() + numFailedPublish.get() == numWritten - numFlushes.get() == 1 - - when: - // send many traces to fill the sender queue... - // loop until outstanding requests > finished requests - while (writer.traceProcessingWorker.getRemainingCapacity() > 0 || numFailedPublish.get() == 0) { - writer.write(minimalTrace) - numWritten += 1 - } - - then: - numFailedPublish.get() > 0 - numPublished.get() + numFailedPublish.get() == numWritten - - when: - - // with both disruptor & queue full, should reject everything - def expectedRejects = 100 - (1..expectedRejects).each { - writer.write(minimalTrace) - numWritten += 1 - } - - then: - numPublished.get() + numFailedPublish.get() == numWritten - - cleanup: - responseSemaphore.release() - - writer.close() - agent.close() - - where: - bufferSize = 16 - minimalTrace = createMinimalTrace() - agentVersion << ["v0.3/traces", "v0.4/traces", "v0.5/traces"] - } - - def "multi threaded"() { - def numPublished = new AtomicInteger(0) - def numFailedPublish = new AtomicInteger(0) - def numRepSent = new AtomicInteger(0) - - setup: - def minimalTrace = createMinimalTrace() - def version = agentVersion - - // Need to set-up a dummy agent for the final send callback to work - def agent = httpServer { - handlers { - put(version) { - response.status(200).send() - } - } - } - - // This test focuses just on failed publish, so not verifying every callback - def healthMetrics = Stub(HealthMetrics) { - onPublish(_, _) >> { - numPublished.incrementAndGet() - } - onFailedPublish(_,_) >> { - numFailedPublish.incrementAndGet() - } - onSend(_, _, _) >> { repCount, sizeInBytes, response -> - numRepSent.addAndGet(repCount) - } - } - - def writer = DDAgentWriter.builder() - .traceAgentProtocolVersion(V0_5) - .traceAgentPort(agent.address.port) - .monitoring(monitoring) - .healthMetrics(healthMetrics).build() - writer.start() - - when: - def producer = { - (1..100).each { - writer.write(minimalTrace) - } - } as Runnable - - def t1 = new Thread(producer) - t1.start() - - def t2 = new Thread(producer) - t2.start() - - t1.join() - t2.join() - - writer.flush() - - then: - conditions.eventually { - def totalTraces = 100 + 100 - assert numPublished.get() == totalTraces - assert numRepSent.get() == totalTraces - } - - cleanup: - writer.close() - agent.close() - - where: - agentVersion << ["v0.3/traces", "v0.4/traces", "v0.5/traces"] - } - - def "statsd success"() { - def numTracesAccepted = new AtomicInteger(0) - def numRequests = new AtomicInteger(0) - def numResponses = new AtomicInteger(0) - - setup: - def minimalTrace = createMinimalTrace() - def version = agentVersion - - // Need to set-up a dummy agent for the final send callback to work - def agent = httpServer { - handlers { - put(version) { - response.status(200).send() - } - } - } - - def healthMetrics = Stub(HealthMetrics) - healthMetrics.onPublish(_, _) >> { - numTracesAccepted.incrementAndGet() - } - healthMetrics.onSend(_, _, _) >> { - numRequests.incrementAndGet() - numResponses.incrementAndGet() - } - def writer = DDAgentWriter.builder() - .agentHost(agent.address.host) - .traceAgentProtocolVersion(V0_5) - .traceAgentPort(agent.address.port) - .monitoring(monitoring) - .healthMetrics(healthMetrics).build() - writer.start() - - when: - writer.write(minimalTrace) - writer.flush() - - then: - numTracesAccepted.get() == 1 - numRequests.get() == 1 - numResponses.get() == 1 - - cleanup: - agent.close() - writer.close() - - where: - agentVersion << ["v0.3/traces", "v0.4/traces", "v0.5/traces"] - } - - def "statsd comm failure"() { - setup: - def minimalTrace = createMinimalTrace() - - def api = apiWithVersion(agentVersion) - api.sendSerializedTraces(_) >> RemoteApi.Response.failed(new IOException("comm error")) - - def latch = new CountDownLatch(2) - def statsd = Mock(StatsDClient) - def healthMetrics = new TracerHealthMetrics(statsd, 100, TimeUnit.MILLISECONDS) - def writer = DDAgentWriter.builder() - .traceAgentProtocolVersion(V0_5) - .agentApi(api).monitoring(monitoring) - .healthMetrics(healthMetrics).build() - healthMetrics.start() - writer.start() - - when: - writer.write(minimalTrace) - writer.flush() - latch.await(10, TimeUnit.SECONDS) - - then: - 1 * statsd.count("api.requests.total", 1, _) >> { - latch.countDown() - } - 0 * statsd.incrementCounter("api.responses.total", _) - 1 * statsd.count("api.errors.total", 1, _) >> { - latch.countDown() - } - - cleanup: - writer.close() - healthMetrics.close() - - where: - agentVersion << ["v0.3/traces", "v0.4/traces", "v0.5/traces"] - } - - static int calculateSize(List trace, Mapper> mapper) { - AtomicInteger size = new AtomicInteger() - def packer = new MsgPackWriter(new FlushingBuffer(1024, new ByteBufferConsumer() { - @Override - void accept(int messageCount, ByteBuffer buffer) { - size.set(buffer.limit() - buffer.position()) - } - })) - packer.format(trace, mapper) - packer.flush() - return size.get() - } -} diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDAgentWriterTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDAgentWriterTest.groovy deleted file mode 100644 index 965f3a88d5e..00000000000 --- a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDAgentWriterTest.groovy +++ /dev/null @@ -1,222 +0,0 @@ -package datadog.trace.common.writer - -import datadog.communication.ddagent.DDAgentFeaturesDiscovery -import datadog.trace.api.DDSpanId -import datadog.trace.api.DDTraceId -import datadog.trace.api.sampling.PrioritySampling -import datadog.trace.api.datastreams.NoopPathwayContext -import datadog.trace.common.writer.ddagent.DDAgentApi -import datadog.trace.common.writer.ddagent.DDAgentMapperDiscovery -import datadog.metrics.api.statsd.StatsDClient -import datadog.metrics.impl.MonitoringImpl -import datadog.trace.core.CoreTracer -import datadog.trace.core.DDSpan -import datadog.trace.core.DDSpanContext -import datadog.trace.core.PendingTrace -import datadog.trace.core.monitor.HealthMetrics -import datadog.trace.core.propagation.PropagationTags -import datadog.trace.core.test.DDCoreSpecification -import spock.lang.Subject - -import java.util.concurrent.TimeUnit - -import static datadog.trace.common.writer.ddagent.PrioritizationStrategy.PublishResult.DROPPED_BUFFER_OVERFLOW -import static datadog.trace.common.writer.ddagent.PrioritizationStrategy.PublishResult.DROPPED_BY_POLICY -import static datadog.trace.common.writer.ddagent.PrioritizationStrategy.PublishResult.ENQUEUED_FOR_SERIALIZATION -import static datadog.trace.common.writer.ddagent.PrioritizationStrategy.PublishResult.ENQUEUED_FOR_SINGLE_SPAN_SAMPLING - -class DDAgentWriterTest extends DDCoreSpecification { - - def monitor = Mock(HealthMetrics) - def worker = Mock(TraceProcessingWorker) - def discovery = Mock(DDAgentFeaturesDiscovery) - def api = Mock(DDAgentApi) - def monitoring = new MonitoringImpl(StatsDClient.NO_OP, 1, TimeUnit.SECONDS) - def dispatcher = new PayloadDispatcherImpl(new DDAgentMapperDiscovery(discovery), api, monitor, monitoring) - - @Subject - def writer = new DDAgentWriter(worker, dispatcher, monitor, 1, TimeUnit.SECONDS, false) - - // Only used to create spans - def dummyTracer = tracerBuilder().writer(new ListWriter()).build() - - def cleanup() { - writer.close() - dummyTracer.close() - } - - def "test writer builder"() { - when: - def writer = DDAgentWriter.builder().build() - - then: - writer != null - } - - def "test writer.start"() { - when: - writer.start() - - then: - 1 * monitor.start() - 1 * worker.start() - 1 * worker.getCapacity() >> capacity - 1 * monitor.onStart(capacity) - 0 * _ - - where: - capacity = 5 - } - - def "test writer.start closed"() { - setup: - writer.close() - - when: - writer.start() - - then: - 0 * _ - } - - def "test writer.flush"() { - when: - writer.flush() - - then: - 1 * worker.flush(1, TimeUnit.SECONDS) >> true - 1 * monitor.onFlush(false) - 0 * _ - - when: - writer.flush() - - then: - 1 * worker.flush(1, TimeUnit.SECONDS) >> false - 0 * _ - } - - def "test writer.flush closed"() { - setup: - writer.close() - - when: - writer.flush() - - then: - 0 * _ - } - - def "test writer.write publish succeeds"() { - setup: - def trace = [dummyTracer.buildSpan("datadog", "fakeOperation").start()] - - when: "publish succeeds" - writer.write(trace) - - then: "monitor is notified of successful publication" - 1 * worker.publish(_, _, trace) >> ENQUEUED_FOR_SERIALIZATION - 1 * monitor.onPublish(trace, _) - 0 * _ - } - - def "test writer.write publish for single span sampling"() { - setup: - def trace = [dummyTracer.buildSpan("datadog", "fakeOperation").start()] - - when: "publish succeeds" - writer.write(trace) - - then: "monitor is notified of successful publication" - 1 * worker.publish(_, _, trace) >> ENQUEUED_FOR_SINGLE_SPAN_SAMPLING - // shouldn't call monitor.onPublish - 0 * _ - } - - def "test writer.write publish fails"() { - setup: - def trace = [dummyTracer.buildSpan("datadog", "fakeOperation").start()] - - when: "publish fails" - writer.write(trace) - - then: "monitor is notified of unsuccessful publication" - 1 * worker.publish(_, _, trace) >> publishResult - 1 * monitor.onFailedPublish(_,_) - 0 * _ - - where: - publishResult << [DROPPED_BUFFER_OVERFLOW, DROPPED_BY_POLICY] - } - - def "empty traces should be reported as failures"() { - when: "trace is empty" - writer.write([]) - - then: "monitor is notified of unsuccessful publication" - 1 * monitor.onFailedPublish(_,_) - 0 * _ - } - - def "test writer.write closed"() { - setup: - writer.close() - def trace = [dummyTracer.buildSpan("datadog", "fakeOperation").start()] - - when: - writer.write(trace) - - then: - 1 * monitor.onFailedPublish(_,_) - 0 * _ - } - - def "dropped trace is counted"() { - setup: - def worker = Mock(TraceProcessingWorker) - def monitor = Stub(HealthMetrics) - def dispatcher = Mock(PayloadDispatcherImpl) - def writer = new DDAgentWriter(worker, dispatcher, monitor, 1, TimeUnit.SECONDS, false) - def p0 = newSpan() - p0.setSamplingPriority(PrioritySampling.SAMPLER_DROP) - def trace = [p0, newSpan()] - - when: - writer.write(trace) - - then: - 1 * worker.publish(trace[0], PrioritySampling.SAMPLER_DROP, trace) >> publishResult - 1 * dispatcher.onDroppedTrace(trace.size()) - - where: - publishResult << [DROPPED_BY_POLICY, DROPPED_BUFFER_OVERFLOW] - } - - def newSpan() { - CoreTracer tracer = Stub(CoreTracer) - PendingTrace trace = Stub(PendingTrace) - trace.mapServiceName(_) >> { String serviceName -> serviceName } - trace.getTracer() >> tracer - def context = new DDSpanContext( - DDTraceId.ONE, - 1, - DDSpanId.ZERO, - null, - "", - "", - "", - PrioritySampling.UNSET, - "", - [:], - false, - "", - 0, - trace, - null, - null, - NoopPathwayContext.INSTANCE, - false, - PropagationTags.factory().empty()) - return new DDSpan("test", 0, context, null) - } -} diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDIntakeWriterCombinedTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDIntakeWriterCombinedTest.groovy deleted file mode 100644 index 966d4e91ecb..00000000000 --- a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDIntakeWriterCombinedTest.groovy +++ /dev/null @@ -1,769 +0,0 @@ -package datadog.trace.common.writer - -import datadog.communication.http.OkHttpUtils -import datadog.communication.serialization.ByteBufferConsumer -import datadog.communication.serialization.FlushingBuffer -import datadog.communication.serialization.msgpack.MsgPackWriter -import datadog.trace.api.DDSpanId -import datadog.trace.api.DDTraceId -import datadog.trace.api.civisibility.CiVisibilityWellKnownTags -import datadog.trace.api.intake.TrackType -import datadog.trace.api.sampling.PrioritySampling -import datadog.trace.api.datastreams.NoopPathwayContext -import datadog.metrics.impl.MonitoringImpl -import datadog.metrics.api.statsd.StatsDClient -import datadog.trace.common.writer.ddintake.DDIntakeApi -import datadog.trace.common.writer.ddintake.DDIntakeMapperDiscovery -import datadog.trace.core.CoreTracer -import datadog.trace.core.DDSpan -import datadog.trace.core.DDSpanContext -import datadog.trace.core.PendingTrace -import datadog.trace.core.monitor.HealthMetrics -import datadog.trace.core.monitor.TracerHealthMetrics -import datadog.trace.core.propagation.PropagationTags -import datadog.trace.core.test.DDCoreSpecification -import datadog.trace.test.util.Flaky -import okhttp3.HttpUrl -import spock.lang.Shared -import spock.lang.Timeout -import spock.util.concurrent.PollingConditions - -import java.nio.ByteBuffer -import java.util.concurrent.CountDownLatch -import java.util.concurrent.Phaser -import java.util.concurrent.Semaphore -import java.util.concurrent.TimeUnit -import java.util.concurrent.atomic.AtomicInteger - -import static datadog.trace.agent.test.server.http.TestHttpServer.httpServer -import static datadog.trace.common.writer.DDIntakeWriter.BUFFER_SIZE -import static datadog.trace.common.writer.ddagent.Prioritization.ENSURE_TRACE - -@Timeout(10) -class DDIntakeWriterCombinedTest extends DDCoreSpecification { - - @Shared - def wellKnownTags = new CiVisibilityWellKnownTags( - "my-runtime-id", "my-env", "my-language", - "my-runtime-name", "my-runtime-version", "my-runtime-vendor", - "my-os-arch", "my-os-platform", "my-os-version", "false") - - def conditions = new PollingConditions(timeout: 5, initialDelay: 0, factor: 1.25) - def monitoring = new MonitoringImpl(StatsDClient.NO_OP, 1, TimeUnit.SECONDS) - def phaser = new Phaser() - - // Only used to create spans - def dummyTracer = tracerBuilder().writer(new ListWriter()).build() - - def setup() { - // Register for two threads. - phaser.register() - phaser.register() - } - - def cleanup() { - dummyTracer?.close() - } - - def "no interactions because of initial flush"() { - setup: - def api = Mock(DDIntakeApi) - def writer = DDIntakeWriter.builder() - .addTrack(TrackType.NOOP, api) - .traceBufferSize(8) - .monitoring(monitoring) - .flushIntervalMilliseconds(-1) - .alwaysFlush(false) - .build() - writer.start() - - when: - writer.flush() - - then: - 0 * _ - - cleanup: - writer.close() - } - - def "test happy path"() { - setup: - def api = Mock(DDIntakeApi) - def writer = DDIntakeWriter.builder() - .addTrack(trackType, api) - .traceBufferSize(1024) - .monitoring(monitoring) - .flushIntervalMilliseconds(-1) - .alwaysFlush(false) - .build() - writer.start() - def trace = [dummyTracer.buildSpan("datadog", "fakeOperation").start()] - - when: - writer.write(trace) - writer.write(trace) - writer.flush() - - then: - 1 * api.sendSerializedTraces({ it.traceCount() == 2 }) >> RemoteApi.Response.success(200) - 0 * _ - - cleanup: - writer.close() - - where: - trackType << [TrackType.CITESTCYCLE] - } - - def "test flood of traces"() { - setup: - def api = Mock(DDIntakeApi) - def writer = DDIntakeWriter.builder() - .addTrack(trackType, api) - .traceBufferSize(1024) - .monitoring(monitoring) - .flushIntervalMilliseconds(-1) - .alwaysFlush(false) - .build() - writer.start() - def trace = [dummyTracer.buildSpan("datadog", "fakeOperation").start()] - - when: - (1..traceCount).each { - writer.write(trace) - } - writer.flush() - - then: - 1 * api.sendSerializedTraces({ it.traceCount() <= traceCount }) >> RemoteApi.Response.success(200) - 0 * _ - - cleanup: - writer.close() - - where: - bufferSize = 1024 - traceCount = 100 // Shouldn't trigger payload, but bigger than the disruptor size. - trackType << [TrackType.CITESTCYCLE] - } - - def "test flush by time"() { - setup: - def healthMetrics = Mock(HealthMetrics) - def api = Mock(DDIntakeApi) - def writer = DDIntakeWriter.builder() - .addTrack(trackType, api) - .healthMetrics(healthMetrics) - .monitoring(monitoring) - .flushIntervalMilliseconds(1000) - .alwaysFlush(false) - .build() - writer.start() - def span = dummyTracer.buildSpan("datadog", "fakeOperation").start() - def trace = (1..10).collect { span } - - when: - (1..5).each { - writer.write(trace) - } - phaser.awaitAdvanceInterruptibly(phaser.arriveAndDeregister()) - - then: - 1 * healthMetrics.onSerialize(_) - 1 * api.sendSerializedTraces({ it.traceCount() == 5 }) >> RemoteApi.Response.success(200) - _ * healthMetrics.onPublish(_, _) - 1 * healthMetrics.onSend(_, _, _) >> { - phaser.arrive() - } - 0 * _ - - cleanup: - writer.close() - - where: - trackType << [TrackType.CITESTCYCLE] - } - - @Timeout(30) - def "test default buffer size for #trackType"() { - setup: - def api = Mock(DDIntakeApi) - def writer = DDIntakeWriter.builder() - .addTrack(trackType, api) - .wellKnownTags(wellKnownTags) - .traceBufferSize(BUFFER_SIZE) - .prioritization(ENSURE_TRACE) - .monitoring(monitoring) - .flushIntervalMilliseconds(-1) - .alwaysFlush(false) - .build() - writer.start() - - when: - def discovery = new DDIntakeMapperDiscovery(trackType, wellKnownTags, false) - discovery.discover() - def mapper = (RemoteMapper) discovery.mapper - def traceSize = calculateSize(minimalTrace, mapper) - int maxedPayloadTraceCount = ((int) ((mapper.messageBufferSize()) / traceSize)) - (0..maxedPayloadTraceCount).each { - writer.write(minimalTrace) - } - writer.flush() - - then: - 1 * api.sendSerializedTraces({ it.traceCount() == maxedPayloadTraceCount }) >> RemoteApi.Response.success(200) - 1 * api.sendSerializedTraces({ it.traceCount() == 1 }) >> RemoteApi.Response.success(200) - 0 * _ - - cleanup: - writer.close() - - where: - minimalTrace = createMinimalTrace() - trackType << [TrackType.CITESTCYCLE] - } - - def "check that there are no interactions after close"() { - setup: - def api = Mock(DDIntakeApi) - def healthMetrics = Mock(HealthMetrics) - def writer = DDIntakeWriter.builder() - .addTrack(trackType, api) - .healthMetrics(healthMetrics) - .monitoring(monitoring) - .alwaysFlush(false) - .build() - writer.start() - - when: - writer.close() - writer.write([]) - writer.flush() - - then: - // this will be checked during flushing - 1 * healthMetrics.onFailedPublish(_,_) - 1 * healthMetrics.onFlush(_) - 1 * healthMetrics.onShutdown(_) - 1 * healthMetrics.close() - 0 * _ - - cleanup: - writer.close() - - where: - trackType << [TrackType.CITESTCYCLE] - } - - def "monitor happy path"() { - setup: - def healthMetrics = Mock(HealthMetrics) - def minimalTrace = createMinimalTrace() - def path = buildIntakePath(trackType, apiVersion) - def intake = httpServer { - handlers { - post(path) { - response.status(200).send() - } - } - } - def hostUrl = HttpUrl.get(intake.address) - def client = OkHttpUtils.buildHttpClient(hostUrl, 1000) - def api = DDIntakeApi.builder() - .hostUrl(hostUrl) - .httpClient(client) - .apiKey("my-api-key") - .trackType(trackType) - .build() - def writer = DDIntakeWriter.builder() - .addTrack(trackType, api) - .healthMetrics(healthMetrics) - .monitoring(monitoring) - .alwaysFlush(false) - .build() - - when: - writer.start() - - then: - 1 * healthMetrics.onStart(writer.getCapacity()) - - when: - writer.write(minimalTrace) - writer.flush() - - then: - 1 * healthMetrics.onPublish(minimalTrace, _) - 1 * healthMetrics.onSerialize(_) - 1 * healthMetrics.onFlush(false) - 1 * healthMetrics.onSend(1, _, { response -> response.success() && response.status().present && response.status().asInt == 200 }) - - when: - writer.close() - - then: - 1 * healthMetrics.onShutdown(true) - - cleanup: - intake.close() - - where: - trackType | apiVersion - TrackType.CITESTCYCLE | "v2" - } - - def "monitor intake returns error"() { - setup: - def healthMetrics = Mock(HealthMetrics) - def minimalTrace = createMinimalTrace() - - def path = buildIntakePath(trackType, apiVersion) - def intake = httpServer { - handlers { - post(path) { - response.status(500).send() - } - } - } - def hostUrl = HttpUrl.get(intake.address) - def client = OkHttpUtils.buildHttpClient(hostUrl, 1000) - def api = DDIntakeApi.builder() - .hostUrl(hostUrl) - .httpClient(client) - .apiKey("my-api-key") - .trackType(trackType) - .build() - def writer = DDIntakeWriter.builder() - .addTrack(trackType, api) - .healthMetrics(healthMetrics) - .monitoring(monitoring) - .alwaysFlush(false) - .build() - - when: - writer.start() - - then: - 1 * healthMetrics.onStart(writer.getCapacity()) - - when: - writer.write(minimalTrace) - writer.flush() - - then: - 1 * healthMetrics.onPublish(minimalTrace, _) - 1 * healthMetrics.onSerialize(_) - 1 * healthMetrics.onFlush(false) - 1 * healthMetrics.onFailedSend(1, _, { response -> !response.success() && response.status().present && response.status().asInt == 500 }) - - when: - writer.close() - - then: - 1 * healthMetrics.onShutdown(true) - - cleanup: - intake.close() - - where: - trackType | apiVersion - TrackType.CITESTCYCLE | "v2" - } - - def "unreachable intake test"() { - setup: - def healthMetrics = Mock(HealthMetrics) - def minimalTrace = createMinimalTrace() - - def api = Mock(DDIntakeApi) { - it.sendSerializedTraces(_) >> { - // simulating a communication failure to a server - return RemoteApi.Response.failed(new IOException("comm error")) - } - } - - def writer = DDIntakeWriter.builder() - .addTrack(trackType, api) - .monitoring(monitoring) - .healthMetrics(healthMetrics) - .alwaysFlush(false) - .build() - - when: - writer.start() - - then: - 1 * healthMetrics.onStart(writer.getCapacity()) - - when: - writer.write(minimalTrace) - writer.flush() - - then: - // if we know there's no agent, we'll drop the traces before serialising them - // but we also know that there's nowhere to send health metrics to - 1 * healthMetrics.onPublish(_, _) - 1 * healthMetrics.onFlush(false) - - when: - writer.close() - - then: - 1 * healthMetrics.onShutdown(true) - - where: - trackType << [TrackType.CITESTCYCLE] - } - - @Flaky - // if execution is too slow, the http client timeout may trigger. - def "slow response test"() { - def numWritten = 0 - def numFlushes = new AtomicInteger(0) - def numPublished = new AtomicInteger(0) - def numFailedPublish = new AtomicInteger(0) - def numRequests = new AtomicInteger(0) - def numFailedRequests = new AtomicInteger(0) - - def responseSemaphore = new Semaphore(1) - - setup: - def path = buildIntakePath(trackType, apiVersion) - def intake = httpServer { - handlers { - post(path) { - responseSemaphore.acquire() - try { - response.status(200).send() - } finally { - responseSemaphore.release() - } - } - } - } - // This test focuses just on failed publish, so not verifying every callback - def healthMetrics = Stub(HealthMetrics) { - onPublish(_, _) >> { - numPublished.incrementAndGet() - } - onFailedPublish(_,_) >> { - numFailedPublish.incrementAndGet() - } - onFlush(_) >> { - numFlushes.incrementAndGet() - } - onSend(_, _, _) >> { - numRequests.incrementAndGet() - } - onFailedSend(_, _, _) >> { - numFailedRequests.incrementAndGet() - } - } - - def hostUrl = HttpUrl.get(intake.address) - def client = OkHttpUtils.buildHttpClient(hostUrl, 1000) - def api = DDIntakeApi.builder() - .hostUrl(hostUrl) - .httpClient(client) - .apiKey("my-api-key") - .trackType(trackType) - .build() - def writer = DDIntakeWriter.builder() - .addTrack(trackType, api) - .healthMetrics(healthMetrics) - .traceBufferSize(bufferSize) - .alwaysFlush(false) - .build() - writer.start() - - // gate responses - responseSemaphore.acquire() - - // sanity check coordination mechanism of test - // release to allow response to be generated - responseSemaphore.release() - writer.flush() - - // reacquire semaphore to stall further responses - responseSemaphore.acquire() - - when: - // write a single trace and flush - // with responseSemaphore held, the response is blocked but may still time out - writer.write(minimalTrace) - numWritten += 1 - - then: - numFailedPublish.get() == 0 - numPublished.get() == numWritten - numPublished.get() + numFailedPublish.get() == numWritten - numFlushes.get() == 1 - - when: - // send many traces to fill the sender queue... - // loop until outstanding requests > finished requests - while (writer.traceProcessingWorker.getRemainingCapacity() > 0 || numFailedPublish.get() == 0) { - writer.write(minimalTrace) - numWritten += 1 - } - - then: - numFailedPublish.get() > 0 - numPublished.get() + numFailedPublish.get() == numWritten - - when: - - // with both disruptor & queue full, should reject everything - def expectedRejects = 100 - (1..expectedRejects).each { - writer.write(minimalTrace) - numWritten += 1 - } - - then: - numPublished.get() + numFailedPublish.get() == numWritten - - cleanup: - responseSemaphore.release() - - writer.close() - intake.close() - - where: - bufferSize = 16 - minimalTrace = createMinimalTrace() - trackType | apiVersion - TrackType.CITESTCYCLE | "v2" - } - - def "multi threaded"() { - def numPublished = new AtomicInteger(0) - def numFailedPublish = new AtomicInteger(0) - def numRepSent = new AtomicInteger(0) - - setup: - def minimalTrace = createMinimalTrace() - def path = buildIntakePath(trackType, apiVersion) - def intake = httpServer { - handlers { - post(path) { - response.status(200).send() - } - } - } - // This test focuses just on failed publish, so not verifying every callback - def healthMetrics = Stub(HealthMetrics) { - onPublish(_, _) >> { - numPublished.incrementAndGet() - } - onFailedPublish(_,_) >> { - numFailedPublish.incrementAndGet() - } - onSend(_, _, _) >> { repCount, sizeInBytes, response -> - numRepSent.addAndGet(repCount) - } - } - - def hostUrl = HttpUrl.get(intake.address) - def client = OkHttpUtils.buildHttpClient(hostUrl, 1000) - def api = DDIntakeApi.builder() - .hostUrl(hostUrl) - .httpClient(client) - .apiKey("my-api-key") - .trackType(trackType) - .build() - def writer = DDIntakeWriter.builder() - .addTrack(trackType, api) - .monitoring(monitoring) - .healthMetrics(healthMetrics) - .alwaysFlush(false) - .build() - writer.start() - - when: - def producer = { - (1..100).each { - writer.write(minimalTrace) - } - } as Runnable - - def t1 = new Thread(producer) - t1.start() - - def t2 = new Thread(producer) - t2.start() - - t1.join() - t2.join() - - writer.flush() - - then: - conditions.eventually { - def totalTraces = 100 + 100 - assert numPublished.get() == totalTraces - assert numRepSent.get() == totalTraces - } - - cleanup: - writer.close() - intake.close() - - where: - trackType | apiVersion - TrackType.CITESTCYCLE | "v2" - } - - def "statsd success"() { - def numTracesAccepted = new AtomicInteger(0) - def numRequests = new AtomicInteger(0) - def numResponses = new AtomicInteger(0) - - setup: - def minimalTrace = createMinimalTrace() - def path = buildIntakePath(trackType, apiVersion) - def intake = httpServer { - handlers { - post(path) { - response.status(200).send() - } - } - } - def healthMetrics = Stub(HealthMetrics) - healthMetrics.onPublish(_, _) >> { - numTracesAccepted.incrementAndGet() - } - healthMetrics.onSend(_, _, _) >> { - numRequests.incrementAndGet() - numResponses.incrementAndGet() - } - def hostUrl = HttpUrl.get(intake.address) - def client = OkHttpUtils.buildHttpClient(hostUrl, 1000) - def api = DDIntakeApi.builder() - .hostUrl(hostUrl) - .httpClient(client) - .apiKey("my-api-key") - .trackType(trackType) - .build() - def writer = DDIntakeWriter.builder() - .addTrack(trackType, api) - .monitoring(monitoring) - .healthMetrics(healthMetrics) - .alwaysFlush(false) - .build() - writer.start() - - when: - writer.write(minimalTrace) - writer.flush() - - then: - numTracesAccepted.get() == 1 - numRequests.get() == 1 - numResponses.get() == 1 - - cleanup: - intake.close() - writer.close() - - where: - trackType | apiVersion - TrackType.CITESTCYCLE | "v2" - } - - def "statsd comm failure"() { - setup: - def minimalTrace = createMinimalTrace() - - def api = Mock(DDIntakeApi) - api.sendSerializedTraces(_) >> RemoteApi.Response.failed(new IOException("comm error")) - - def latch = new CountDownLatch(2) - def statsd = Mock(StatsDClient) - def healthMetrics = new TracerHealthMetrics(statsd, 100, TimeUnit.MILLISECONDS) - def writer = DDIntakeWriter.builder() - .addTrack(trackType, api) - .monitoring(monitoring) - .healthMetrics(healthMetrics) - .alwaysFlush(false) - .build() - healthMetrics.start() - writer.start() - - when: - writer.write(minimalTrace) - writer.flush() - latch.await(10, TimeUnit.SECONDS) - - then: - 1 * statsd.count("api.requests.total", 1, _) >> { - latch.countDown() - } - 0 * statsd.incrementCounter("api.responses.total", _) - 1 * statsd.count("api.errors.total", 1, _) >> { - latch.countDown() - } - - cleanup: - writer.close() - healthMetrics.close() - - where: - trackType | apiVersion - TrackType.CITESTCYCLE | "v2" - } - - def createMinimalContext() { - def tracer = Stub(CoreTracer) - def trace = Stub(PendingTrace) - trace.mapServiceName(_) >> { String serviceName -> serviceName } - trace.getTracer() >> tracer - return new DDSpanContext( - DDTraceId.ONE, - 1, - DDSpanId.ZERO, - "", - "", - "", - "", - PrioritySampling.UNSET, - "", - [:], - false, - "", - 0, - trace, - null, - null, - NoopPathwayContext.INSTANCE, - false, - PropagationTags.factory().empty()) - } - - def createMinimalTrace() { - def context = createMinimalContext() - def minimalSpan = new DDSpan("test", 0, context, null) - context.getTraceCollector().getRootSpan() >> minimalSpan - def minimalTrace = [minimalSpan] - - return minimalTrace - } - - static int calculateSize(List trace, RemoteMapper mapper) { - AtomicInteger size = new AtomicInteger() - def packer = new MsgPackWriter(new FlushingBuffer(mapper.messageBufferSize(), new ByteBufferConsumer() { - @Override - void accept(int messageCount, ByteBuffer buffer) { - size.set(buffer.limit() - buffer.position()) - } - })) - packer.format(trace, mapper) - packer.flush() - return size.get() - } - - def buildIntakePath(TrackType trackType, String apiVersion) { - return String.format("/api/%s/%s", apiVersion, trackType.name().toLowerCase()) - } -} diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDIntakeWriterTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDIntakeWriterTest.groovy deleted file mode 100644 index e0a347841a1..00000000000 --- a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDIntakeWriterTest.groovy +++ /dev/null @@ -1,215 +0,0 @@ -package datadog.trace.common.writer - -import datadog.communication.ddagent.DDAgentFeaturesDiscovery -import datadog.trace.api.DDSpanId -import datadog.trace.api.DDTraceId -import datadog.trace.api.intake.TrackType -import datadog.trace.api.sampling.PrioritySampling -import datadog.trace.api.datastreams.NoopPathwayContext -import datadog.metrics.impl.MonitoringImpl -import datadog.metrics.api.statsd.StatsDClient -import datadog.trace.common.writer.ddagent.DDAgentApi -import datadog.trace.common.writer.ddagent.DDAgentMapperDiscovery -import datadog.trace.core.CoreTracer -import datadog.trace.core.DDSpan -import datadog.trace.core.DDSpanContext -import datadog.trace.core.PendingTrace -import datadog.trace.core.monitor.HealthMetrics -import datadog.trace.core.propagation.PropagationTags -import datadog.trace.core.test.DDCoreSpecification -import spock.lang.Subject - -import java.util.concurrent.TimeUnit - -import static datadog.trace.common.writer.ddagent.PrioritizationStrategy.PublishResult.DROPPED_BUFFER_OVERFLOW -import static datadog.trace.common.writer.ddagent.PrioritizationStrategy.PublishResult.DROPPED_BY_POLICY -import static datadog.trace.common.writer.ddagent.PrioritizationStrategy.PublishResult.ENQUEUED_FOR_SERIALIZATION -import static datadog.trace.common.writer.ddagent.PrioritizationStrategy.PublishResult.ENQUEUED_FOR_SINGLE_SPAN_SAMPLING - -class DDIntakeWriterTest extends DDCoreSpecification { - - def healthMetrics = Mock(HealthMetrics) - def worker = Mock(TraceProcessingWorker) - def discovery = Mock(DDAgentFeaturesDiscovery) - def api = Mock(DDAgentApi) - def monitoring = new MonitoringImpl(StatsDClient.NO_OP, 1, TimeUnit.SECONDS) - def dispatcher = new PayloadDispatcherImpl(new DDAgentMapperDiscovery(discovery), api, healthMetrics, monitoring) - - @Subject - def writer = new DDIntakeWriter(worker, dispatcher, healthMetrics, false) - - // Only used to create spans - def dummyTracer = tracerBuilder().writer(new ListWriter()).build() - - def cleanup() { - writer.close() - dummyTracer.close() - } - - def "test writer builder"() { - when: - def writer = DDIntakeWriter.builder().addTrack(TrackType.NOOP, Mock(RemoteApi)).build() - - then: - writer != null - } - - def "test writer.start"() { - when: - writer.start() - - then: - 1 * healthMetrics.start() - 1 * worker.start() - 1 * worker.getCapacity() >> capacity - 1 * healthMetrics.onStart(capacity) - 0 * _ - - where: - capacity = 5 - } - - def "test writer.flush"() { - when: - writer.flush() - - then: - 1 * worker.flush(1, TimeUnit.SECONDS) >> true - 1 * healthMetrics.onFlush(false) - 0 * _ - - when: - writer.flush() - - then: - 1 * worker.flush(1, TimeUnit.SECONDS) >> false - 0 * _ - } - - def "test writer.flush closed"() { - setup: - writer.close() - - when: - writer.flush() - - then: - 0 * _ - } - - def "test writer.write publish succeeds"() { - setup: - def trace = [dummyTracer.buildSpan("datadog", "fakeOperation").start()] - - when: "publish succeeds" - writer.write(trace) - - then: "monitor is notified of successful publication" - 1 * worker.publish(_, _, trace) >> ENQUEUED_FOR_SERIALIZATION - 1 * healthMetrics.onPublish(trace, _) - _ * worker.flush(1, TimeUnit.SECONDS) - 0 * _ - } - - def "test writer.write publish for single span sampling"() { - setup: - def trace = [dummyTracer.buildSpan("datadog", "fakeOperation").start()] - - when: "publish succeeds" - writer.write(trace) - - then: "monitor is notified of successful publication" - 1 * worker.publish(_, _, trace) >> ENQUEUED_FOR_SINGLE_SPAN_SAMPLING - // shouldn't call monitor.onPublish - _ * worker.flush(1, TimeUnit.SECONDS) - 0 * _ - } - - def "test writer.write publish fails"() { - setup: - def trace = [dummyTracer.buildSpan("datadog", "fakeOperation").start()] - - when: "publish fails" - writer.write(trace) - - then: "monitor is notified of unsuccessful publication" - 1 * worker.publish(_, _, trace) >> publishResult - 1 * healthMetrics.onFailedPublish(_,1) - _ * worker.flush(1, TimeUnit.SECONDS) - 0 * _ - - where: - publishResult << [DROPPED_BUFFER_OVERFLOW, DROPPED_BY_POLICY] - } - - def "empty traces should be reported as failures"() { - when: "trace is empty" - writer.write([]) - - then: "monitor is notified of unsuccessful publication" - 1 * healthMetrics.onFailedPublish(_,0) - _ * worker.flush(1, TimeUnit.SECONDS) - 0 * _ - } - - def "test writer.write closed"() { - setup: - writer.close() - def trace = [dummyTracer.buildSpan("datadog", "fakeOperation").start()] - - when: - writer.write(trace) - - then: - 1 * healthMetrics.onFailedPublish(_,1) - _ * worker.flush(1, TimeUnit.SECONDS) - 0 * _ - } - - def "dropped trace is counted"() { - setup: - def dispatcher = Mock(PayloadDispatcherImpl) - def writer = new DDIntakeWriter(worker, dispatcher, healthMetrics, true) - def p0 = newSpan() - p0.setSamplingPriority(PrioritySampling.SAMPLER_DROP) - def trace = [p0, newSpan()] - - when: - writer.write(trace) - - then: - 1 * worker.publish(trace[0], PrioritySampling.SAMPLER_DROP, trace) >> publishResult - 1 * dispatcher.onDroppedTrace(trace.size()) - - where: - publishResult << [DROPPED_BY_POLICY, DROPPED_BUFFER_OVERFLOW] - } - - def newSpan() { - CoreTracer tracer = Stub(CoreTracer) - PendingTrace trace = Stub(PendingTrace) - trace.mapServiceName(_) >> { String serviceName -> serviceName } - trace.getTracer() >> tracer - def context = new DDSpanContext( - DDTraceId.ONE, - 1, - DDSpanId.ZERO, - null, - "", - "", - "", - PrioritySampling.UNSET, - "", - [:], - false, - "", - 0, - trace, - null, - null, - NoopPathwayContext.INSTANCE, - false, - PropagationTags.factory().empty()) - return new DDSpan("test", 0, context, null) - } -} diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/MultiWriterTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/MultiWriterTest.groovy deleted file mode 100644 index 1e406ae9bcb..00000000000 --- a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/MultiWriterTest.groovy +++ /dev/null @@ -1,69 +0,0 @@ -package datadog.trace.common.writer - -import datadog.trace.core.DDSpan -import datadog.trace.test.util.DDSpecification - -class MultiWriterTest extends DDSpecification { - - def "test that multi writer delegates to all"() { - setup: - def writers = new Writer[3] - Writer mockW1 = Mock() - Writer mockW2 = Mock() - writers[0] = mockW1 - // null in position 1 to check that we skip that - writers[2] = mockW2 - def writer = new MultiWriter(writers) - List trace = new LinkedList<>() - - when: - writer.start() - - then: - 1 * mockW1.start() - 1 * mockW2.start() - 0 * _ - - when: - writer.write(trace) - - then: - 1 * mockW1.write({ it == trace }) - 1 * mockW2.write({ it == trace }) - 0 * _ - - when: - def flushed = writer.flush() - - then: - 1 * mockW1.flush() >> true - 1 * mockW2.flush() >> true - 0 * _ - flushed - - when: - def notFlushed = writer.flush() - - then: - 1 * mockW1.flush() >> true - 1 * mockW2.flush() >> false - 0 * _ - !notFlushed - - when: - writer.close() - - then: - 1 * mockW1.close() - 1 * mockW2.close() - 0 * _ - - when: - writer.incrementDropCounts(0) - - then: - 1 * mockW1.incrementDropCounts(0) - 1 * mockW2.incrementDropCounts(0) - 0 * _ - } -} diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/PayloadDispatcherImplTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/PayloadDispatcherImplTest.groovy deleted file mode 100644 index 6826c4db310..00000000000 --- a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/PayloadDispatcherImplTest.groovy +++ /dev/null @@ -1,176 +0,0 @@ -package datadog.trace.common.writer - -import datadog.communication.ddagent.DDAgentFeaturesDiscovery -import datadog.metrics.api.statsd.StatsDClient -import datadog.metrics.impl.MonitoringImpl -import datadog.trace.api.DDSpanId -import datadog.trace.api.DDTraceId -import datadog.trace.api.datastreams.NoopPathwayContext -import datadog.trace.api.sampling.PrioritySampling -import datadog.trace.common.writer.ddagent.DDAgentApi -import datadog.trace.common.writer.ddagent.DDAgentMapperDiscovery -import datadog.trace.core.CoreTracer -import datadog.trace.core.DDSpan -import datadog.trace.core.DDSpanContext -import datadog.trace.core.PendingTrace -import datadog.trace.core.monitor.HealthMetrics -import datadog.trace.core.propagation.PropagationTags -import datadog.trace.test.util.DDSpecification -import java.nio.ByteBuffer -import java.util.concurrent.TimeUnit -import java.util.concurrent.atomic.AtomicBoolean -import spock.lang.Shared -import spock.lang.Timeout - -class PayloadDispatcherImplTest extends DDSpecification { - - @Shared - MonitoringImpl monitoring = new MonitoringImpl(StatsDClient.NO_OP, 1, TimeUnit.SECONDS) - - @Timeout(10) - def "flush automatically when data limit is breached"() { - setup: - AtomicBoolean flushed = new AtomicBoolean() - HealthMetrics healthMetrics = Stub(HealthMetrics) - DDAgentFeaturesDiscovery discovery = Stub(DDAgentFeaturesDiscovery) - discovery.getTraceEndpoint() >> traceEndpoint - DDAgentApi api = Stub(DDAgentApi) - api.sendSerializedTraces(_) >> { - flushed.set(true) - return RemoteApi.Response.success(200) - } - PayloadDispatcherImpl dispatcher = new PayloadDispatcherImpl(new DDAgentMapperDiscovery(discovery), api, healthMetrics, monitoring) - List trace = [realSpan()] - when: - while (!flushed.get()) { - dispatcher.addTrace(trace) - } - - then: "the dispatcher has flushed" - flushed.get() - - where: - traceEndpoint << ["v0.5/traces", "v0.4/traces"] - } - - def "should flush buffer on demand"() { - setup: - HealthMetrics healthMetrics = Mock(HealthMetrics) - DDAgentFeaturesDiscovery discovery = Mock(DDAgentFeaturesDiscovery) - DDAgentApi api = Mock(DDAgentApi) - PayloadDispatcherImpl dispatcher = new PayloadDispatcherImpl(new DDAgentMapperDiscovery(discovery), api, healthMetrics, monitoring) - List trace = [realSpan()] - when: - for (int i = 0; i < traceCount; ++i) { - dispatcher.addTrace(trace) - } - dispatcher.flush() - then: - 2 * discovery.getTraceEndpoint() >> traceEndpoint - 1 * healthMetrics.onSerialize({ it > 0 }) - 1 * api.sendSerializedTraces({ it.traceCount() == traceCount }) >> RemoteApi.Response.success(200) - - where: - traceEndpoint | traceCount - "v0.4/traces" | 1 - "v0.4/traces" | 10 - "v0.4/traces" | 100 - "v0.5/traces" | 1 - "v0.5/traces" | 10 - "v0.5/traces" | 100 - } - - def "should report failed request to monitor"() { - setup: - HealthMetrics healthMetrics = Mock(HealthMetrics) - DDAgentFeaturesDiscovery discovery = Mock(DDAgentFeaturesDiscovery) - DDAgentApi api = Mock(DDAgentApi) - PayloadDispatcherImpl dispatcher = new PayloadDispatcherImpl(new DDAgentMapperDiscovery(discovery), api, healthMetrics, monitoring) - List trace = [realSpan()] - when: - for (int i = 0; i < traceCount; ++i) { - dispatcher.addTrace(trace) - } - dispatcher.flush() - then: - 2 * discovery.getTraceEndpoint() >> traceEndpoint - 1 * healthMetrics.onSerialize({ it > 0 }) - 1 * api.sendSerializedTraces({ it.traceCount() == traceCount }) >> RemoteApi.Response.failed(400) - - where: - traceEndpoint | traceCount - "v0.4/traces" | 1 - "v0.4/traces" | 10 - "v0.4/traces" | 100 - "v0.5/traces" | 1 - "v0.5/traces" | 10 - "v0.5/traces" | 100 - } - - def "should drop trace when there is no agent connectivity"() { - setup: - HealthMetrics healthMetrics = Mock(HealthMetrics) - DDAgentApi api = Mock(DDAgentApi) - DDAgentFeaturesDiscovery discovery = Mock(DDAgentFeaturesDiscovery) - PayloadDispatcherImpl dispatcher = new PayloadDispatcherImpl(new DDAgentMapperDiscovery(discovery), api, healthMetrics, monitoring) - List trace = [realSpan()] - discovery.getTraceEndpoint() >> null - when: - dispatcher.addTrace(trace) - then: - 1 * healthMetrics.onFailedPublish(PrioritySampling.UNSET,_) - } - - def "trace and span counts are reset after access"() { - setup: - HealthMetrics healthMetrics = Stub(HealthMetrics) - DDAgentApi api = Stub(DDAgentApi) - DDAgentFeaturesDiscovery discovery = Mock(DDAgentFeaturesDiscovery) { - it.getTraceEndpoint() >> "v0.4/traces" - } - PayloadDispatcherImpl dispatcher = new PayloadDispatcherImpl(new DDAgentMapperDiscovery(discovery), api, healthMetrics, monitoring) - - when: - dispatcher.addTrace([]) - dispatcher.onDroppedTrace(20) - dispatcher.onDroppedTrace(2) - Payload payload = dispatcher.newPayload(1, ByteBuffer.allocate(0)) - then: - payload.droppedSpans() == 22 - payload.droppedTraces() == 2 - when: - Payload newPayload = dispatcher.newPayload(1, ByteBuffer.allocate(0)) - then: - newPayload.droppedSpans() == 0 - newPayload.droppedTraces() == 0 - } - - - def realSpan() { - CoreTracer tracer = Stub(CoreTracer) - PendingTrace trace = Stub(PendingTrace) - trace.getTracer() >> tracer - trace.mapServiceName(_) >> { String serviceName -> serviceName } - def context = new DDSpanContext( - DDTraceId.ONE, - 1, - DDSpanId.ZERO, - null, - "", - "", - "", - PrioritySampling.UNSET, - "", - [:], - false, - "", - 0, - trace, - null, - null, - NoopPathwayContext.INSTANCE, - false, - PropagationTags.factory().empty()) - return new DDSpan("test", 0, context, null) - } -} diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/PrioritizationTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/PrioritizationTest.groovy deleted file mode 100644 index 8fa2f08eaa1..00000000000 --- a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/PrioritizationTest.groovy +++ /dev/null @@ -1,258 +0,0 @@ -package datadog.trace.common.writer - -import datadog.trace.common.writer.ddagent.FlushEvent -import datadog.trace.common.writer.ddagent.PrioritizationStrategy -import datadog.trace.common.writer.ddagent.PrioritizationStrategy.PublishResult -import datadog.trace.core.DDSpan -import datadog.trace.test.util.DDSpecification - -import java.util.concurrent.TimeUnit - -import static datadog.trace.api.sampling.PrioritySampling.SAMPLER_DROP -import static datadog.trace.api.sampling.PrioritySampling.SAMPLER_KEEP -import static datadog.trace.api.sampling.PrioritySampling.UNSET -import static datadog.trace.api.sampling.PrioritySampling.USER_KEEP -import static datadog.trace.common.writer.ddagent.Prioritization.ENSURE_TRACE -import static datadog.trace.common.writer.ddagent.Prioritization.FAST_LANE -import static datadog.trace.common.writer.ddagent.PrioritizationStrategy.PublishResult.* - -class PrioritizationTest extends DDSpecification { - - def "ensure trace strategy tries to send kept and unset priority traces to the primary queue until offer(..) is true, dropped traces to the secondary queue"() { - setup: - Queue primary = Mock(Queue) - Queue secondary = Mock(Queue) - PrioritizationStrategy blocking = ENSURE_TRACE.create(primary, secondary, null, { false }) - - when: - PublishResult publishResult = blocking.publish(Mock(DDSpan), priority, trace) - - then: - publishResult == ENQUEUED_FOR_SERIALIZATION - primaryOffers * primary.offer(trace) >> !primaryFull >> true - secondaryOffers * secondary.offer(trace) >> true - - where: - // spotless:off - trace | primaryFull | priority | primaryOffers | secondaryOffers - [] | true | UNSET | 2 | 0 - [] | true | SAMPLER_DROP | 0 | 1 - [] | true | SAMPLER_KEEP | 2 | 0 - [] | true | SAMPLER_DROP | 0 | 1 - [] | true | USER_KEEP | 2 | 0 - [] | false | UNSET | 1 | 0 - [] | false | SAMPLER_DROP | 0 | 1 - [] | false | SAMPLER_KEEP | 1 | 0 - [] | false | SAMPLER_DROP | 0 | 1 - [] | false | USER_KEEP | 1 | 0 - // spotless:on - } - - def "fast lane strategy sends kept and unset priority traces to the primary queue, dropped traces to the secondary queue"() { - setup: - Queue primary = Mock(Queue) - Queue secondary = Mock(Queue) - PrioritizationStrategy fastLane = FAST_LANE.create(primary, secondary, null, { false }) - - when: - PublishResult publishResult = fastLane.publish(Mock(DDSpan), priority, trace) - - then: - publishResult == DROPPED_BUFFER_OVERFLOW - primaryOffers * primary.offer(trace) - secondaryOffers * secondary.offer(trace) - - where: - // spotless:off - trace | priority | primaryOffers | secondaryOffers - [] | UNSET | 1 | 0 - [] | SAMPLER_DROP | 0 | 1 - [] | SAMPLER_KEEP | 1 | 0 - [] | SAMPLER_DROP | 0 | 1 - [] | USER_KEEP | 1 | 0 - // spotless:on - } - - def "FAST_LANE with active dropping policy sends kept and unset priority traces to the primary queue, drops all else"() { - setup: - Queue primary = Mock(Queue) - Queue secondary = Mock(Queue) - PrioritizationStrategy drop = FAST_LANE.create(primary, secondary, null, { true }) - - when: - PublishResult publishResult = drop.publish(Mock(DDSpan), priority, trace) - - then: - publishResult == expectedResult - primaryOffers * primary.offer(trace) >> true - 0 * secondary.offer(trace) - - where: - // spotless:off - trace | priority | primaryOffers | expectedResult - [] | UNSET | 1 | ENQUEUED_FOR_SERIALIZATION - [] | SAMPLER_DROP | 0 | DROPPED_BY_POLICY - [] | SAMPLER_KEEP | 1 | ENQUEUED_FOR_SERIALIZATION - [] | SAMPLER_DROP | 0 | DROPPED_BY_POLICY - [] | USER_KEEP | 1 | ENQUEUED_FOR_SERIALIZATION - // spotless:on - } - - def "#strategy strategy flushes primary queue"() { - setup: - Queue primary = Mock(Queue) - Queue secondary = Mock(Queue) - PrioritizationStrategy fastLane = strategy.create(primary, secondary, null, { false }) - when: - fastLane.flush(100, TimeUnit.MILLISECONDS) - then: - 1 * primary.offer({ it instanceof FlushEvent }) >> true - 0 * secondary.offer(_) - - where: - strategy << [FAST_LANE, ENSURE_TRACE] - } - - def "drop strategy respects force keep" () { - setup: - Queue primary = Mock(Queue) - PrioritizationStrategy drop = strategy.create(primary, null, null, { true }) - DDSpan root = Mock(DDSpan) - List trace = [root] - - when: - PublishResult publishResult = drop.publish(root, SAMPLER_DROP, trace) - - then: - publishResult == expectedResult - 1 * root.isForceKeep() >> forceKeep - (forceKeep ? 1 : 0) * primary.offer(trace) >> true - 0 * _ - - where: - strategy | forceKeep | expectedResult - FAST_LANE | true | ENQUEUED_FOR_SERIALIZATION - FAST_LANE | false | DROPPED_BY_POLICY - } - - def "ensure trace strategy tries to send kept and unset priority traces to the primary queue until offer(..) is true, dropped traces to the span sampling queue"() { - setup: - Queue primary = Mock(Queue) - Queue secondary = Mock(Queue) - Queue spanSampling = Mock(Queue) - PrioritizationStrategy blocking = ENSURE_TRACE.create(primary, secondary, spanSampling, { false }) - - when: - PublishResult publishResult = blocking.publish(Mock(DDSpan), priority, trace) - - then: - publishResult == expectedResult - primaryOffers * primary.offer(trace) >> !primaryFull >> true - 0 * secondary.offer(trace) // expect no traces sent to the secondary queue - singleSpanOffers * spanSampling.offer(trace) >> !singleSpanFull - - where: - trace | primaryFull | priority | primaryOffers | singleSpanOffers | singleSpanFull | expectedResult - [] | true | UNSET | 2 | 0 | false | ENQUEUED_FOR_SERIALIZATION - [] | true | SAMPLER_DROP | 0 | 1 | false | ENQUEUED_FOR_SINGLE_SPAN_SAMPLING - [] | true | SAMPLER_KEEP | 2 | 0 | false | ENQUEUED_FOR_SERIALIZATION - [] | true | SAMPLER_DROP | 0 | 1 | false | ENQUEUED_FOR_SINGLE_SPAN_SAMPLING - [] | true | USER_KEEP | 2 | 0 | false | ENQUEUED_FOR_SERIALIZATION - [] | false | UNSET | 1 | 0 | false | ENQUEUED_FOR_SERIALIZATION - [] | false | SAMPLER_DROP | 0 | 1 | false | ENQUEUED_FOR_SINGLE_SPAN_SAMPLING - [] | false | SAMPLER_KEEP | 1 | 0 | false | ENQUEUED_FOR_SERIALIZATION - [] | false | SAMPLER_DROP | 0 | 1 | false | ENQUEUED_FOR_SINGLE_SPAN_SAMPLING - [] | false | USER_KEEP | 1 | 0 | false | ENQUEUED_FOR_SERIALIZATION - [] | true | UNSET | 2 | 0 | true | ENQUEUED_FOR_SERIALIZATION - [] | true | SAMPLER_DROP | 0 | 1 | true | DROPPED_BUFFER_OVERFLOW - [] | true | SAMPLER_KEEP | 2 | 0 | true | ENQUEUED_FOR_SERIALIZATION - [] | true | SAMPLER_DROP | 0 | 1 | true | DROPPED_BUFFER_OVERFLOW - [] | true | USER_KEEP | 2 | 0 | true | ENQUEUED_FOR_SERIALIZATION - [] | false | UNSET | 1 | 0 | true | ENQUEUED_FOR_SERIALIZATION - [] | false | SAMPLER_DROP | 0 | 1 | true | DROPPED_BUFFER_OVERFLOW - [] | false | SAMPLER_KEEP | 1 | 0 | true | ENQUEUED_FOR_SERIALIZATION - [] | false | SAMPLER_DROP | 0 | 1 | true | DROPPED_BUFFER_OVERFLOW - [] | false | USER_KEEP | 1 | 0 | true | ENQUEUED_FOR_SERIALIZATION - } - - def "fast lane strategy sends kept and unset priority traces to the primary queue, dropped traces to the span sampling queue"() { - setup: - Queue primary = Mock(Queue) - Queue secondary = Mock(Queue) - Queue spanSampling = Mock(Queue) - PrioritizationStrategy fastLane = FAST_LANE.create(primary, secondary, spanSampling, { false }) - - when: - PublishResult publishResult = fastLane.publish(Mock(DDSpan), priority, trace) - - then: - publishResult == expectedResult - primaryOffers * primary.offer(trace) >> true - 0 * secondary.offer(trace) >> true // expect no traces sent to the secondary queue - singleSpanOffers * spanSampling.offer(trace) >> !singleSpanFull - - where: - trace | priority | primaryOffers | singleSpanOffers | singleSpanFull | expectedResult - [] | UNSET | 1 | 0 | false | ENQUEUED_FOR_SERIALIZATION - [] | SAMPLER_DROP | 0 | 1 | false | ENQUEUED_FOR_SINGLE_SPAN_SAMPLING - [] | SAMPLER_KEEP | 1 | 0 | false | ENQUEUED_FOR_SERIALIZATION - [] | SAMPLER_DROP | 0 | 1 | false | ENQUEUED_FOR_SINGLE_SPAN_SAMPLING - [] | USER_KEEP | 1 | 0 | false | ENQUEUED_FOR_SERIALIZATION - [] | UNSET | 1 | 0 | true | ENQUEUED_FOR_SERIALIZATION - [] | SAMPLER_DROP | 0 | 1 | true | DROPPED_BUFFER_OVERFLOW // span sampling queue is full - [] | SAMPLER_KEEP | 1 | 0 | true | ENQUEUED_FOR_SERIALIZATION - [] | SAMPLER_DROP | 0 | 1 | true | DROPPED_BUFFER_OVERFLOW // span sampling queue is full - [] | USER_KEEP | 1 | 0 | true | ENQUEUED_FOR_SERIALIZATION - } - - def "FAST_LANE with active dropping policy sends kept and unset priority traces to the primary queue, send to single span sampling all else"() { - setup: - Queue primary = Mock(Queue) - Queue secondary = Mock(Queue) - Queue spanSampling = Mock(Queue) - PrioritizationStrategy drop = FAST_LANE.create(primary, secondary, spanSampling, { true }) - - when: - PublishResult publishResult = drop.publish(Mock(DDSpan), priority, trace) - - then: - publishResult == expectedResult - primaryOffers * primary.offer(trace) >> true - 0 * secondary.offer(trace) - singleSpanOffers * spanSampling.offer(trace) >> true - - where: - trace | priority | primaryOffers | singleSpanOffers | expectedResult - [] | UNSET | 1 | 0 | ENQUEUED_FOR_SERIALIZATION - [] | SAMPLER_DROP | 0 | 1 | ENQUEUED_FOR_SINGLE_SPAN_SAMPLING - [] | SAMPLER_KEEP | 1 | 0 | ENQUEUED_FOR_SERIALIZATION - [] | SAMPLER_DROP | 0 | 1 | ENQUEUED_FOR_SINGLE_SPAN_SAMPLING - [] | USER_KEEP | 1 | 0 | ENQUEUED_FOR_SERIALIZATION - } - - def "span sampling drop strategy respects force keep" () { - setup: - Queue primary = Mock(Queue) - Queue spanSampling = Mock(Queue) - PrioritizationStrategy drop = strategy.create(primary, null, spanSampling, { true }) - DDSpan root = Mock(DDSpan) - List trace = [root] - - when: - PublishResult publishResult = drop.publish(root, SAMPLER_DROP, trace) - - then: - publishResult == expectedResult - 1 * root.isForceKeep() >> forceKeep - (forceKeep ? 1 : 0) * primary.offer(trace) >> true - (forceKeep ? 0 : 1) * spanSampling.offer(trace) >> !singleSpanFull - 0 * _ - - where: - strategy | forceKeep | singleSpanFull | expectedResult - FAST_LANE | true | true | ENQUEUED_FOR_SERIALIZATION - FAST_LANE | false | true | DROPPED_BUFFER_OVERFLOW - FAST_LANE | true | false | ENQUEUED_FOR_SERIALIZATION - FAST_LANE | false | false | ENQUEUED_FOR_SINGLE_SPAN_SAMPLING - } -} diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/SerializationTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/SerializationTest.groovy deleted file mode 100644 index ba273ca3e16..00000000000 --- a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/SerializationTest.groovy +++ /dev/null @@ -1,49 +0,0 @@ -package datadog.trace.common.writer - -import com.fasterxml.jackson.core.type.TypeReference -import com.fasterxml.jackson.databind.ObjectMapper -import datadog.trace.test.util.DDSpecification -import org.msgpack.core.MessagePack -import org.msgpack.jackson.dataformat.MessagePackFactory - -import static java.util.Collections.singletonMap - -class SerializationTest extends DDSpecification { - def "test json mapper serialization"() { - setup: - def mapper = new ObjectMapper() - def map = ["key1": "val1"] - def serializedMap = mapper.writeValueAsBytes(map) - def serializedList = "[${new String(serializedMap)}]".getBytes() - - when: - def result = mapper.readValue(serializedList, new TypeReference>>() {}) - - then: - result == [map] - new String(serializedList) == '[{"key1":"val1"}]' - } - - def "test msgpack mapper serialization"() { - setup: - def mapper = new ObjectMapper(new MessagePackFactory()) - // GStrings get odd results in the serializer. - def input = (1..1).collect { singletonMap("key$it".toString(), "val$it".toString()) } - def serializedMaps = input.collect { - mapper.writeValueAsBytes(it) - } - - def packer = MessagePack.newDefaultBufferPacker() - packer.packArrayHeader(serializedMaps.size()) - serializedMaps.each { - packer.writePayload(it) - } - def serializedList = packer.toByteArray() - - when: - def result = mapper.readValue(serializedList, new TypeReference>>() {}) - - then: - result == input - } -} diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/SpanSamplingWorkerTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/SpanSamplingWorkerTest.groovy deleted file mode 100644 index fcd16d08efd..00000000000 --- a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/SpanSamplingWorkerTest.groovy +++ /dev/null @@ -1,397 +0,0 @@ -package datadog.trace.common.writer - -import datadog.trace.api.sampling.PrioritySampling -import datadog.trace.common.sampling.SingleSpanSampler -import datadog.trace.core.DDSpan -import datadog.trace.core.monitor.HealthMetrics -import datadog.trace.test.util.DDSpecification -import static SpanSamplingWorker.DefaultSpanSamplingWorker - -import java.util.concurrent.CountDownLatch -import java.util.concurrent.LinkedBlockingDeque -import java.util.concurrent.TimeUnit - -class SpanSamplingWorkerTest extends DDSpecification { - - def "send only sampled spans to the sampled span queue"() { - setup: - Queue primaryQueue = new LinkedBlockingDeque<>(10) - Queue secondaryQueue = new LinkedBlockingDeque<>(10) - def droppingPolicy = { false } - SingleSpanSampler singleSpanSampler = Mock(SingleSpanSampler) - HealthMetrics healthMetrics = Mock(HealthMetrics) - SpanSamplingWorker worker = SpanSamplingWorker.build(10, primaryQueue, secondaryQueue, singleSpanSampler, healthMetrics, droppingPolicy) - worker.start() - DDSpan span1 = Mock(DDSpan) - DDSpan span2 = Mock(DDSpan) - DDSpan span3 = Mock(DDSpan) - singleSpanSampler.setSamplingPriority(span1) >> true - singleSpanSampler.setSamplingPriority(span2) >> false - singleSpanSampler.setSamplingPriority(span3) >> true - - when: - worker.getSpanSamplingQueue().offer([span1, span2, span3]) - - then: - primaryQueue.take() == [span1, span3] - secondaryQueue.take() == [span2] - - cleanup: - worker.close() - } - - def "handle multiple traces"() { - setup: - Queue primaryQueue = new LinkedBlockingDeque<>(10) - Queue secondaryQueue = new LinkedBlockingDeque<>(10) - def droppingPolicy = { false } - SingleSpanSampler singleSpanSampler = Mock(SingleSpanSampler) - HealthMetrics healthMetrics = Mock(HealthMetrics) - SpanSamplingWorker worker = SpanSamplingWorker.build(10, primaryQueue, secondaryQueue, singleSpanSampler, healthMetrics, droppingPolicy) - worker.start() - - DDSpan span1 = Mock(DDSpan) - DDSpan span2 = Mock(DDSpan) - DDSpan span3 = Mock(DDSpan) - singleSpanSampler.setSamplingPriority(span1) >> true - singleSpanSampler.setSamplingPriority(span2) >> false - singleSpanSampler.setSamplingPriority(span3) >> true - - DDSpan span4 = Mock(DDSpan) - DDSpan span5 = Mock(DDSpan) - singleSpanSampler.setSamplingPriority(span4) >> true - singleSpanSampler.setSamplingPriority(span5) >> false - - when: - worker.getSpanSamplingQueue().offer([span1, span2, span3]) - worker.getSpanSamplingQueue().offer([span4, span5]) - - then: - primaryQueue.take() == [span1, span3] - secondaryQueue.take() == [span2] - primaryQueue.take() == [span4] - secondaryQueue.take() == [span5] - - cleanup: - worker.close() - } - - def "skip traces with no sampled spans"() { - setup: - Queue primaryQueue = new LinkedBlockingDeque<>(10) - Queue secondaryQueue = new LinkedBlockingDeque<>(10) - def droppingPolicy = { false } - SingleSpanSampler singleSpanSampler = Mock(SingleSpanSampler) - HealthMetrics healthMetrics = Mock(HealthMetrics) - SpanSamplingWorker worker = SpanSamplingWorker.build(10, primaryQueue, secondaryQueue, singleSpanSampler, healthMetrics, droppingPolicy) - worker.start() - - DDSpan span1 = Mock(DDSpan) - DDSpan span2 = Mock(DDSpan) - DDSpan span3 = Mock(DDSpan) - singleSpanSampler.setSamplingPriority(span1) >> true - singleSpanSampler.setSamplingPriority(span2) >> false - singleSpanSampler.setSamplingPriority(span3) >> true - - DDSpan span4 = Mock(DDSpan) - DDSpan span5 = Mock(DDSpan) - singleSpanSampler.setSamplingPriority(span4) >> false - singleSpanSampler.setSamplingPriority(span5) >> false - - DDSpan span6 = Mock(DDSpan) - DDSpan span7 = Mock(DDSpan) - singleSpanSampler.setSamplingPriority(span6) >> true - singleSpanSampler.setSamplingPriority(span7) >> true - - when: - assert worker.getSpanSamplingQueue().offer([span1, span2, span3]) - assert worker.getSpanSamplingQueue().offer([span4, span5]) - assert worker.getSpanSamplingQueue().offer([span6, span7]) - - then: - primaryQueue.take() == [span1, span3] - secondaryQueue.take() == [span2] - secondaryQueue.take() == [span4, span5] - primaryQueue.take() == [span6, span7] - - cleanup: - worker.close() - } - - def "ignore empty traces"() { - setup: - Queue primaryQueue = new LinkedBlockingDeque<>(10) - Queue secondaryQueue = new LinkedBlockingDeque<>(10) - def droppingPolicy = { false } - SingleSpanSampler singleSpanSampler = Mock(SingleSpanSampler) - HealthMetrics healthMetrics = Mock(HealthMetrics) - SpanSamplingWorker worker = SpanSamplingWorker.build(10, primaryQueue, secondaryQueue, singleSpanSampler, healthMetrics, droppingPolicy) - worker.start() - - DDSpan span1 = Mock(DDSpan) - singleSpanSampler.setSamplingPriority(span1) >> true - - when: - assert worker.getSpanSamplingQueue().offer([]) - assert worker.getSpanSamplingQueue().offer([span1]) - - then: - primaryQueue.take() == [span1] - assert secondaryQueue.isEmpty() - - cleanup: - worker.close() - } - - def "update dropped traces metric when no tracer's spans have been sampled"() { - setup: - Queue primaryQueue = new LinkedBlockingDeque<>(10) - Queue secondaryQueue = new LinkedBlockingDeque<>(10) - def droppingPolicy = { false } - SingleSpanSampler singleSpanSampler = Mock(SingleSpanSampler) - HealthMetrics healthMetrics = Mock(HealthMetrics) - int expectedTraces = 1 - CountDownLatch latch = new CountDownLatch(expectedTraces) - SpanSamplingWorker worker = new DefaultSpanSamplingWorker(10, primaryQueue, secondaryQueue, singleSpanSampler, healthMetrics, droppingPolicy) { - @Override - protected void afterOnEvent() { - latch.countDown() - } - } - worker.start() - - DDSpan span1 = Mock(DDSpan) - DDSpan span2 = Mock(DDSpan) - span1.samplingPriority() >> PrioritySampling.USER_DROP - singleSpanSampler.setSamplingPriority(span1) >> false - singleSpanSampler.setSamplingPriority(span2) >> false - - - def queue = worker.getSpanSamplingQueue() - - when: - assert queue.offer([span1, span2]) - - then: - latch.await(10, TimeUnit.SECONDS) - - then: - assert primaryQueue.isEmpty() - secondaryQueue.take() == [span1, span2] - - then: - 1 * healthMetrics.onPublish([span1, span2], PrioritySampling.USER_DROP) - 0 * healthMetrics.onFailedPublish(_,_) - 0 * healthMetrics.onPartialPublish(_) - - cleanup: - worker.close() - } - - def "update dropped traces metric when primaryQueue is full"() { - setup: - Queue primaryQueue = new LinkedBlockingDeque<>(1) - Queue secondaryQueue = new LinkedBlockingDeque<>(10) - def droppingPolicy = { false } - primaryQueue.offer([]) // occupy the entire queue - SingleSpanSampler singleSpanSampler = Mock(SingleSpanSampler) - HealthMetrics healthMetrics = Mock(HealthMetrics) - int expectedTraces = 1 - CountDownLatch latch = new CountDownLatch(expectedTraces) - SpanSamplingWorker worker = new DefaultSpanSamplingWorker(10, primaryQueue, secondaryQueue, singleSpanSampler, healthMetrics, droppingPolicy) { - @Override - protected void afterOnEvent() { - latch.countDown() - } - } - worker.start() - - DDSpan span1 = Mock(DDSpan) - DDSpan span2 = Mock(DDSpan) - span1.samplingPriority() >> PrioritySampling.SAMPLER_DROP - singleSpanSampler.setSamplingPriority(span1) >> false - singleSpanSampler.setSamplingPriority(span2) >> true - - - def queue = worker.getSpanSamplingQueue() - - when: - assert queue.offer([span1, span2]) - - then: - latch.await(10, TimeUnit.SECONDS) - - then: - assert secondaryQueue.isEmpty() - - then: - 1 * healthMetrics.onFailedPublish(PrioritySampling.SAMPLER_DROP,_) - 0 * healthMetrics.onPublish(_, _) - 0 * healthMetrics.onPartialPublish(_) - - cleanup: - worker.close() - } - - def "update published traces metric when all trace's spans have been sampled"() { - setup: - Queue primaryQueue = new LinkedBlockingDeque<>(10) - Queue secondaryQueue = new LinkedBlockingDeque<>(10) - def droppingPolicy = { false } - SingleSpanSampler singleSpanSampler = Mock(SingleSpanSampler) - HealthMetrics healthMetrics = Mock(HealthMetrics) - SpanSamplingWorker worker = SpanSamplingWorker.build(10, primaryQueue, secondaryQueue, singleSpanSampler, healthMetrics, droppingPolicy) - worker.start() - - DDSpan span1 = Mock(DDSpan) - DDSpan span2 = Mock(DDSpan) - span1.samplingPriority() >> PrioritySampling.SAMPLER_DROP - singleSpanSampler.setSamplingPriority(span1) >> true - singleSpanSampler.setSamplingPriority(span2) >> true - - def queue = worker.getSpanSamplingQueue() - - when: - assert queue.offer([span1, span2]) - - then: - primaryQueue.take() == [span1, span2] - assert secondaryQueue.isEmpty() - - then: - 1 * healthMetrics.onPublish([span1, span2], PrioritySampling.SAMPLER_DROP) - 0 * healthMetrics.onFailedPublish(_,_) - 0 * healthMetrics.onPartialPublish(_) - - cleanup: - worker.close() - } - - def "update partial traces metric when some trace's spans have been dropped and sent to secondaryQueue"() { - setup: - Queue primaryQueue = new LinkedBlockingDeque<>(10) - Queue secondaryQueue = new LinkedBlockingDeque<>(10) - def droppingPolicy = { false } - SingleSpanSampler singleSpanSampler = Mock(SingleSpanSampler) - HealthMetrics healthMetrics = Mock(HealthMetrics) - SpanSamplingWorker worker = SpanSamplingWorker.build(10, primaryQueue, secondaryQueue, singleSpanSampler, healthMetrics, droppingPolicy) - worker.start() - - DDSpan span1 = Mock(DDSpan) - DDSpan span2 = Mock(DDSpan) - DDSpan span3 = Mock(DDSpan) - singleSpanSampler.setSamplingPriority(span1) >> false - singleSpanSampler.setSamplingPriority(span2) >> true - singleSpanSampler.setSamplingPriority(span3) >> false - - def queue = worker.getSpanSamplingQueue() - - when: - assert queue.offer([span1, span2, span3]) - - then: - primaryQueue.take() == [span2] - secondaryQueue.take() == [span1, span3] - - then: - 1 * healthMetrics.onPublish([span1, span2, span3], PrioritySampling.SAMPLER_DROP) - 0 * healthMetrics.onPartialPublish(_) - 0 * healthMetrics.onFailedPublish(_,_) - - cleanup: - worker.close() - } - - def "update partial traces metric when some trace's spans have been dropped and secondaryQueue is full or droppingPolicy is active"() { - setup: - Queue primaryQueue = new LinkedBlockingDeque<>(10) - Queue secondaryQueue = new LinkedBlockingDeque<>(secondaryQueueIsFull ? 1 : 10) - if (secondaryQueueIsFull) { - // occupy the entire queue - secondaryQueue.offer([]) - } - SingleSpanSampler singleSpanSampler = Mock(SingleSpanSampler) - HealthMetrics healthMetrics = Mock(HealthMetrics) - SpanSamplingWorker worker = new DefaultSpanSamplingWorker(10, primaryQueue, secondaryQueue, singleSpanSampler, healthMetrics, { droppingPolicy }) - worker.start() - - DDSpan span1 = Mock(DDSpan) - DDSpan span2 = Mock(DDSpan) - DDSpan span3 = Mock(DDSpan) - span1.samplingPriority() >> PrioritySampling.SAMPLER_DROP - singleSpanSampler.setSamplingPriority(span1) >> false - singleSpanSampler.setSamplingPriority(span2) >> true - singleSpanSampler.setSamplingPriority(span3) >> false - - def queue = worker.getSpanSamplingQueue() - - when: - assert queue.offer([span1, span2, span3]) - - then: - primaryQueue.take() == [span2] - - then: - 1 * healthMetrics.onPartialPublish(2) - 0 * healthMetrics.onFailedPublish(_,_) - 0 * healthMetrics.onPublish(_, _) - - cleanup: - worker.close() - - where: - droppingPolicy | secondaryQueueIsFull - true | false - false | true - true | true - } - - def "update FailedPublish metric when all trace's spans have been dropped and secondaryQueue is full or droppingPolicy is active"() { - setup: - Queue primaryQueue = new LinkedBlockingDeque<>(10) - Queue secondaryQueue = new LinkedBlockingDeque<>(secondaryQueueIsFull ? 1 : 10) - if (secondaryQueueIsFull) { - // occupy the entire queue - secondaryQueue.offer([]) - } - SingleSpanSampler singleSpanSampler = Mock(SingleSpanSampler) - HealthMetrics healthMetrics = Mock(HealthMetrics) - int expectedTraces = 1 - CountDownLatch latch = new CountDownLatch(expectedTraces) - SpanSamplingWorker worker = new DefaultSpanSamplingWorker(10, primaryQueue, secondaryQueue, singleSpanSampler, healthMetrics, { droppingPolicy }) { - @Override - protected void afterOnEvent() { - latch.countDown() - } - } - worker.start() - - DDSpan span1 = Mock(DDSpan) - DDSpan span2 = Mock(DDSpan) - span1.samplingPriority() >> PrioritySampling.SAMPLER_DROP - singleSpanSampler.setSamplingPriority(span1) >> false - singleSpanSampler.setSamplingPriority(span2) >> false - - def queue = worker.getSpanSamplingQueue() - - when: - assert queue.offer([span1, span2]) - - then: - latch.await(10, TimeUnit.SECONDS) - - then: - 1 * healthMetrics.onFailedPublish(PrioritySampling.SAMPLER_DROP,_) - 0 * healthMetrics.onPartialPublish(_) - 0 * healthMetrics.onPublish(_, _) - - cleanup: - worker.close() - - where: - droppingPolicy | secondaryQueueIsFull - true | false - false | true - true | true - } -} diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/TraceMapperTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/TraceMapperTest.groovy deleted file mode 100644 index 6f2173e8374..00000000000 --- a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/TraceMapperTest.groovy +++ /dev/null @@ -1,101 +0,0 @@ -package datadog.trace.common.writer - -import datadog.trace.common.writer.ddagent.TraceMapper -import datadog.trace.common.writer.ddagent.TraceMapperV0_5 -import datadog.communication.serialization.ByteBufferConsumer -import datadog.communication.serialization.FlushingBuffer -import datadog.communication.serialization.msgpack.MsgPackWriter -import datadog.trace.core.DDSpan -import datadog.trace.core.test.DDCoreSpecification -import org.msgpack.core.MessagePack -import org.msgpack.core.MessageUnpacker - -import java.nio.ByteBuffer - -class TraceMapperTest extends DDCoreSpecification { - - def "test trace mapper v0.5"() { - setup: - def tracer = tracerBuilder().writer(new ListWriter()).build() - DDSpan span = (DDSpan) tracer.buildSpan("datadog", null).withTag("service.name", "my-service") - .withTag("elasticsearch.version", "7.0").start() - span.setBaggageItem("baggage", "item") - span.spanContext().setDataTop("mydata", "[1,2,3]") - def trace = [span] - - when: - TraceMapper traceMapper = new TraceMapperV0_5() - CapturingByteBufferConsumer sink = new CapturingByteBufferConsumer() - MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(1024, sink)) - packer.format(trace, traceMapper) - packer.flush() - - then: - sink.captured != null - ByteBuffer dictionaryBytes = traceMapper.dictionary.slice() - Map meta = new HashMap<>() - - MessageUnpacker dictionaryUnpacker = MessagePack.newDefaultUnpacker(dictionaryBytes) - int dictionaryLength = traceMapper.encoding.size() - String[] dictionary = new String[dictionaryLength] - for (int i = 0; i < dictionary.length; ++i) { - dictionary[i] = dictionaryUnpacker.unpackString() - } - MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(sink.captured) - int traceCount = unpacker.unpackArrayHeader() - traceCount == 1 - for (int i = 0; i < traceCount; ++i) { - int arrayLength = unpacker.unpackArrayHeader() - arrayLength == 12 - String serviceName = dictionary[unpacker.unpackInt()] - serviceName == "my-service" - String operationName = dictionary[unpacker.unpackInt()] // operation name null - operationName == null - String resourceName = dictionary[unpacker.unpackInt()] - resourceName != null - long traceId = unpacker.unpackLong() - traceId == 1 - long spanId = unpacker.unpackLong() - spanId == 1 - long parentId = unpacker.unpackLong() - parentId == 0 - long start = unpacker.unpackLong() - start > 0 - long duration = unpacker.unpackLong() - duration >= 0 - int error = unpacker.unpackInt() - error == 0 - int metaHeader = unpacker.unpackMapHeader() - for (int j = 0; j < metaHeader; ++j) { - String key = dictionary[unpacker.unpackInt()] - key != null - String value = dictionary[unpacker.unpackInt()] - value != null - meta.put(key, value) - } - int metricsHeader = unpacker.unpackMapHeader() - for (int j = 0; j < metricsHeader; ++j) { - String key = dictionary[unpacker.unpackInt()] - key != null - unpacker.skipValue() - } - String type = dictionary[unpacker.unpackInt()] - type != null - - meta.findResult {it.getKey().contains('.mydata.') ? it.getValue() : null } == '[1,2,3]' - } - - cleanup: - tracer.close() - } - - static class CapturingByteBufferConsumer implements ByteBufferConsumer { - - ByteBuffer captured - - @Override - void accept(int messageCount, ByteBuffer buffer) { - captured = buffer - } - } -} diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/TraceProcessingWorkerTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/TraceProcessingWorkerTest.groovy deleted file mode 100644 index e6b076dcfa8..00000000000 --- a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/TraceProcessingWorkerTest.groovy +++ /dev/null @@ -1,430 +0,0 @@ -package datadog.trace.common.writer - -import datadog.trace.common.sampling.SingleSpanSampler -import datadog.trace.common.writer.ddagent.PrioritizationStrategy.PublishResult -import datadog.trace.core.CoreSpan -import datadog.trace.core.DDSpan -import datadog.trace.core.DDSpanContext -import datadog.trace.core.PendingTrace -import datadog.trace.core.monitor.HealthMetrics -import datadog.trace.bootstrap.instrumentation.api.SpanPostProcessor -import datadog.trace.test.util.DDSpecification -import spock.util.concurrent.PollingConditions - -import java.util.concurrent.TimeUnit -import java.util.concurrent.atomic.AtomicInteger - -import static datadog.trace.api.sampling.PrioritySampling.SAMPLER_DROP -import static datadog.trace.api.sampling.PrioritySampling.SAMPLER_KEEP -import static datadog.trace.api.sampling.PrioritySampling.UNSET -import static datadog.trace.api.sampling.PrioritySampling.USER_DROP -import static datadog.trace.api.sampling.PrioritySampling.USER_KEEP -import static datadog.trace.common.writer.ddagent.Prioritization.FAST_LANE -import static datadog.trace.common.writer.ddagent.PrioritizationStrategy.PublishResult.ENQUEUED_FOR_SERIALIZATION - -class TraceProcessingWorkerTest extends DDSpecification { - - def conditions = new PollingConditions(timeout: 5, initialDelay: 0, factor: 1.25) - - def flushCountingPayloadDispatcher(AtomicInteger flushCounter) { - PayloadDispatcherImpl dispatcher = Mock(PayloadDispatcherImpl) - dispatcher.flush() >> { - flushCounter.incrementAndGet() - } - return dispatcher - } - - def "heartbeats should be triggered automatically when enabled"() { - setup: - AtomicInteger flushCount = new AtomicInteger() - TraceProcessingWorker worker = new TraceProcessingWorker(10, Stub(HealthMetrics), - flushCountingPayloadDispatcher(flushCount), { - false - }, - FAST_LANE, - 1, - TimeUnit.NANOSECONDS, - null - ) // stop heartbeats from being throttled - - when: "processor is started" - worker.start() - - then: "heartbeat occurs automatically" - conditions.eventually { - assert flushCount.get() > 0 - } - - cleanup: - worker.close() - } - - def "heartbeats should occur at least once per second when not throttled"() { - setup: - AtomicInteger flushCount = new AtomicInteger() - TraceProcessingWorker worker = new TraceProcessingWorker(10, Stub(HealthMetrics), - flushCountingPayloadDispatcher(flushCount), { - false - }, - FAST_LANE, - 1, - TimeUnit.NANOSECONDS, - null - ) // stop heartbeats from being throttled - def timeConditions = new PollingConditions(timeout: 1, initialDelay: 1, factor: 1.25) - - when: "processor is started" - worker.start() - - then: "heartbeat occurs automatically approximately once per second" - timeConditions.eventually { - assert flushCount.get() > 1 - } - - cleanup: - worker.close() - } - - def "a flush should clear the primary queue"() { - setup: - AtomicInteger flushCount = new AtomicInteger() - TraceProcessingWorker worker = new TraceProcessingWorker(10, Stub(HealthMetrics), - flushCountingPayloadDispatcher(flushCount), { - false - }, - FAST_LANE, - 100, TimeUnit.SECONDS, null) // prevent heartbeats from helping the flush happen - - when: "there is pending work it is completed before a flush" - // processing this span will throw an exception, but it should be caught - // and not disrupt the flush - worker.primaryQueue.offer([Mock(DDSpan)]) - worker.start() - boolean flushed = worker.flush(10, TimeUnit.SECONDS) - - then: "the flush succeeds, triggers a dispatch, and the queue is empty" - flushed - flushCount.get() == 1 - worker.primaryQueue.isEmpty() - - cleanup: - worker.close() - } - - def "should report failure if serialization fails"() { - setup: - Throwable theError = new IllegalStateException("thrown by test") - PayloadDispatcherImpl throwingDispatcher = Mock(PayloadDispatcherImpl) - throwingDispatcher.addTrace(_) >> { - throw theError - } - AtomicInteger errorReported = new AtomicInteger() - HealthMetrics healthMetrics = Mock(HealthMetrics) - healthMetrics.onFailedSerialize(_, theError) >> { - // do this manually with a counter, despite spock's - // lovely syntactical sugar so we don't have a race - // condition induced flaky test. All we care about - // is that an error was reported and that it was the - // right one - errorReported.incrementAndGet() - } - TraceProcessingWorker worker = new TraceProcessingWorker(10, healthMetrics, - throwingDispatcher, { - false - }, FAST_LANE, - 100, TimeUnit.SECONDS, null) // prevent heartbeats from helping the flush happen - worker.start() - - when: "a trace is processed but can't be passed on" - worker.publish(Mock(DDSpan), priority, [Mock(DDSpan)]) - - then: "the error is reported to the monitor" - conditions.eventually { - assert 1 == errorReported.get() - } - - cleanup: - worker.close() - - where: - priority << [SAMPLER_DROP, USER_DROP, SAMPLER_KEEP, USER_KEEP, UNSET] - } - - def "trace should be post-processed"() { - setup: - AtomicInteger acceptedCount = new AtomicInteger() - PayloadDispatcherImpl countingDispatcher = Mock(PayloadDispatcherImpl) - countingDispatcher.addTrace(_) >> { - acceptedCount.getAndIncrement() - } - HealthMetrics healthMetrics = Mock(HealthMetrics) - - def span1 = DDSpan.create("test", 0, Mock(DDSpanContext) { - getTraceCollector() >> Mock(PendingTrace) { - getCurrentTimeNano() >> 0 - } - }, []) - def processedSpan1 = false - - // Span 2 - should NOT be post-processed - def span2 = DDSpan.create("test", 0, Mock(DDSpanContext) { - getTraceCollector() >> Mock(PendingTrace) { - getCurrentTimeNano() >> 0 - } - }, []) - def processedSpan2 = false - - SpanPostProcessor.Holder.INSTANCE = Mock(SpanPostProcessor) { - process(span1, _) >> { processedSpan1 = true } - process(span2, _) >> { processedSpan2 = true } - } - - TraceProcessingWorker worker = new TraceProcessingWorker(10, healthMetrics, - countingDispatcher, { - false - }, FAST_LANE, 100, TimeUnit.SECONDS, null) - worker.start() - - when: "traces are submitted" - worker.publish(span1, SAMPLER_KEEP, [span1, span2]) - worker.publish(span2, SAMPLER_KEEP, [span1, span2]) - - then: "traces are passed through unless rejected on submission" - conditions.eventually { - assert processedSpan1 - assert processedSpan2 - } - - cleanup: - SpanPostProcessor.Holder.INSTANCE = SpanPostProcessor.Holder.NOOP - worker.close() - } - - def "traces should be processed"() { - setup: - AtomicInteger acceptedCount = new AtomicInteger() - PayloadDispatcherImpl countingDispatcher = Mock(PayloadDispatcherImpl) - countingDispatcher.addTrace(_) >> { - acceptedCount.getAndIncrement() - } - HealthMetrics healthMetrics = Mock(HealthMetrics) - TraceProcessingWorker worker = new TraceProcessingWorker(10, healthMetrics, - countingDispatcher, { - false - }, FAST_LANE, 100, TimeUnit.SECONDS, null) - // prevent heartbeats from helping the flush happen - worker.start() - - when: "traces are submitted" - int submitted = 0 - for (int i = 0; i < traceCount; ++i) { - PublishResult publishResult = worker.publish(Mock(DDSpan), priority, [Mock(DDSpan)]) - submitted += publishResult == ENQUEUED_FOR_SERIALIZATION ? 1 : 0 - } - - then: "traces are passed through unless rejected on submission" - 0 * healthMetrics.onFailedSerialize(_, _) - conditions.eventually { - assert submitted == acceptedCount.get() - } - - cleanup: - worker.close() - - where: - priority | traceCount | strategy - SAMPLER_DROP | 1 | FAST_LANE - USER_DROP | 1 | FAST_LANE - SAMPLER_KEEP | 1 | FAST_LANE - USER_KEEP | 1 | FAST_LANE - UNSET | 1 | FAST_LANE - SAMPLER_DROP | 10 | FAST_LANE - USER_DROP | 10 | FAST_LANE - SAMPLER_KEEP | 10 | FAST_LANE - USER_KEEP | 10 | FAST_LANE - UNSET | 10 | FAST_LANE - SAMPLER_DROP | 20 | FAST_LANE - USER_DROP | 20 | FAST_LANE - SAMPLER_KEEP | 20 | FAST_LANE - USER_KEEP | 20 | FAST_LANE - UNSET | 20 | FAST_LANE - SAMPLER_DROP | 100 | FAST_LANE - USER_DROP | 100 | FAST_LANE - SAMPLER_KEEP | 100 | FAST_LANE - USER_KEEP | 100 | FAST_LANE - UNSET | 100 | FAST_LANE - } - - def "flush of full queue after worker thread stopped will not flush but will return"() { - setup: - PayloadDispatcherImpl countingDispatcher = Mock(PayloadDispatcherImpl) - HealthMetrics healthMetrics = Mock(HealthMetrics) - TraceProcessingWorker worker = new TraceProcessingWorker(10, healthMetrics, - countingDispatcher, { - false - }, FAST_LANE, 100, TimeUnit.SECONDS, null) - worker.start() - worker.close() - int queueSize = 0 - while (worker.primaryQueue.offer([Mock(DDSpan)])) { - queueSize++ - } - - when: - boolean flushed = worker.flush(1, TimeUnit.SECONDS) - then: - !flushed - } - - def "send unsampled traces to the SpanProcessingWorker and expect only sampled spans dispatched when dropping policy is active"() { - setup: - HealthMetrics healthMetrics = Mock(HealthMetrics) - AtomicInteger acceptedCount = new AtomicInteger() - AtomicInteger acceptedSpanCount = new AtomicInteger() - PayloadDispatcherImpl countingDispatcher = Mock(PayloadDispatcherImpl) - countingDispatcher.addTrace(_) >> { - List traceList = it[0] - acceptedSpanCount.getAndAdd(traceList.size()) - acceptedCount.getAndIncrement() - } - AtomicInteger sampledSpansCount = new AtomicInteger() - SingleSpanSampler singleSpanSampler = new SingleSpanSampler() { - int counter = 0 - boolean setSamplingPriority(CoreSpan span) { - if (counter++ % 2 == 0) { - sampledSpansCount.incrementAndGet() - return true - } - // drop every other trace span - return false - } - } - TraceProcessingWorker worker = new TraceProcessingWorker(10, healthMetrics, countingDispatcher, { true }, FAST_LANE, 100, TimeUnit.SECONDS, singleSpanSampler) - worker.start() - - when: "traces are submitted" - for (int i = 0; i < traceCount; ++i) { - worker.publish(trace.get(0), priority, trace) - } - - then: "traces are passed through unless rejected on submission" - conditions.eventually { - assert acceptedTraces == acceptedCount.get() - assert acceptedSpans == acceptedSpanCount.get() - assert sampledSingleSpans == sampledSpansCount.get() - } - - cleanup: - worker.close() - - where: - priority | traceCount | acceptedTraces | acceptedSpans | sampledSingleSpans | trace - SAMPLER_DROP | 1 | 1 | 1 | 1 | [Mock(DDSpan)] - USER_DROP | 1 | 1 | 1 | 1 | [Mock(DDSpan), Mock(DDSpan)] - SAMPLER_DROP | 1 | 1 | 2 | 2 | [Mock(DDSpan), Mock(DDSpan), Mock(DDSpan)] - USER_DROP | 1 | 1 | 2 | 2 | [Mock(DDSpan), Mock(DDSpan), Mock(DDSpan), Mock(DDSpan)] - SAMPLER_DROP | 1 | 1 | 3 | 3 | [Mock(DDSpan), Mock(DDSpan), Mock(DDSpan), Mock(DDSpan), Mock(DDSpan)] - USER_DROP | 2 | 1 | 1 | 1 | [Mock(DDSpan)] // expectedTraceCount = 1 b/o 2nd trace's only span gets unsampled - SAMPLER_DROP | 2 | 2 | 2 | 2 | [Mock(DDSpan), Mock(DDSpan)] - USER_DROP | 2 | 2 | 3 | 3 | [Mock(DDSpan), Mock(DDSpan), Mock(DDSpan)] - SAMPLER_DROP | 2 | 2 | 4 | 4 | [Mock(DDSpan), Mock(DDSpan), Mock(DDSpan), Mock(DDSpan)] - USER_DROP | 2 | 2 | 5 | 5 | [Mock(DDSpan), Mock(DDSpan), Mock(DDSpan), Mock(DDSpan), Mock(DDSpan)] - SAMPLER_DROP | 10 | 5 | 5 | 5 | [Mock(DDSpan)] // expectedTraceCount = 5 b/o every 2nd trace's only span gets unsampled - USER_DROP | 10 | 10 | 10 | 10 | [Mock(DDSpan), Mock(DDSpan)] - SAMPLER_DROP | 10 | 10 | 15 | 15 | [Mock(DDSpan), Mock(DDSpan), Mock(DDSpan)] - USER_DROP | 10 | 10 | 20 | 20 | [Mock(DDSpan), Mock(DDSpan), Mock(DDSpan), Mock(DDSpan)] - SAMPLER_DROP | 10 | 10 | 25 | 25 | [Mock(DDSpan), Mock(DDSpan), Mock(DDSpan), Mock(DDSpan), Mock(DDSpan)] - // do not dispatch kept traces to the single span sampler - SAMPLER_KEEP | 1 | 1 | 1 | 0 | [Mock(DDSpan)] - USER_KEEP | 1 | 1 | 2 | 0 | [Mock(DDSpan), Mock(DDSpan)] - SAMPLER_KEEP | 1 | 1 | 3 | 0 | [Mock(DDSpan), Mock(DDSpan), Mock(DDSpan)] - USER_KEEP | 1 | 1 | 4 | 0 | [Mock(DDSpan), Mock(DDSpan), Mock(DDSpan), Mock(DDSpan)] - SAMPLER_KEEP | 1 | 1 | 5 | 0 | [Mock(DDSpan), Mock(DDSpan), Mock(DDSpan), Mock(DDSpan), Mock(DDSpan)] - USER_KEEP | 2 | 2 | 2 | 0 | [Mock(DDSpan)] - SAMPLER_KEEP | 2 | 2 | 4 | 0 | [Mock(DDSpan), Mock(DDSpan)] - USER_KEEP | 2 | 2 | 6 | 0 | [Mock(DDSpan), Mock(DDSpan), Mock(DDSpan)] - SAMPLER_KEEP | 2 | 2 | 8 | 0 | [Mock(DDSpan), Mock(DDSpan), Mock(DDSpan), Mock(DDSpan)] - USER_KEEP | 2 | 2 | 10 | 0 | [Mock(DDSpan), Mock(DDSpan), Mock(DDSpan), Mock(DDSpan), Mock(DDSpan)] - SAMPLER_KEEP | 10 | 10 | 10 | 0 | [Mock(DDSpan)] - USER_KEEP | 10 | 10 | 20 | 0 | [Mock(DDSpan), Mock(DDSpan)] - SAMPLER_KEEP | 10 | 10 | 30 | 0 | [Mock(DDSpan), Mock(DDSpan), Mock(DDSpan)] - USER_KEEP | 10 | 10 | 40 | 0 | [Mock(DDSpan), Mock(DDSpan), Mock(DDSpan), Mock(DDSpan)] - SAMPLER_KEEP | 10 | 10 | 50 | 0 | [Mock(DDSpan), Mock(DDSpan), Mock(DDSpan), Mock(DDSpan), Mock(DDSpan)] - } - - def "send unsampled traces to the SpanProcessingWorker and expect all spans dispatched when dropping policy is inactive"() { - setup: - HealthMetrics healthMetrics = Mock(HealthMetrics) - AtomicInteger chunksCount = new AtomicInteger() - AtomicInteger spansCount = new AtomicInteger() - PayloadDispatcherImpl countingDispatcher = Mock(PayloadDispatcherImpl) - countingDispatcher.addTrace(_) >> { - List traceList = it[0] - spansCount.getAndAdd(traceList.size()) - chunksCount.getAndIncrement() - } - AtomicInteger sampledSpansCount = new AtomicInteger() - SingleSpanSampler singleSpanSampler = new SingleSpanSampler() { - int counter = 0 - boolean setSamplingPriority(CoreSpan span) { - if (counter++ % 2 == 0) { - sampledSpansCount.incrementAndGet() - return true - } - // drop every other trace span - return false - } - } - TraceProcessingWorker worker = new TraceProcessingWorker(10, healthMetrics, countingDispatcher, { false }, FAST_LANE, 100, TimeUnit.SECONDS, singleSpanSampler) - worker.start() - - when: "traces are submitted" - for (int i = 0; i < traceCount; ++i) { - worker.publish(trace.get(0), priority, trace) - } - - then: "traces are passed through unless rejected on submission" - conditions.eventually { - assert expectedChunks == chunksCount.get() - assert expectedSpans == spansCount.get() - assert sampledSingleSpans == sampledSpansCount.get() - } - - cleanup: - worker.close() - - where: - priority | traceCount | expectedChunks | expectedSpans | sampledSingleSpans | trace - SAMPLER_DROP | 1 | 1 | 1 | 1 | [Mock(DDSpan)] - USER_DROP | 1 | 2 | 2 | 1 | [Mock(DDSpan), Mock(DDSpan)] - SAMPLER_DROP | 1 | 2 | 3 | 2 | [Mock(DDSpan), Mock(DDSpan), Mock(DDSpan)] - USER_DROP | 1 | 2 | 4 | 2 | [Mock(DDSpan), Mock(DDSpan), Mock(DDSpan), Mock(DDSpan)] - SAMPLER_DROP | 1 | 2 | 5 | 3 | [Mock(DDSpan), Mock(DDSpan), Mock(DDSpan), Mock(DDSpan), Mock(DDSpan)] - USER_DROP | 2 | 2 | 2*1 | 1 | [Mock(DDSpan)] - SAMPLER_DROP | 2 | 2*2 | 2*2 | 2 | [Mock(DDSpan), Mock(DDSpan)] - USER_DROP | 2 | 2*2 | 2*3 | 3 | [Mock(DDSpan), Mock(DDSpan), Mock(DDSpan)] - SAMPLER_DROP | 2 | 2*2 | 2*4 | 4 | [Mock(DDSpan), Mock(DDSpan), Mock(DDSpan), Mock(DDSpan)] - USER_DROP | 2 | 2*2 | 2*5 | 5 | [Mock(DDSpan), Mock(DDSpan), Mock(DDSpan), Mock(DDSpan), Mock(DDSpan)] - USER_DROP | 10 | 10 | 10 | 10/2*1 | [Mock(DDSpan)] - SAMPLER_DROP | 10 | 10*2 | 20 | 10/2*2 | [Mock(DDSpan), Mock(DDSpan)] - USER_DROP | 10 | 10*2 | 30 | 10/2*3 | [Mock(DDSpan), Mock(DDSpan), Mock(DDSpan)] - SAMPLER_DROP | 10 | 10*2 | 40 | 10/2*4 | [Mock(DDSpan), Mock(DDSpan), Mock(DDSpan), Mock(DDSpan)] - USER_DROP | 10 | 10*2 | 50 | 10/2*5 | [Mock(DDSpan), Mock(DDSpan), Mock(DDSpan), Mock(DDSpan), Mock(DDSpan)] - // do not dispatch kept traces to the single span sampler - SAMPLER_KEEP | 1 | 1 | 1 | 0 | [Mock(DDSpan)] - USER_KEEP | 1 | 1 | 2 | 0 | [Mock(DDSpan), Mock(DDSpan)] - SAMPLER_KEEP | 1 | 1 | 3 | 0 | [Mock(DDSpan), Mock(DDSpan), Mock(DDSpan)] - USER_KEEP | 1 | 1 | 4 | 0 | [Mock(DDSpan), Mock(DDSpan), Mock(DDSpan), Mock(DDSpan)] - SAMPLER_KEEP | 1 | 1 | 5 | 0 | [Mock(DDSpan), Mock(DDSpan), Mock(DDSpan), Mock(DDSpan), Mock(DDSpan)] - USER_KEEP | 2 | 2 | 2*1 | 0 | [Mock(DDSpan)] - SAMPLER_KEEP | 2 | 2 | 2*2 | 0 | [Mock(DDSpan), Mock(DDSpan)] - USER_KEEP | 2 | 2 | 2*3 | 0 | [Mock(DDSpan), Mock(DDSpan), Mock(DDSpan)] - SAMPLER_KEEP | 2 | 2 | 2*4 | 0 | [Mock(DDSpan), Mock(DDSpan), Mock(DDSpan), Mock(DDSpan)] - USER_KEEP | 2 | 2 | 2*5 | 0 | [Mock(DDSpan), Mock(DDSpan), Mock(DDSpan), Mock(DDSpan), Mock(DDSpan)] - SAMPLER_KEEP | 10 | 10 | 10 | 0 | [Mock(DDSpan)] - USER_KEEP | 10 | 10 | 20 | 0 | [Mock(DDSpan), Mock(DDSpan)] - SAMPLER_KEEP | 10 | 10 | 30 | 0 | [Mock(DDSpan), Mock(DDSpan), Mock(DDSpan)] - USER_KEEP | 10 | 10 | 40 | 0 | [Mock(DDSpan), Mock(DDSpan), Mock(DDSpan), Mock(DDSpan)] - SAMPLER_KEEP | 10 | 10 | 50 | 0 | [Mock(DDSpan), Mock(DDSpan), Mock(DDSpan), Mock(DDSpan), Mock(DDSpan)] - } -} diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/WriterFactoryTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/WriterFactoryTest.groovy deleted file mode 100644 index d20bd475cac..00000000000 --- a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/WriterFactoryTest.groovy +++ /dev/null @@ -1,242 +0,0 @@ -package datadog.trace.common.writer - -import static datadog.trace.api.config.TracerConfig.PRIORITIZATION_TYPE - -import datadog.communication.ddagent.DDAgentFeaturesDiscovery -import datadog.communication.ddagent.SharedCommunicationObjects -import datadog.trace.api.Config -import datadog.trace.api.config.OtlpConfig -import datadog.trace.api.intake.TrackType -import datadog.trace.common.sampling.Sampler -import datadog.trace.common.writer.ddagent.DDAgentApi -import datadog.trace.common.writer.ddagent.Prioritization -import datadog.trace.common.writer.ddintake.DDEvpProxyApi -import datadog.trace.common.writer.ddintake.DDIntakeApi -import datadog.trace.core.monitor.HealthMetrics -import datadog.trace.core.otlp.common.OtlpGrpcSender -import datadog.trace.core.otlp.common.OtlpHttpSender -import datadog.trace.test.util.DDSpecification -import groovy.json.JsonBuilder -import java.util.stream.Collectors -import okhttp3.Call -import okhttp3.HttpUrl -import okhttp3.MediaType -import okhttp3.OkHttpClient -import okhttp3.Protocol -import okhttp3.Request -import okhttp3.Response -import okhttp3.ResponseBody - -class WriterFactoryTest extends DDSpecification { - - def "test writer creation for #configuredType when agentHasEvpProxy=#hasEvpProxy evpProxySupportsCompression=#evpProxySupportsCompression ciVisibilityAgentless=#isCiVisibilityAgentlessEnabled"() { - setup: - def config = Mock(Config) - config.apiKey >> "my-api-key" - config.agentUrl >> "http://my-agent.url" - config.getEnumValue(PRIORITIZATION_TYPE, _, _) >> Prioritization.FAST_LANE - config.tracerMetricsEnabled >> true - config.isCiVisibilityEnabled() >> true - config.isCiVisibilityCodeCoverageEnabled() >> false - - // Mock agent info response - def response = buildHttpResponse(hasEvpProxy, evpProxySupportsCompression, HttpUrl.parse(config.agentUrl + "/info")) - - // Mock HTTP client that simulates delayed response for async feature discovery - def mockCall = Mock(Call) - def mockHttpClient = Mock(OkHttpClient) - mockCall.execute() >> { - // Add a delay - sleep(400) - return response - } - mockHttpClient.newCall(_ as Request) >> mockCall - - // Create SharedCommunicationObjects with mocked HTTP client - def sharedComm = new SharedCommunicationObjects() - sharedComm.agentHttpClient = mockHttpClient - sharedComm.agentUrl = HttpUrl.parse(config.agentUrl) - sharedComm.createRemaining(config) - - def sampler = Mock(Sampler) - - when: - config.ciVisibilityAgentlessEnabled >> isCiVisibilityAgentlessEnabled - - def writer = WriterFactory.createWriter(config, sharedComm, sampler, null, HealthMetrics.NO_OP, configuredType) - - def apis - def apiClasses - if (expectedApiClasses != null) { - apis = ((RemoteWriter) writer).apis - apiClasses = apis.stream().map(Object::getClass).collect(Collectors.toList()) - } else { - apis = Collections.emptyList() - apiClasses = Collections.emptyList() - } - - then: - writer.class == expectedWriterClass - expectedApiClasses == null || apiClasses == expectedApiClasses - expectedApiClasses == null || apis.stream().allMatch(api -> api.isCompressionEnabled() == isCompressionEnabled) - - where: - configuredType | hasEvpProxy | evpProxySupportsCompression | isCiVisibilityAgentlessEnabled | expectedWriterClass | expectedApiClasses | isCompressionEnabled - "LoggingWriter" | true | false | true | LoggingWriter | null | false - "PrintingWriter" | true | false | true | PrintingWriter | null | false - "TraceStructureWriter" | true | false | true | TraceStructureWriter | null | false - "MultiWriter:LoggingWriter,PrintingWriter" | true | false | true | MultiWriter | null | false - "DDIntakeWriter" | true | false | true | DDIntakeWriter | [DDIntakeApi] | true - "DDIntakeWriter" | true | false | false | DDIntakeWriter | [DDEvpProxyApi] | false - "DDIntakeWriter" | false | false | true | DDIntakeWriter | [DDIntakeApi] | true - "DDIntakeWriter" | false | false | false | DDIntakeWriter | [DDIntakeApi] | true - "DDAgentWriter" | true | false | true | DDIntakeWriter | [DDIntakeApi] | true - "DDAgentWriter" | true | false | false | DDIntakeWriter | [DDEvpProxyApi] | false - "DDAgentWriter" | true | true | false | DDIntakeWriter | [DDEvpProxyApi] | true - "DDAgentWriter" | false | false | true | DDIntakeWriter | [DDIntakeApi] | true - "DDAgentWriter" | false | false | false | DDAgentWriter | [DDAgentApi] | false - "not-found" | true | false | true | DDIntakeWriter | [DDIntakeApi] | true - "not-found" | true | false | false | DDIntakeWriter | [DDEvpProxyApi] | false - "not-found" | false | false | true | DDIntakeWriter | [DDIntakeApi] | true - "not-found" | false | false | false | DDAgentWriter | [DDAgentApi] | false - } - - def "test writer creation for #configuredType when agentHasEvpProxy=#hasEvpProxy llmObsAgentless=#isLlmObsAgentlessEnabled for LLM Observability"() { - setup: - def config = Mock(Config) - config.apiKey >> "my-api-key" - config.agentUrl >> "http://my-agent.url" - config.getEnumValue(PRIORITIZATION_TYPE, _, _) >> Prioritization.FAST_LANE - config.tracerMetricsEnabled >> true - config.isLlmObsEnabled() >> true - - // Mock agent info response - def response - if (agentRunning) { - response = buildHttpResponse(hasEvpProxy, true, HttpUrl.parse(config.agentUrl + "/info")) - } else { - response = buildHttpResponseNotOk(HttpUrl.parse(config.agentUrl + "/info")) - } - - // Mock HTTP client that simulates delayed response for async feature discovery - def mockCall = Mock(Call) - def mockHttpClient = Mock(OkHttpClient) - mockCall.execute() >> { - // Add a delay - sleep(400) - return response - } - mockHttpClient.newCall(_ as Request) >> mockCall - - // Create SharedCommunicationObjects with mocked HTTP client - def sharedComm = new SharedCommunicationObjects() - sharedComm.agentHttpClient = mockHttpClient - sharedComm.agentUrl = HttpUrl.parse(config.agentUrl) - sharedComm.createRemaining(config) - - def sampler = Mock(Sampler) - - when: - config.llmObsAgentlessEnabled >> isLlmObsAgentlessEnabled - - def writer = WriterFactory.createWriter(config, sharedComm, sampler, null, HealthMetrics.NO_OP, configuredType) - def llmObsApiClasses = ((RemoteWriter) writer).apis - .stream() - .filter(api -> { - try { - def trackTypeField = api.class.getDeclaredField("trackType") - trackTypeField.setAccessible(true) - return trackTypeField.get(api) == TrackType.LLMOBS - } catch (Exception e) { - return false - } - }) - .map(Object::getClass) - .collect(Collectors.toList()) - - then: - writer.class == expectedWriterClass - llmObsApiClasses == expectedLlmObsApiClasses - - where: - configuredType | agentRunning | hasEvpProxy | isLlmObsAgentlessEnabled |expectedWriterClass | expectedLlmObsApiClasses - "DDIntakeWriter" | true | true | false | DDIntakeWriter | [DDEvpProxyApi] - "DDIntakeWriter" | true | false | false | DDIntakeWriter | [DDIntakeApi] - "DDIntakeWriter" | false | false | false | DDIntakeWriter | [DDIntakeApi] - "DDIntakeWriter" | true | true | true | DDIntakeWriter | [DDIntakeApi] - "DDIntakeWriter" | true | false | true | DDIntakeWriter | [DDIntakeApi] - "DDIntakeWriter" | false | false | true | DDIntakeWriter | [DDIntakeApi] - } - - def "test writer creation for OtlpWriter wires #protocol+#compression"() { - setup: - def config = Mock(Config) - def headers = ["api-key": "secret"] - def readField = { Object instance, String fieldName -> - def field = instance.class.getDeclaredField(fieldName) - field.setAccessible(true) - return field.get(instance) - } - - config.getTraceFlushIntervalSeconds() >> 1.0f - config.getOtlpTracesEndpoint() >> endpoint - config.getOtlpTracesHeaders() >> headers - config.getOtlpTracesProtocol() >> protocol - config.getOtlpTracesCompression() >> compression - config.getOtlpTracesTimeout() >> 5000 - - when: - // OTLP branch in WriterFactory does not consult sharedComm or sampler, so nulls are safe here. - def writer = WriterFactory.createWriter(config, null, null, null, HealthMetrics.NO_OP, "OtlpWriter") - def sender = readField(writer, "sender") - - then: - writer.class == OtlpWriter - sender.class == expectedSenderClass - readField(sender, "url").toString() == expectedUrl - readField(sender, "headers") == headers - readField(sender, "gzip") == expectedGzip - - cleanup: - writer?.close() - - where: - protocol | compression | endpoint | expectedSenderClass | expectedUrl | expectedGzip - OtlpConfig.Protocol.HTTP_PROTOBUF | OtlpConfig.Compression.NONE | "http://otel-collector:4318/v1/traces" | OtlpHttpSender | "http://otel-collector:4318/v1/traces" | false - OtlpConfig.Protocol.HTTP_PROTOBUF | OtlpConfig.Compression.GZIP | "http://otel-collector:4318/v1/traces" | OtlpHttpSender | "http://otel-collector:4318/v1/traces" | true - OtlpConfig.Protocol.GRPC | OtlpConfig.Compression.NONE | "http://otel-collector:4317" | OtlpGrpcSender | "http://otel-collector:4317/opentelemetry.proto.collector.trace.v1.TraceService/Export" | false - } - - Response buildHttpResponse(boolean hasEvpProxy, boolean evpProxySupportsCompression, HttpUrl agentUrl) { - def endpoints = [] - if (hasEvpProxy && evpProxySupportsCompression) { - endpoints = [DDAgentFeaturesDiscovery.V4_EVP_PROXY_ENDPOINT] - } else if (hasEvpProxy) { - endpoints = [DDAgentFeaturesDiscovery.V2_EVP_PROXY_ENDPOINT] - } else { - endpoints = [DDAgentFeaturesDiscovery.V04_ENDPOINT] - } - - def response = [ - "version" : "7.40.0", - "endpoints" : endpoints, - ] - - def builder = new Response.Builder() - .code(200) - .message("OK") - .protocol(Protocol.HTTP_1_1) - .request(new Request.Builder().url(agentUrl.resolve("/info")).build()) - .body(ResponseBody.create(MediaType.parse("application/json"), new JsonBuilder(response).toString())) - return builder.build() - } - - Response buildHttpResponseNotOk(HttpUrl agentUrl) { - def builder = new Response.Builder() - .code(500) - .message("ERROR") - .protocol(Protocol.HTTP_1_1) - .request(new Request.Builder().url(agentUrl.resolve("/info")).build()) - return builder.build() - } -} diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/ddagent/TraceMapperV04PayloadTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/ddagent/TraceMapperV04PayloadTest.groovy deleted file mode 100644 index 650d846a360..00000000000 --- a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/ddagent/TraceMapperV04PayloadTest.groovy +++ /dev/null @@ -1,425 +0,0 @@ -package datadog.trace.common.writer.ddagent - -import datadog.communication.serialization.ByteBufferConsumer -import datadog.communication.serialization.FlushingBuffer -import datadog.communication.serialization.msgpack.MsgPackWriter -import datadog.trace.api.Config -import datadog.trace.api.DD64bTraceId -import datadog.trace.api.DDTags -import datadog.trace.api.DDTraceId -import datadog.trace.api.ProcessTags -import datadog.trace.bootstrap.instrumentation.api.Tags -import datadog.trace.common.writer.Payload -import datadog.trace.common.writer.TraceGenerator -import datadog.trace.core.DDSpanContext -import datadog.trace.test.util.DDSpecification -import org.junit.jupiter.api.Assertions -import org.msgpack.core.MessageFormat -import org.msgpack.core.MessagePack -import org.msgpack.core.MessageUnpacker - -import java.nio.ByteBuffer -import java.nio.channels.WritableByteChannel - -import static datadog.trace.bootstrap.instrumentation.api.InstrumentationTags.DD_MEASURED -import static datadog.trace.common.writer.TraceGenerator.generateRandomTraces -import static org.junit.jupiter.api.Assertions.assertEquals -import static org.junit.jupiter.api.Assertions.assertFalse -import static org.junit.jupiter.api.Assertions.assertNotNull -import static org.junit.jupiter.api.Assertions.assertTrue -import static org.msgpack.core.MessageFormat.FLOAT32 -import static org.msgpack.core.MessageFormat.FLOAT64 -import static org.msgpack.core.MessageFormat.INT16 -import static org.msgpack.core.MessageFormat.INT32 -import static org.msgpack.core.MessageFormat.INT64 -import static org.msgpack.core.MessageFormat.INT8 -import static org.msgpack.core.MessageFormat.NEGFIXINT -import static org.msgpack.core.MessageFormat.POSFIXINT -import static org.msgpack.core.MessageFormat.UINT16 -import static org.msgpack.core.MessageFormat.UINT32 -import static org.msgpack.core.MessageFormat.UINT64 -import static org.msgpack.core.MessageFormat.UINT8 - -class TraceMapperV04PayloadTest extends DDSpecification { - - def "test traces written correctly"() { - setup: - List> traces = generateRandomTraces(traceCount, lowCardinality) - TraceMapperV0_4 traceMapper = new TraceMapperV0_4() - PayloadVerifier verifier = new PayloadVerifier(traces, traceMapper) - MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(bufferSize, verifier)) - when: - boolean tracesFitInBuffer = true - for (List trace : traces) { - if (!packer.format(trace, traceMapper)) { - verifier.skipLargeTrace() - tracesFitInBuffer = false - // in the real like the mapper is always reset each trace. - // here we need to force it when we fail since the buffer will be reset as well - traceMapper.reset() - } - } - packer.flush() - - then: - if (tracesFitInBuffer) { - verifier.verifyTracesConsumed() - } - - where: - bufferSize | traceCount | lowCardinality - 20 << 10 | 0 | true - 20 << 10 | 1 | true - 30 << 10 | 1 | true - 30 << 10 | 2 | true - 20 << 10 | 0 | false - 20 << 10 | 1 | false - 30 << 10 | 1 | false - 30 << 10 | 2 | false - 100 << 10 | 0 | true - 100 << 10 | 1 | true - 100 << 10 | 10 | true - 100 << 10 | 100 | true - 100 << 10 | 1000 | true - 100 << 10 | 0 | false - 100 << 10 | 1 | false - 100 << 10 | 10 | false - 100 << 10 | 100 | false - 100 << 10 | 1000 | false - } - - def "test full 64-bit trace and span identifiers"() { - setup: - def span = new TraceGenerator.PojoSpan( - "service", - "operation", - "resource", - traceId, - spanId, - parentId, - 123L, - 456L, - 0, - [:], - [:], - "type", - false, - 0, - 0, - "origin") - def traces = [[span]] - TraceMapperV0_4 traceMapper = new TraceMapperV0_4() - PayloadVerifier verifier = new PayloadVerifier(traces, traceMapper) - MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(20 << 10, verifier)) - - when: - packer.format([span], traceMapper) - packer.flush() - - then: - verifier.verifyTracesConsumed() - - where: - traceId | spanId | parentId - DD64bTraceId.ONE | 2L | 3L - DD64bTraceId.MAX | 2L | 3L - DD64bTraceId.from(-10) | -11L | -12L - } - - void 'test metaStruct support'() { - given: - def span = new TraceGenerator.PojoSpan( - 'service', - 'operation', - 'resource', - DDTraceId.ONE, - 1L, - -1L, - 123L, - 456L, - 0, - [:], - [:], - 'type', - false, - 0, - 0, - 'origin') - span.setMetaStruct('stack', Thread.currentThread().stackTrace.toList().collect { - [ - file: it.fileName ?: '', - class_name: it.className ?: '', - function: it.methodName ?: '' - ] - }) - def traces = [[span]] - TraceMapperV0_4 traceMapper = new TraceMapperV0_4() - PayloadVerifier verifier = new PayloadVerifier(traces, traceMapper, (List expected, byte[] received) -> { - def unpacker = MessagePack.newDefaultUnpacker(received) - def size = unpacker.unpackArrayHeader() - assertEquals(expected.size(), size) - expected.eachWithIndex { - def stackEntry, int i -> - int fields = unpacker.unpackMapHeader() - (0..> expectedTraces - private final TraceMapperV0_4 mapper - private ByteBuffer captured = ByteBuffer.allocate(200 << 10) - private MetaStructVerifier metaStructVerifier - - private int position = 0 - - private PayloadVerifier(List> traces, TraceMapperV0_4 mapper, MetaStructVerifier metaStructVerifier = null) { - this.expectedTraces = traces - this.mapper = mapper - this.metaStructVerifier = metaStructVerifier - } - - void skipLargeTrace() { - ++position - } - - @Override - void accept(int messageCount, ByteBuffer buffer) { - if (expectedTraces.isEmpty() && messageCount == 0) { - return - } - int processTagsCount = 0 - try { - Payload payload = mapper.newPayload().withBody(messageCount, buffer) - payload.writeTo(this) - captured.flip() - MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(captured) - int traceCount = unpacker.unpackArrayHeader() - for (int i = 0; i < traceCount; ++i) { - List expectedTrace = expectedTraces.get(position++) - int spanCount = unpacker.unpackArrayHeader() - assertEquals(expectedTrace.size(), spanCount) - for (int k = 0; k < spanCount; ++k) { - TraceGenerator.PojoSpan expectedSpan = expectedTrace.get(k) - int elementCount = unpacker.unpackMapHeader() - boolean hasMetaStruct = !expectedSpan.getMetaStruct().isEmpty() - assertEquals(hasMetaStruct ? 13 : 12, elementCount) - assertEquals("service", unpacker.unpackString()) - String serviceName = unpacker.unpackString() - assertEqualsWithNullAsEmpty(expectedSpan.getServiceName(), serviceName) - assertEquals("name", unpacker.unpackString()) - String operationName = unpacker.unpackString() - assertEqualsWithNullAsEmpty(expectedSpan.getOperationName(), operationName) - assertEquals("resource", unpacker.unpackString()) - String resourceName = unpacker.unpackString() - assertEqualsWithNullAsEmpty(expectedSpan.getResourceName(), resourceName) - assertEquals("trace_id", unpacker.unpackString()) - long traceId = unpacker.unpackValue().asNumberValue().toLong() - assertEquals(expectedSpan.getTraceId().toLong(), traceId) - assertEquals("span_id", unpacker.unpackString()) - long spanId = unpacker.unpackValue().asNumberValue().toLong() - assertEquals(expectedSpan.getSpanId(), spanId) - assertEquals("parent_id", unpacker.unpackString()) - long parentId = unpacker.unpackValue().asNumberValue().toLong() - assertEquals(expectedSpan.getParentId(), parentId) - assertEquals("start", unpacker.unpackString()) - long startTime = unpacker.unpackLong() - assertEquals(expectedSpan.getStartTime(), startTime) - assertEquals("duration", unpacker.unpackString()) - long duration = unpacker.unpackLong() - assertEquals(expectedSpan.getDurationNano(), duration) - assertEquals("type", unpacker.unpackString()) - String type = unpacker.unpackString() - assertEquals(expectedSpan.getType(), type) - assertEquals("error", unpacker.unpackString()) - int error = unpacker.unpackInt() - assertEquals(expectedSpan.getError(), error) - assertEquals("metrics", unpacker.unpackString()) - int metricsSize = unpacker.unpackMapHeader() - HashMap metrics = new HashMap<>() - for (int j = 0; j < metricsSize; ++j) { - String key = unpacker.unpackString() - Number n = null - MessageFormat format = unpacker.getNextFormat() - switch (format) { - case NEGFIXINT: - case POSFIXINT: - case INT8: - case UINT8: - case INT16: - case UINT16: - case INT32: - case UINT32: - n = unpacker.unpackInt() - break - case INT64: - case UINT64: - n = unpacker.unpackLong() - break - case FLOAT32: - n = unpacker.unpackFloat() - break - case FLOAT64: - n = unpacker.unpackDouble() - break - default: - Assertions.fail("Unexpected type in metrics values: " + format) - } - if (DD_MEASURED.toString() == key) { - assert ((n == 1) && expectedSpan.isMeasured()) || !expectedSpan.isMeasured() - } else if (DDSpanContext.PRIORITY_SAMPLING_KEY == key) { - //check that priority sampling is only on first and last span - if (k == 0 || k == spanCount - 1) { - assertEquals(expectedSpan.samplingPriority(), n.intValue()) - } else { - assertFalse(expectedSpan.hasSamplingPriority()) - } - } else { - metrics.put(key, n) - } - } - for (Map.Entry metric : metrics.entrySet()) { - if (metric.getValue() instanceof Double || metric.getValue() instanceof Float) { - assertEquals(((Number) expectedSpan.getTag(metric.getKey())).doubleValue(), metric.getValue().doubleValue(), 0.001) - } else { - assertEquals(expectedSpan.getTag(metric.getKey()), metric.getValue()) - } - } - assertEquals("meta", unpacker.unpackString()) - int metaSize = unpacker.unpackMapHeader() - HashMap meta = new HashMap<>() - for (int j = 0; j < metaSize; ++j) { - meta.put(unpacker.unpackString(), unpacker.unpackString()) - } - for (Map.Entry entry : meta.entrySet()) { - if (Tags.HTTP_STATUS.equals(entry.getKey())) { - assertEquals(String.valueOf(expectedSpan.getHttpStatusCode()), entry.getValue()) - } else if (DDTags.ORIGIN_KEY.equals(entry.getKey())) { - assertEquals(expectedSpan.getOrigin(), entry.getValue()) - } else if (DDTags.PROCESS_TAGS.equals(entry.getKey())) { - assertTrue(Config.get().isExperimentalPropagateProcessTagsEnabled()) - assertEquals(0, k) - assertEquals(ProcessTags.tagsForSerialization.toString(), entry.getValue()) - processTagsCount++ - } else { - Object tag = expectedSpan.getTag(entry.getKey()) - if (null != tag) { - assertEquals(String.valueOf(tag), entry.getValue()) - } else { - assertEquals(expectedSpan.getBaggage().get(entry.getKey()), entry.getValue()) - } - } - } - if (hasMetaStruct) { - Map metaStruct = expectedSpan.getMetaStruct() - assertEquals("meta_struct", unpacker.unpackString()) - int metaStructSize = unpacker.unpackMapHeader() - for (int j = 0; j < metaStructSize; ++j) { - String field = unpacker.unpackString() - if (metaStructVerifier != null) { - byte[] binary = new byte[unpacker.unpackBinaryHeader()] - unpacker.readPayload(binary) - metaStructVerifier.verify(metaStruct.get(field), binary) - } - } - } - } - } - } catch (IOException e) { - Assertions.fail(e.getMessage()) - } finally { - mapper.reset() - captured.position(0) - captured.limit(captured.capacity()) - assert processTagsCount == (Config.get().isExperimentalPropagateProcessTagsEnabled() ? 1 : 0) - } - } - - @Override - int write(ByteBuffer src) { - if (captured.remaining() < src.remaining()) { - ByteBuffer newBuffer = ByteBuffer.allocate(captured.capacity() + src.capacity()) - captured.flip() - newBuffer.put(captured) - captured = newBuffer - return write(src) - } - captured.put(src) - return src.position() - } - - void verifyTracesConsumed() { - assertEquals(expectedTraces.size(), position) - } - - @Override - boolean isOpen() { - return true - } - - @Override - void close() { - } - } - - private static void assertEqualsWithNullAsEmpty(CharSequence expected, CharSequence actual) { - if (null == expected) { - assertEquals("", actual) - } else { - assertEquals(expected.toString(), actual.toString()) - } - } - - private static interface MetaStructVerifier { - void verify(final E expected, final byte[] received) - } -} diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/ddagent/TraceMapperV05PayloadTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/ddagent/TraceMapperV05PayloadTest.groovy deleted file mode 100644 index e03bf6e48eb..00000000000 --- a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/ddagent/TraceMapperV05PayloadTest.groovy +++ /dev/null @@ -1,389 +0,0 @@ -package datadog.trace.common.writer.ddagent - -import datadog.communication.serialization.ByteBufferConsumer -import datadog.communication.serialization.FlushingBuffer -import datadog.communication.serialization.msgpack.MsgPackWriter -import datadog.trace.api.Config -import datadog.trace.api.DDSpanId -import datadog.trace.api.DDTags -import datadog.trace.api.DDTraceId -import datadog.trace.api.ProcessTags -import datadog.trace.api.sampling.PrioritySampling -import datadog.trace.bootstrap.instrumentation.api.Tags -import datadog.trace.common.writer.Payload -import datadog.trace.common.writer.TraceGenerator -import datadog.trace.core.DDSpanContext -import datadog.trace.test.util.DDSpecification -import org.junit.Assert -import org.msgpack.core.MessageFormat -import org.msgpack.core.MessagePack -import org.msgpack.core.MessageUnpacker - -import java.nio.ByteBuffer -import java.nio.channels.WritableByteChannel -import java.util.concurrent.atomic.AtomicInteger - -import static datadog.trace.api.config.GeneralConfig.EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED -import static datadog.trace.bootstrap.instrumentation.api.InstrumentationTags.DD_MEASURED -import static datadog.trace.common.writer.TraceGenerator.generateRandomTraces -import static org.junit.jupiter.api.Assertions.assertEquals -import static org.junit.jupiter.api.Assertions.assertFalse -import static org.junit.jupiter.api.Assertions.assertNotNull -import static org.junit.jupiter.api.Assertions.assertTrue -import static org.msgpack.core.MessageFormat.FLOAT32 -import static org.msgpack.core.MessageFormat.FLOAT64 -import static org.msgpack.core.MessageFormat.INT16 -import static org.msgpack.core.MessageFormat.INT32 -import static org.msgpack.core.MessageFormat.INT64 -import static org.msgpack.core.MessageFormat.INT8 -import static org.msgpack.core.MessageFormat.NEGFIXINT -import static org.msgpack.core.MessageFormat.POSFIXINT -import static org.msgpack.core.MessageFormat.UINT16 -import static org.msgpack.core.MessageFormat.UINT32 -import static org.msgpack.core.MessageFormat.UINT64 -import static org.msgpack.core.MessageFormat.UINT8 - -class TraceMapperV05PayloadTest extends DDSpecification { - - def "body overflow causes a flush"() { - setup: - // disable process tags since they are only on the first span of the chunk otherwise the calculation woes - injectSysConfig(EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, "false") - ProcessTags.reset() - // 4x 36 ASCII characters and 2 bytes of msgpack string prefix - int dictionarySpacePerTrace = 4 * (36 + 2) - // enough space for two traces with distinct string values, plus the header - int dictionarySize = dictionarySpacePerTrace * 2 + 5 - TraceMapperV0_5 traceMapper = new TraceMapperV0_5(dictionarySize) - List repeatedTrace = Collections.singletonList(new TraceGenerator.PojoSpan( - UUID.randomUUID().toString(), - UUID.randomUUID().toString(), - UUID.randomUUID().toString(), - DDTraceId.ZERO, - DDSpanId.ZERO, - DDSpanId.ZERO, - 10000, - 100, - 0, - Collections.emptyMap(), - Collections.emptyMap(), - UUID.randomUUID().toString(), - false, - PrioritySampling.UNSET, - 0, - null)) - int traceSize = calculateSize(repeatedTrace) - // 30KB body - int bufferSize = 30 << 10 - int tracesRequiredToOverflowBody = Math.ceil(((double)bufferSize) / traceSize) + 1 - List> traces = new ArrayList<>(tracesRequiredToOverflowBody) - for (int i = 0; i < tracesRequiredToOverflowBody; ++i) { - traces.add(repeatedTrace) - } - // the last one won't be flushed - List> flushedTraces = new ArrayList<>(traces) - flushedTraces.remove(traces.size() - 1) - // need space for the overflowing buffer, the dictionary, and two small array headers - PayloadVerifier verifier = new PayloadVerifier(flushedTraces, traceMapper, bufferSize + dictionarySize + 1 + 1 + 5) - MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(bufferSize, verifier)) - when: - for (List trace : traces) { - packer.format(trace, traceMapper) - } - then: - verifier.verifyTracesConsumed() - cleanup: - injectSysConfig(EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, "true") - ProcessTags.reset() - } - - def "test dictionary compressed traces written correctly"() { - setup: - List> traces = generateRandomTraces(traceCount, lowCardinality) - TraceMapperV0_5 traceMapper = new TraceMapperV0_5(dictionarySize) - PayloadVerifier verifier = new PayloadVerifier(traces, traceMapper) - MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(bufferSize, verifier)) - when: - boolean tracesFitInBuffer = true - for (List trace : traces) { - if (!packer.format(trace, traceMapper)) { - verifier.skipLargeTrace() - tracesFitInBuffer = false - } - } - packer.flush() - - then: - if (tracesFitInBuffer) { - verifier.verifyTracesConsumed() - } - - where: - bufferSize | dictionarySize | traceCount | lowCardinality - 10 << 10 | 10 << 10 | 0 | true - 10 << 10 | 10 << 10 | 1 | true - 10 << 10 | 10 << 10 | 10 | true - 10 << 10 | 10 << 10 | 100 | true - 10 << 10 | 100 << 10 | 1 | true - 10 << 10 | 100 << 10 | 10 | true - 10 << 10 | 100 << 10 | 100 | true - 10 << 10 | 10 << 10 | 0 | false - 10 << 10 | 10 << 10 | 1 | false - 10 << 10 | 10 << 10 | 10 | false - 10 << 10 | 10 << 10 | 100 | false - 10 << 10 | 100 << 10 | 1 | false - 10 << 10 | 100 << 10 | 10 | false - 10 << 10 | 100 << 10 | 100 | false - 100 << 10 | 10 << 10 | 0 | true - 100 << 10 | 10 << 10 | 1 | true - 100 << 10 | 10 << 10 | 10 | true - 100 << 10 | 10 << 10 | 100 | true - 100 << 10 | 100 << 10 | 1 | true - 100 << 10 | 100 << 10 | 10 | true - 100 << 10 | 100 << 10 | 100 | true - 100 << 10 | 10 << 10 | 0 | false - 100 << 10 | 10 << 10 | 1 | false - 100 << 10 | 10 << 10 | 10 | false - 100 << 10 | 10 << 10 | 100 | false - 100 << 10 | 100 << 10 | 1 | false - 100 << 10 | 100 << 10 | 10 | false - 100 << 10 | 100 << 10 | 100 | false - 100 << 10 | 100 << 10 | 1000 | false - } - - void 'test process tags serialization'() { - setup: - assertNotNull(ProcessTags.tagsForSerialization) - def spans = (1..2).collect { - new TraceGenerator.PojoSpan( - 'service', - 'operation', - 'resource', - DDTraceId.ONE, - it, - -1L, - 123L, - 456L, - 0, - [:], - [:], - 'type', - false, - 0, - 0, - 'origin') - } - - def traces = [spans] - TraceMapperV0_5 traceMapper = new TraceMapperV0_5() - PayloadVerifier verifier = new PayloadVerifier(traces, traceMapper) - MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(20 << 10, verifier)) - - when: - packer.format(spans, traceMapper) - packer.flush() - - then: - verifier.verifyTracesConsumed() - } - - private static final class PayloadVerifier implements ByteBufferConsumer, WritableByteChannel { - - private final List> expectedTraces - private final TraceMapperV0_5 mapper - private ByteBuffer captured - - private int position = 0 - - private PayloadVerifier(List> traces, TraceMapperV0_5 mapper) { - this (traces, mapper, 200 << 10) - } - - private PayloadVerifier(List> traces, TraceMapperV0_5 mapper, int size) { - this.expectedTraces = traces - this.mapper = mapper - this.captured = ByteBuffer.allocate(size) - } - - void skipLargeTrace() { - ++position - } - - @Override - void accept(int messageCount, ByteBuffer buffer) { - def processTagsCount = 0 - try { - Payload payload = mapper.newPayload().withBody(messageCount, buffer) - payload.writeTo(this) - captured.flip() - MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(captured) - int header = unpacker.unpackArrayHeader() - assertEquals(2, header) - int dictionarySize = unpacker.unpackArrayHeader() - String[] dictionary = new String[dictionarySize] - for (int i = 0; i < dictionary.length; ++i) { - dictionary[i] = unpacker.unpackString() - } - int traceCount = unpacker.unpackArrayHeader() - for (int i = 0; i < traceCount; ++i) { - List expectedTrace = expectedTraces.get(position++) - int spanCount = unpacker.unpackArrayHeader() - assertEquals(expectedTrace.size(), spanCount) - for (int k = 0; k < spanCount; ++k) { - TraceGenerator.PojoSpan expectedSpan = expectedTrace.get(k) - int elementCount = unpacker.unpackArrayHeader() - assertEquals(12, elementCount) - String serviceName = dictionary[unpacker.unpackInt()] - assertEqualsWithNullAsEmpty(expectedSpan.getServiceName(), serviceName) - String operationName = dictionary[unpacker.unpackInt()] - assertEqualsWithNullAsEmpty(expectedSpan.getOperationName(), operationName) - String resourceName = dictionary[unpacker.unpackInt()] - assertEqualsWithNullAsEmpty(expectedSpan.getResourceName(), resourceName) - long traceId = unpacker.unpackValue().asNumberValue().toLong() - assertEquals(expectedSpan.getTraceId().toLong(), traceId) - long spanId = unpacker.unpackValue().asNumberValue().toLong() - assertEquals(expectedSpan.getSpanId(), spanId) - long parentId = unpacker.unpackValue().asNumberValue().toLong() - assertEquals(expectedSpan.getParentId(), parentId) - long startTime = unpacker.unpackLong() - assertEquals(expectedSpan.getStartTime(), startTime) - long duration = unpacker.unpackLong() - assertEquals(expectedSpan.getDurationNano(), duration) - int error = unpacker.unpackInt() - assertEquals(expectedSpan.getError(), error) - int metaSize = unpacker.unpackMapHeader() - HashMap meta = new HashMap<>() - for (int j = 0; j < metaSize; ++j) { - meta.put(dictionary[unpacker.unpackInt()], dictionary[unpacker.unpackInt()]) - } - for (Map.Entry entry : meta.entrySet()) { - if (Tags.HTTP_STATUS.equals(entry.getKey())) { - assertEquals(String.valueOf(expectedSpan.getHttpStatusCode()), entry.getValue()) - } else if(DDTags.ORIGIN_KEY.equals(entry.getKey())) { - assertEquals(expectedSpan.getOrigin(), entry.getValue()) - } else if (DDTags.PROCESS_TAGS.equals(entry.getKey())) { - processTagsCount++ - assertTrue(Config.get().isExperimentalPropagateProcessTagsEnabled()) - assertEquals(0, k) - assertEquals(ProcessTags.tagsForSerialization.toString(), entry.getValue()) - } else { - Object tag = expectedSpan.getTag(entry.getKey()) - if (null != tag) { - assertEquals(String.valueOf(tag), entry.getValue()) - } else { - assertEquals(expectedSpan.getBaggage().get(entry.getKey()), entry.getValue()) - } - } - } - int metricsSize = unpacker.unpackMapHeader() - HashMap metrics = new HashMap<>() - for (int j = 0; j < metricsSize; ++j) { - String key = dictionary[unpacker.unpackInt()] - Number n = null - MessageFormat format = unpacker.getNextFormat() - switch (format) { - case NEGFIXINT: - case POSFIXINT: - case INT8: - case UINT8: - case INT16: - case UINT16: - case INT32: - case UINT32: - n = unpacker.unpackInt() - break - case INT64: - case UINT64: - n = unpacker.unpackLong() - break - case FLOAT32: - n = unpacker.unpackFloat() - break - case FLOAT64: - n = unpacker.unpackDouble() - break - default: - Assert.fail("Unexpected type in metrics values: " + format + " for key " + key) - } - if (DD_MEASURED.toString() == key) { - assert ((n == 1) && expectedSpan.isMeasured()) || !expectedSpan.isMeasured() - } else if (DDSpanContext.PRIORITY_SAMPLING_KEY == key) { - //check that priority sampling is only on first and last span - if (k == 0 || k == spanCount -1) { - assertEquals(expectedSpan.samplingPriority(), n.intValue()) - } else { - assertFalse(expectedSpan.hasSamplingPriority()) - } - } else { - metrics.put(key, n) - } - } - for (Map.Entry metric : metrics.entrySet()) { - if (metric.getValue() instanceof Double || metric.getValue() instanceof Float) { - assertEquals(((Number)expectedSpan.getTag(metric.getKey())).doubleValue(), metric.getValue().doubleValue(), 0.001, metric.getKey()) - } else { - assertEquals(expectedSpan.getTag(metric.getKey()), metric.getValue(), metric.getKey()) - } - } - String type = dictionary[unpacker.unpackInt()] - assertEquals(expectedSpan.getType(), type) - } - } - } catch (IOException e) { - Assert.fail(e.getMessage()) - } finally { - assert processTagsCount == (Config.get().isExperimentalPropagateProcessTagsEnabled() ? 1 : 0) - mapper.reset() - captured.position(0) - captured.limit(captured.capacity()) - } - } - - @Override - int write(ByteBuffer src) { - if (captured.remaining() < src.remaining()) { - ByteBuffer newBuffer = ByteBuffer.allocate(captured.capacity() + src.remaining()) - captured.flip() - newBuffer.put(captured) - captured = newBuffer - return write(src) - } - captured.put(src) - return src.position() - } - - void verifyTracesConsumed() { - assertEquals(expectedTraces.size(), position) - } - - @Override - boolean isOpen() { - return true - } - - @Override - void close() { - } - } - - private static void assertEqualsWithNullAsEmpty(CharSequence expected, CharSequence actual) { - if (null == expected) { - assertEquals("", actual) - } else { - assertEquals(expected.toString(), actual.toString()) - } - } - - static int calculateSize(List trace) { - AtomicInteger size = new AtomicInteger() - def packer = new MsgPackWriter(new FlushingBuffer(1024, new ByteBufferConsumer() { - @Override - void accept(int messageCount, ByteBuffer buffer) { - size.set(buffer.limit() - buffer.position()) - } - })) - packer.format(trace, new TraceMapperV0_5(1024)) - packer.flush() - return size.get() - } -} diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/ddagent/TraceMapperV1PayloadTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/ddagent/TraceMapperV1PayloadTest.groovy deleted file mode 100644 index b9975dd3038..00000000000 --- a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/ddagent/TraceMapperV1PayloadTest.groovy +++ /dev/null @@ -1,1209 +0,0 @@ -package datadog.trace.common.writer.ddagent - -import static datadog.trace.common.writer.TraceGenerator.generateRandomTraces -import static datadog.trace.common.writer.ddagent.V1PayloadReader.readAttributes -import static datadog.trace.common.writer.ddagent.V1PayloadReader.readFirstSpan -import static datadog.trace.common.writer.ddagent.V1PayloadReader.readStreamingString -import static datadog.trace.common.writer.ddagent.V1PayloadReader.skipChunkField -import static datadog.trace.common.writer.ddagent.V1PayloadReader.skipPayloadField -import static datadog.trace.common.writer.ddagent.V1PayloadReader.skipSpanField -import static datadog.trace.common.writer.ddagent.V1PayloadReader.unpackUnsignedLong -import static org.junit.jupiter.api.Assertions.assertArrayEquals -import static org.junit.jupiter.api.Assertions.assertEquals -import static org.junit.jupiter.api.Assertions.assertNotNull -import static org.junit.jupiter.api.Assertions.assertTrue - -import datadog.communication.serialization.ByteBufferConsumer -import datadog.communication.serialization.FlushingBuffer -import datadog.communication.serialization.msgpack.MsgPackWriter -import datadog.trace.api.DDTags -import datadog.trace.api.DDTraceId -import datadog.trace.api.DDSpanId -import datadog.trace.api.ProcessTags -import datadog.trace.api.sampling.PrioritySampling -import datadog.trace.api.sampling.SamplingMechanism -import datadog.trace.bootstrap.instrumentation.api.InstrumentationTags -import datadog.trace.bootstrap.instrumentation.api.SpanAttributes -import datadog.trace.bootstrap.instrumentation.api.SpanLink -import datadog.trace.bootstrap.instrumentation.api.Tags -import datadog.trace.common.writer.Payload -import datadog.trace.common.writer.TraceGenerator -import datadog.trace.core.MetadataConsumer -import datadog.trace.test.util.DDSpecification -import java.nio.ByteBuffer -import java.nio.channels.WritableByteChannel -import org.junit.jupiter.api.Assertions -import org.msgpack.core.MessageFormat -import org.msgpack.core.MessagePack -import org.msgpack.core.MessageUnpacker - -class TraceMapperV1PayloadTest extends DDSpecification { - - def "test traces written correctly"() { - setup: - List> traces = generateRandomTraces(traceCount, lowCardinality) - TraceMapperV1 traceMapper = new TraceMapperV1() - PayloadVerifier verifier = new PayloadVerifier(traces, traceMapper) - MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(bufferSize, verifier)) - - when: - boolean tracesFitInBuffer = true - for (List trace : traces) { - if (!packer.format(trace, traceMapper)) { - verifier.skipLargeTrace() - tracesFitInBuffer = false - traceMapper.reset() - } - } - packer.flush() - - then: - if (tracesFitInBuffer) { - verifier.verifyTracesConsumed() - } - - where: - bufferSize | traceCount | lowCardinality - 20 << 10 | 0 | true - 20 << 10 | 1 | true - 30 << 10 | 2 | true - 20 << 10 | 0 | false - 20 << 10 | 1 | false - 30 << 10 | 2 | false - 100 << 10 | 10 | true - 100 << 10 | 100 | false - } - - def "test endpoint returns v1.0"() { - expect: - new TraceMapperV1().endpoint() == "v1.0" - } - - def "test span kind value conversion"() { - expect: - TraceMapperV1.getSpanKindValue(null) == TraceMapperV1.SPAN_KIND_UNSPECIFIED - TraceMapperV1.getSpanKindValue(Tags.SPAN_KIND_INTERNAL) == TraceMapperV1.SPAN_KIND_INTERNAL - TraceMapperV1.getSpanKindValue(Tags.SPAN_KIND_SERVER) == TraceMapperV1.SPAN_KIND_SERVER - TraceMapperV1.getSpanKindValue(Tags.SPAN_KIND_CLIENT) == TraceMapperV1.SPAN_KIND_CLIENT - TraceMapperV1.getSpanKindValue(Tags.SPAN_KIND_PRODUCER) == TraceMapperV1.SPAN_KIND_PRODUCER - TraceMapperV1.getSpanKindValue(Tags.SPAN_KIND_CONSUMER) == TraceMapperV1.SPAN_KIND_CONSUMER - TraceMapperV1.getSpanKindValue("unknown") == TraceMapperV1.SPAN_KIND_INTERNAL - } - - def "test payload contains expected header and chunk fields"() { - setup: - Map tags = [ - (Tags.ENV): "prod", - (Tags.VERSION): "1.2.3", - (Tags.COMPONENT): "http-client", - (Tags.SPAN_KIND): Tags.SPAN_KIND_CLIENT, - "attr.string": "value", - "attr.bool" : true, - "attr.number": 12.5d, - "_dd.p.dm" : "-3" - ] - def span = new TraceGenerator.PojoSpan( - "service-a", - "operation-a", - "resource-a", - DDTraceId.ONE, - 123L, - 0L, - 1000L, - 2000L, - 1, - [:], - tags, - "web", - false, - PrioritySampling.SAMPLER_KEEP, - 200, - "rum") - - TraceMapperV1 mapper = new TraceMapperV1() - byte[] encoded = serializeMappedPayload(mapper, [[span]]) - MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(encoded) - List stringTable = new ArrayList<>() - stringTable.add("") - - when: - int payloadFieldCount = unpacker.unpackMapHeader() - Set payloadFieldsSeen = new HashSet<>() - int chunkCount = -1 - Map payloadAttributes = null - - for (int i = 0; i < payloadFieldCount; i++) { - int fieldId = unpacker.unpackInt() - payloadFieldsSeen.add(fieldId) - switch (fieldId) { - case 2: - case 3: - case 4: - case 5: - case 6: - case 7: - case 8: - case 9: - readStreamingString(unpacker, stringTable) - break - case 10: - payloadAttributes = readAttributes(unpacker, stringTable) - break - case 11: - chunkCount = unpacker.unpackArrayHeader() - assertEquals(1, chunkCount) - verifyChunk(unpacker, [span], stringTable) - break - default: - Assertions.fail("Unexpected payload field id: " + fieldId) - } - } - - then: - assertEquals(10, payloadFieldCount) - assertEquals((2..11).toSet(), payloadFieldsSeen) - assertEquals(1, chunkCount) - assertNotNull(payloadAttributes) - if (ProcessTags.tagsForSerialization == null) { - assertEquals(0, payloadAttributes.size()) - } else { - assertEquals(1, payloadAttributes.size()) - assertEquals(ProcessTags.tagsForSerialization.toString(), payloadAttributes.get(DDTags.PROCESS_TAGS)) - } - } - - def "test sampling mechanism normalization from _dd.p.dm"() { - setup: - def span = new TraceGenerator.PojoSpan( - "service-a", - "operation-a", - "resource-a", - DDTraceId.ONE, - 321L, - 0L, - 1000L, - 2000L, - 0, - [:], - decisionMakerTag == null ? [:] : ["_dd.p.dm": decisionMakerTag], - "custom", - false, - PrioritySampling.SAMPLER_KEEP, - 200, - null) - - TraceMapperV1 mapper = new TraceMapperV1() - byte[] encoded = serializeMappedPayload(mapper, [[span]]) - MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(encoded) - List stringTable = new ArrayList<>() - stringTable.add("") - - when: - unpacker.unpackMapHeader() - int samplingMechanism = -1 - - for (int i = 0; i < 10; i++) { - int payloadFieldId = unpacker.unpackInt() - if (payloadFieldId == 11) { - int chunkCount = unpacker.unpackArrayHeader() - assertEquals(1, chunkCount) - int chunkFieldCount = unpacker.unpackMapHeader() - for (int j = 0; j < chunkFieldCount; j++) { - int chunkFieldId = unpacker.unpackInt() - if (chunkFieldId == 7) { - samplingMechanism = unpacker.unpackInt() - } else { - skipChunkField(unpacker, chunkFieldId, stringTable) - } - } - } else { - skipPayloadField(unpacker, payloadFieldId, stringTable) - } - } - - then: - assertEquals(expectedSamplingMechanism, samplingMechanism) - - where: - decisionMakerTag | expectedSamplingMechanism - null | SamplingMechanism.DEFAULT - "-3" | 3 - "934086a686-7" | 7 - "invalid" | SamplingMechanism.DEFAULT - } - - def "test span ids are encoded as unsigned values in v1 payloads"() { - setup: - long spanId = Long.MIN_VALUE + 123L - long parentId = Long.MIN_VALUE + 456L - def span = new TraceGenerator.PojoSpan( - "service-a", - "operation-a", - "resource-a", - DDTraceId.ONE, - spanId, - parentId, - 1000L, - 2000L, - 0, - [:], - [:], - "web", - false, - PrioritySampling.SAMPLER_KEEP, - 200, - null) - - TraceMapperV1 mapper = new TraceMapperV1() - byte[] encoded = serializeMappedPayload(mapper, [[span]]) - MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(encoded) - List stringTable = new ArrayList<>() - stringTable.add("") - - when: - unpacker.unpackMapHeader() - Long actualSpanId = null - Long actualParentId = null - - for (int i = 0; i < 10; i++) { - int payloadFieldId = unpacker.unpackInt() - if (payloadFieldId == 11) { - int chunkCount = unpacker.unpackArrayHeader() - assertEquals(1, chunkCount) - int chunkFieldCount = unpacker.unpackMapHeader() - for (int j = 0; j < chunkFieldCount; j++) { - int chunkFieldId = unpacker.unpackInt() - if (chunkFieldId == 4) { - int spanCount = unpacker.unpackArrayHeader() - assertEquals(1, spanCount) - int spanFieldCount = unpacker.unpackMapHeader() - for (int k = 0; k < spanFieldCount; k++) { - int spanFieldId = unpacker.unpackInt() - switch (spanFieldId) { - case 4: - assertEquals(MessageFormat.UINT64, unpacker.nextFormat) - actualSpanId = DDSpanId.from("${unpacker.unpackBigInteger()}") - break - case 5: - assertEquals(MessageFormat.UINT64, unpacker.nextFormat) - actualParentId = DDSpanId.from("${unpacker.unpackBigInteger()}") - break - default: - skipSpanField(unpacker, spanFieldId, stringTable) - } - } - } else { - skipChunkField(unpacker, chunkFieldId, stringTable) - } - } - } else { - skipPayloadField(unpacker, payloadFieldId, stringTable) - } - } - - then: - assertEquals(spanId, actualSpanId) - assertEquals(parentId, actualParentId) - } - - def "test span links are encoded from structured span links"() { - setup: - List spanLinks = [ - new SpanLink( - DDTraceId.fromHex("11223344556677889900aabbccddeeff"), - DDSpanId.fromHex("000000000000002a"), - (byte) 1, - "dd=s:1", - SpanAttributes.fromMap(["link.kind": "follows_from", "context_headers": "tracecontext"])), - new SpanLink( - DDTraceId.fromHex("00000000000000000000000000000001"), - DDSpanId.fromHex("0000000000000002"), - (byte) 0, - "", - SpanAttributes.EMPTY) - ] - def span = new TraceGenerator.PojoSpan( - "service-a", - "operation-a", - "resource-a", - DDTraceId.ONE, - 123L, - 0L, - 1000L, - 2000L, - 0, - [:], - [:], - "web", - false, - PrioritySampling.SAMPLER_KEEP, - 200, - null, - spanLinks) - - TraceMapperV1 mapper = new TraceMapperV1() - byte[] encoded = serializeMappedPayload(mapper, [[span]]) - MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(encoded) - List stringTable = new ArrayList<>() - stringTable.add("") - - when: - List> links = readFirstSpan(unpacker, stringTable).links - - then: - assertEquals(2, links.size()) - assertArrayEquals(traceIdBytes(DDTraceId.fromHex("11223344556677889900aabbccddeeff")), links[0].traceId as byte[]) - assertEquals(DDSpanId.fromHex("000000000000002a"), links[0].spanId) - assertEquals("dd=s:1", links[0].traceState) - assertEquals(1L, links[0].traceFlags) - assertEquals(["link.kind": "follows_from", "context_headers": "tracecontext"], links[0].attributes) - - assertArrayEquals(traceIdBytes(DDTraceId.fromHex("00000000000000000000000000000001")), links[1].traceId as byte[]) - assertEquals(DDSpanId.fromHex("0000000000000002"), links[1].spanId) - assertEquals("", links[1].traceState) - assertEquals(0L, links[1].traceFlags) - assertEquals([:], links[1].attributes) - } - - def "test first span tags are processed once"() { - setup: - def firstSpan = new CountingPojoSpan( - "service-a", - "operation-a", - "resource-a", - DDTraceId.ONE, - 123L, - 0L, - 1000L, - 2000L, - 0, - [:], - [(Tags.HTTP_URL): "http://localhost:7777/"], - "web", - false, - PrioritySampling.SAMPLER_KEEP, - 200, - null) - - def secondSpan = new CountingPojoSpan( - "service-a", - "operation-b", - "resource-b", - DDTraceId.ONE, - 456L, - 123L, - 1000L, - 2000L, - 0, - [:], - [(Tags.HTTP_URL): "http://localhost:7777/"], - "web", - false, - PrioritySampling.SAMPLER_KEEP, - 200, - null) - - TraceMapperV1 mapper = new TraceMapperV1() - - when: - serializeMappedPayload(mapper, [[firstSpan, secondSpan]]) - - then: - assertEquals(1, firstSpan.processTagsAndBaggageCount) - assertEquals(1, secondSpan.processTagsAndBaggageCount) - } - - def "test missing span links encode empty links"() { - setup: - def span = new TraceGenerator.PojoSpan( - "service-a", - "operation-a", - "resource-a", - DDTraceId.ONE, - 123L, - 0L, - 1000L, - 2000L, - 0, - [:], - [:], - "web", - false, - PrioritySampling.SAMPLER_KEEP, - 200, - null) - - TraceMapperV1 mapper = new TraceMapperV1() - byte[] encoded = serializeMappedPayload(mapper, [[span]]) - MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(encoded) - List stringTable = new ArrayList<>() - stringTable.add("") - - when: - List> links = readFirstSpan(unpacker, stringTable).links - - then: - assertTrue(links.isEmpty()) - } - - def "test span events are encoded from events tag"() { - setup: - List> eventPayload = [ - [ - time_unix_nano: 1234567890L, - name : "event.one", - attributes : [ - str : "v", - int : 42L, - double: 12.5d, - bool : true, - arr : ["x", 7L, 2.5d, false] - ] - ], - [ - time_unix_nano: 1234567891L, - name : "event.two" - ] - ] - def span = new TraceGenerator.PojoSpan( - "service-a", - "operation-a", - "resource-a", - DDTraceId.ONE, - 123L, - 0L, - 1000L, - 2000L, - 0, - [:], - ["events": eventPayload], - "web", - false, - PrioritySampling.SAMPLER_KEEP, - 200, - null) - - TraceMapperV1 mapper = new TraceMapperV1() - byte[] encoded = serializeMappedPayload(mapper, [[span]]) - MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(encoded) - List stringTable = new ArrayList<>() - stringTable.add("") - - when: - List> events = readFirstSpan(unpacker, stringTable).events - - then: - assertEquals(2, events.size()) - assertEquals(1234567890L, events[0].timeUnixNano) - assertEquals("event.one", events[0].name) - assertEquals("v", events[0].attributes["str"]) - assertEquals(42L, events[0].attributes["int"]) - assertEquals(12.5d, (events[0].attributes["double"] as Number).doubleValue(), 0.000001d) - assertEquals(true, events[0].attributes["bool"]) - assertEquals(["x", 7L, 2.5d, false], events[0].attributes["arr"]) - - assertEquals(1234567891L, events[1].timeUnixNano) - assertEquals("event.two", events[1].name) - assertEquals([:], events[1].attributes) - } - - def "test malformed span events fall back to empty events"() { - setup: - def span = new TraceGenerator.PojoSpan( - "service-a", - "operation-a", - "resource-a", - DDTraceId.ONE, - 123L, - 0L, - 1000L, - 2000L, - 0, - [:], - ["events": [foo: "bar"]], - "web", - false, - PrioritySampling.SAMPLER_KEEP, - 200, - null) - - TraceMapperV1 mapper = new TraceMapperV1() - byte[] encoded = serializeMappedPayload(mapper, [[span]]) - MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(encoded) - List stringTable = new ArrayList<>() - stringTable.add("") - - when: - List> events = readFirstSpan(unpacker, stringTable).events - - then: - assertTrue(events.isEmpty()) - } - - def "test meta struct is encoded as bytes attribute"() { - setup: - def span = new TraceGenerator.PojoSpan( - "service-a", - "operation-a", - "resource-a", - DDTraceId.ONE, - 123L, - 0L, - 1000L, - 2000L, - 0, - [:], - [:], - "web", - false, - PrioritySampling.SAMPLER_KEEP, - 200, - null) - span.setMetaStruct("meta_key", [foo: "bar", answer: 42L]) - - TraceMapperV1 mapper = new TraceMapperV1() - byte[] encoded = serializeMappedPayload(mapper, [[span]]) - MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(encoded) - List stringTable = new ArrayList<>() - stringTable.add("") - - when: - Map attributes = readFirstSpan(unpacker, stringTable).attributes - byte[] metaStructBytes = attributes["meta_key"] as byte[] - MessageUnpacker metaStructUnpacker = MessagePack.newDefaultUnpacker(metaStructBytes) - int metaStructFieldCount = metaStructUnpacker.unpackMapHeader() - Map decodedMetaStruct = [:] - for (int i = 0; i < metaStructFieldCount; i++) { - String key = metaStructUnpacker.unpackString() - switch (metaStructUnpacker.getNextFormat().getValueType()) { - case org.msgpack.value.ValueType.INTEGER: - decodedMetaStruct[key] = metaStructUnpacker.unpackLong() - break - case org.msgpack.value.ValueType.STRING: - decodedMetaStruct[key] = metaStructUnpacker.unpackString() - break - default: - Assertions.fail("Unexpected meta_struct value type for key " + key) - } - } - - then: - assertNotNull(metaStructBytes) - assertEquals("bar", decodedMetaStruct["foo"]) - assertEquals(42L, decodedMetaStruct["answer"]) - } - - def "test map-valued span tags are flattened in v1 attributes"() { - setup: - def span = new TraceGenerator.PojoSpan( - "service-a", - "operation-a", - "resource-a", - DDTraceId.ONE, - 123L, - 0L, - 1000L, - 2000L, - 0, - [:], - [ - "usr": [ - "id" : "123", - "name" : "alice", - "authenticated": true, - "profile" : [ - "age": 30L - ] - ], - "appsec.events.users.login.success": [ - "metadata0": [ - "event" : "login", - "attempts": 1L - ], - "metadata1": [ - "blocked": false - ] - ] - ], - "web", - false, - PrioritySampling.SAMPLER_KEEP, - 0, - null) - - TraceMapperV1 mapper = new TraceMapperV1() - byte[] encoded = serializeMappedPayload(mapper, [[span]]) - MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(encoded) - List stringTable = new ArrayList<>() - stringTable.add("") - - when: - Map attributes = readFirstSpan(unpacker, stringTable).attributes - - then: - assertTrue(attributes.containsKey("usr.id")) - assertTrue(attributes.containsKey("usr.name")) - assertTrue(attributes.containsKey("usr.authenticated")) - assertTrue(attributes.containsKey("usr.profile.age")) - assertTrue(attributes.containsKey("appsec.events.users.login.success.metadata0.event")) - assertTrue(attributes.containsKey("appsec.events.users.login.success.metadata0.attempts")) - assertTrue(attributes.containsKey("appsec.events.users.login.success.metadata1.blocked")) - - assertEquals("123", attributes.get("usr.id")) - assertEquals("alice", attributes.get("usr.name")) - assertEquals(true, attributes.get("usr.authenticated")) - assertEquals(30d, (attributes.get("usr.profile.age") as Number).doubleValue(), 0.000001d) - assertEquals("login", attributes.get("appsec.events.users.login.success.metadata0.event")) - assertEquals(1d, (attributes.get("appsec.events.users.login.success.metadata0.attempts") as Number).doubleValue(), 0.000001d) - assertEquals(false, attributes.get("appsec.events.users.login.success.metadata1.blocked")) - - assertTrue(!attributes.containsKey("usr")) - assertTrue(!attributes.containsKey("appsec.events.users.login.success")) - } - - def "test primitive span tags are encoded in v1 attributes"() { - setup: - def span = new TraceGenerator.PojoSpan( - "service-a", - "operation-a", - "resource-a", - DDTraceId.ONE, - 123L, - 0L, - 1000L, - 2000L, - 0, - [:], - [ - "tag.bool" : true, - "tag.int" : 7, - "tag.long" : 9L, - "tag.float" : 3.5f, - "tag.double": 4.25d - ], - "web", - false, - PrioritySampling.SAMPLER_KEEP, - 0, - null) - - TraceMapperV1 mapper = new TraceMapperV1() - byte[] encoded = serializeMappedPayload(mapper, [[span]]) - MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(encoded) - List stringTable = new ArrayList<>() - stringTable.add("") - - when: - Map attributes = readFirstSpan(unpacker, stringTable).attributes - - then: - assertEquals(true, attributes.get("tag.bool")) - assertEquals(7d, (attributes.get("tag.int") as Number).doubleValue(), 0.000001d) - assertEquals(9d, (attributes.get("tag.long") as Number).doubleValue(), 0.000001d) - assertEquals(3.5d, (attributes.get("tag.float") as Number).doubleValue(), 0.000001d) - assertEquals(4.25d, (attributes.get("tag.double") as Number).doubleValue(), 0.000001d) - } - - def "test thread metadata is encoded in v1 attributes"() { - setup: - def span = new TraceGenerator.PojoSpan( - "service-a", - "operation-a", - "resource-a", - DDTraceId.ONE, - 123L, - 0L, - 1000L, - 2000L, - 0, - [:], - [:], - "web", - false, - PrioritySampling.SAMPLER_KEEP, - 0, - null) - - TraceMapperV1 mapper = new TraceMapperV1() - byte[] encoded = serializeMappedPayload(mapper, [[span]]) - MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(encoded) - List stringTable = new ArrayList<>() - stringTable.add("") - - when: - Map attributes = readFirstSpan(unpacker, stringTable).attributes - - then: - assertAttributeValueEquals(span.getTag(DDTags.THREAD_ID), attributes.get(DDTags.THREAD_ID), DDTags.THREAD_ID) - assertEquals(span.getTag(DDTags.THREAD_NAME).toString(), attributes.get(DDTags.THREAD_NAME)) - } - - private static final class PayloadVerifier implements ByteBufferConsumer, WritableByteChannel { - - private final List> expectedTraces - private final TraceMapperV1 mapper - private ByteBuffer captured = ByteBuffer.allocate(200 << 10) - private int position = 0 - - private PayloadVerifier(List> expectedTraces, TraceMapperV1 mapper) { - this.expectedTraces = expectedTraces - this.mapper = mapper - } - - void skipLargeTrace() { - ++position - } - - @Override - void accept(int messageCount, ByteBuffer buffer) { - if (expectedTraces.isEmpty() && messageCount == 0) { - return - } - try { - Payload payload = mapper.newPayload().withBody(messageCount, buffer) - payload.writeTo(this) - captured.flip() - - MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(captured) - if (messageCount == 0) { - assertEquals(0, unpacker.unpackMapHeader()) - return - } - - List stringTable = new ArrayList<>() - stringTable.add("") - - int payloadFieldCount = unpacker.unpackMapHeader() - assertEquals(10, payloadFieldCount) - - boolean seenChunks = false - for (int i = 0; i < payloadFieldCount; i++) { - int fieldId = unpacker.unpackInt() - if (fieldId == 11) { - int traceCount = unpacker.unpackArrayHeader() - assertEquals(messageCount, traceCount) - seenChunks = true - for (int traceIndex = 0; traceIndex < traceCount; traceIndex++) { - List expectedTrace = expectedTraces.get(position++) - verifyChunk(unpacker, expectedTrace, stringTable) - } - } else { - skipPayloadField(unpacker, fieldId, stringTable) - } - } - - assertTrue(seenChunks) - } catch (IOException e) { - Assertions.fail(e.getMessage()) - } finally { - mapper.reset() - captured.position(0) - captured.limit(captured.capacity()) - } - } - - @Override - int write(ByteBuffer src) { - if (captured.remaining() < src.remaining()) { - ByteBuffer newBuffer = ByteBuffer.allocate(captured.capacity() + src.remaining()) - captured.flip() - newBuffer.put(captured) - captured = newBuffer - return write(src) - } - captured.put(src) - return src.position() - } - - void verifyTracesConsumed() { - assertEquals(expectedTraces.size(), position) - } - - @Override - boolean isOpen() { - return true - } - - @Override - void close() { - } - } - - private static void verifyChunk( - MessageUnpacker unpacker, - List expectedTrace, - List stringTable) { - int chunkFieldCount = unpacker.unpackMapHeader() - assertEquals(6, chunkFieldCount) - - Integer priority = null - String origin = null - Map chunkAttributes = null - byte[] traceId = null - Integer samplingMechanism = null - List decodedSpans = null - - for (int i = 0; i < chunkFieldCount; i++) { - int fieldId = unpacker.unpackInt() - switch (fieldId) { - case 1: - priority = unpacker.unpackInt() - break - case 2: - origin = readStreamingString(unpacker, stringTable) - break - case 3: - chunkAttributes = readAttributes(unpacker, stringTable) - break - case 4: - decodedSpans = verifySpans(unpacker, expectedTrace, stringTable) - break - case 6: - int traceIdLen = unpacker.unpackBinaryHeader() - traceId = new byte[traceIdLen] - unpacker.readPayload(traceId) - break - case 7: - samplingMechanism = unpacker.unpackInt() - break - default: - Assertions.fail("Unexpected chunk field id: " + fieldId) - } - } - - assertNotNull(priority) - assertNotNull(origin) - assertNotNull(chunkAttributes) - assertNotNull(decodedSpans) - assertNotNull(traceId) - assertNotNull(samplingMechanism) - - TraceGenerator.PojoSpan firstSpan = expectedTrace.get(0) - assertEquals(firstSpan.samplingPriority(), priority) - assertEqualsWithNullAsEmpty(firstSpan.getOrigin(), origin) - assertEquals(1, chunkAttributes.size()) - assertEqualsWithNullAsEmpty(firstSpan.getLocalRootSpan().getServiceName(), chunkAttributes.get("service")) - assertArrayEquals(traceIdBytes(firstSpan.getTraceId()), traceId) - assertEquals(expectedSamplingMechanism(firstSpan.getTags()), samplingMechanism) - } - - private static byte[] traceIdBytes(DDTraceId traceId) { - ByteBuffer.allocate(16) - .putLong(traceId.toHighOrderLong()) - .putLong(traceId.toLong()) - .array() - } - - private static List verifySpans( - MessageUnpacker unpacker, - List expectedTrace, - List stringTable) { - int spanCount = unpacker.unpackArrayHeader() - assertEquals(expectedTrace.size(), spanCount) - - for (int i = 0; i < spanCount; i++) { - verifySpan(unpacker, expectedTrace.get(i), stringTable) - } - return expectedTrace - } - - private static void verifySpan( - MessageUnpacker unpacker, - TraceGenerator.PojoSpan expectedSpan, - List stringTable) { - int spanFieldCount = unpacker.unpackMapHeader() - assertEquals(16, spanFieldCount) - - String service = null - String name = null - String resource = null - Long spanId = null - Long parentId = null - Long start = null - Long duration = null - Boolean error = null - Map attributes = null - String type = null - int linksCount = -1 - int eventsCount = -1 - String env = null - String version = null - String component = null - Integer spanKind = null - - for (int i = 0; i < spanFieldCount; i++) { - int fieldId = unpacker.unpackInt() - switch (fieldId) { - case 1: - service = readStreamingString(unpacker, stringTable) - break - case 2: - name = readStreamingString(unpacker, stringTable) - break - case 3: - resource = readStreamingString(unpacker, stringTable) - break - case 4: - spanId = unpackUnsignedLong(unpacker) - break - case 5: - parentId = unpackUnsignedLong(unpacker) - break - case 6: - start = unpacker.unpackLong() - break - case 7: - duration = unpacker.unpackLong() - break - case 8: - error = unpacker.unpackBoolean() - break - case 9: - attributes = readAttributes(unpacker, stringTable) - break - case 10: - type = readStreamingString(unpacker, stringTable) - break - case 11: - linksCount = unpacker.unpackArrayHeader() - break - case 12: - eventsCount = unpacker.unpackArrayHeader() - break - case 13: - env = readStreamingString(unpacker, stringTable) - break - case 14: - version = readStreamingString(unpacker, stringTable) - break - case 15: - component = readStreamingString(unpacker, stringTable) - break - case 16: - spanKind = unpacker.unpackInt() - break - default: - Assertions.fail("Unexpected span field id: " + fieldId) - } - } - - assertEqualsWithNullAsEmpty(expectedSpan.getServiceName(), service) - assertEqualsWithNullAsEmpty(expectedSpan.getOperationName(), name) - assertEqualsWithNullAsEmpty(expectedSpan.getResourceName(), resource) - assertEquals(expectedSpan.getSpanId(), spanId) - assertEquals(expectedSpan.getParentId(), parentId) - assertEquals(expectedSpan.getStartTime(), start) - assertEquals(expectedSpan.getDurationNano(), duration) - assertEquals(expectedSpan.getError() != 0, error) - assertEqualsWithNullAsEmpty(expectedSpan.getType(), type) - assertEquals(0, linksCount) - assertEquals(0, eventsCount) - assertEqualsWithNullAsEmpty(expectedSpan.getTag(Tags.ENV), env) - assertEqualsWithNullAsEmpty(expectedSpan.getTag(Tags.VERSION), version) - assertEqualsWithNullAsEmpty(expectedSpan.getTag(Tags.COMPONENT), component) - assertEquals(TraceMapperV1.getSpanKindValue(expectedSpan.getTag(Tags.SPAN_KIND)), spanKind) - - assertNotNull(attributes) - int expectedHttpStatusCode = expectedSpan.getHttpStatusCode() - boolean shouldContainHttpStatus = expectedHttpStatusCode != 0 && !expectedSpan.getTags().containsKey("http.status_code") - Map expectedAttributes = [:] - for (Map.Entry entry : expectedSpan.getBaggage().entrySet()) { - expectedAttributes.put(entry.getKey(), entry.getValue()) - } - expectedAttributes.put(DDTags.THREAD_ID, expectedSpan.getTag(DDTags.THREAD_ID)) - expectedAttributes.put(DDTags.THREAD_NAME, expectedSpan.getTag(DDTags.THREAD_NAME)) - for (Map.Entry entry : expectedSpan.getTags().entrySet()) { - if (DDTags.SPAN_EVENTS == entry.getKey()) { - continue - } - addFlattenedExpectedAttribute(expectedAttributes, entry.getKey(), entry.getValue()) - } - if (shouldContainHttpStatus) { - expectedAttributes.put("http.status_code", Integer.toString(expectedHttpStatusCode)) - } - if (expectedSpan.isTopLevel()) { - expectedAttributes.put(InstrumentationTags.DD_TOP_LEVEL.toString(), 1d) - } - - assertEquals(expectedAttributes.size(), attributes.size()) - for (Map.Entry entry : expectedAttributes.entrySet()) { - String key = entry.getKey() - Object expectedValue = entry.getValue() - assertTrue(attributes.containsKey(key), "Missing attribute key: $key") - assertAttributeValueEquals(expectedValue, attributes.get(key), key) - } - } - - private static void assertAttributeValueEquals(Object expected, Object actual, String key) { - if (expected instanceof Number) { - assertTrue(actual instanceof Number, "Attribute $key should be numeric") - double expectedValue = ((Number) expected).doubleValue() - double actualValue = ((Number) actual).doubleValue() - double delta = Math.max(0.000001d, Math.abs(expectedValue) * 0.000000000001d) - assertEquals(expectedValue, actualValue, delta, "Numeric mismatch for $key") - } else if (expected instanceof Boolean) { - assertEquals(expected, actual, "Boolean mismatch for $key") - } else { - assertEquals(String.valueOf(expected), String.valueOf(actual), "String mismatch for $key") - } - } - - private static void addFlattenedExpectedAttribute( - Map expectedAttributes, - String key, - Object value) { - if (!(value instanceof Map)) { - expectedAttributes.put(key, value) - return - } - for (Map.Entry entry : ((Map) value).entrySet()) { - addFlattenedExpectedAttribute( - expectedAttributes, - key + "." + String.valueOf(entry.getKey()), - entry.getValue()) - } - } - - private static int expectedSamplingMechanism(Map tags) { - Object decisionMakerRaw = tags.get("_dd.p.dm") - if (decisionMakerRaw == null) { - return SamplingMechanism.DEFAULT - } - - String decisionMaker = String.valueOf(decisionMakerRaw) - try { - int value = Integer.parseInt(decisionMaker) - return value < 0 ? -value : value - } catch (NumberFormatException ignored) { - int separator = decisionMaker.lastIndexOf('-') - if (separator >= 0 && separator + 1 < decisionMaker.length()) { - try { - int value = Integer.parseInt(decisionMaker.substring(separator + 1)) - return value < 0 ? -value : value - } catch (NumberFormatException ignoredAgain) { - } - } - return SamplingMechanism.DEFAULT - } - } - - private static byte[] serializeMappedPayload( - TraceMapperV1 mapper, - List> traces) { - CapturedBody capturedBody = new CapturedBody(mapper) - MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(2 << 20, capturedBody)) - - for (List trace : traces) { - assertTrue(packer.format(trace, mapper)) - } - packer.flush() - - assertNotNull(capturedBody.payloadBytes) - return capturedBody.payloadBytes - } - - private static byte[] serializePayload(Payload payload) { - ByteArrayChannel channel = new ByteArrayChannel() - payload.writeTo(channel) - return channel.bytes() - } - - private static class CapturedBody implements ByteBufferConsumer { - private final TraceMapperV1 mapper - private byte[] payloadBytes - - private CapturedBody(TraceMapperV1 mapper) { - this.mapper = mapper - } - - @Override - void accept(int messageCount, ByteBuffer buffer) { - Payload payload = mapper.newPayload().withBody(messageCount, buffer) - payloadBytes = serializePayload(payload) - mapper.reset() - } - } - - private static class CountingPojoSpan extends TraceGenerator.PojoSpan { - int processTagsAndBaggageCount = 0 - - CountingPojoSpan( - String serviceName, - String operationName, - CharSequence resourceName, - DDTraceId traceId, - long spanId, - long parentId, - long start, - long duration, - int error, - Map baggage, - Map tags, - CharSequence type, - boolean measured, - int samplingPriority, - int statusCode, - CharSequence origin) { - super( - serviceName, - operationName, - resourceName, - traceId, - spanId, - parentId, - start, - duration, - error, - baggage, - tags, - type, - measured, - samplingPriority, - statusCode, - origin) - } - - @Override - void processTagsAndBaggage(MetadataConsumer consumer) { - processTagsAndBaggageCount++ - super.processTagsAndBaggage(consumer) - } - } - - private static class ByteArrayChannel implements WritableByteChannel { - private byte[] data = new byte[0] - - @Override - int write(ByteBuffer src) { - int len = src.remaining() - byte[] incoming = new byte[len] - src.get(incoming) - byte[] combined = new byte[data.length + incoming.length] - System.arraycopy(data, 0, combined, 0, data.length) - System.arraycopy(incoming, 0, combined, data.length, incoming.length) - data = combined - return len - } - - byte[] bytes() { - return data - } - - @Override - boolean isOpen() { - return true - } - - @Override - void close() { - } - } - - private static void assertEqualsWithNullAsEmpty(CharSequence expected, CharSequence actual) { - if (expected == null) { - assertEquals("", actual) - } else { - assertEquals(expected.toString(), actual.toString()) - } - } -} diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/ddintake/DDEvpProxyApiTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/ddintake/DDEvpProxyApiTest.groovy deleted file mode 100644 index fd797695d99..00000000000 --- a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/ddintake/DDEvpProxyApiTest.groovy +++ /dev/null @@ -1,338 +0,0 @@ -package datadog.trace.common.writer.ddintake - -import com.fasterxml.jackson.core.type.TypeReference -import com.fasterxml.jackson.databind.ObjectMapper -import datadog.communication.serialization.ByteBufferConsumer -import datadog.communication.serialization.FlushingBuffer -import datadog.communication.serialization.msgpack.MsgPackWriter -import datadog.trace.api.DDTags -import datadog.trace.api.civisibility.CiVisibilityWellKnownTags -import datadog.trace.api.intake.TrackType -import datadog.trace.bootstrap.instrumentation.api.InternalSpanTypes -import datadog.trace.bootstrap.instrumentation.api.ServiceNameSources -import datadog.trace.bootstrap.instrumentation.api.Tags -import datadog.trace.common.writer.Payload -import datadog.trace.core.DDSpan -import datadog.trace.core.test.DDCoreSpecification -import okhttp3.HttpUrl -import org.apache.commons.io.IOUtils -import org.msgpack.jackson.dataformat.MessagePackFactory -import spock.lang.Timeout - -import java.nio.ByteBuffer -import java.util.zip.GZIPInputStream - -import static datadog.communication.ddagent.DDAgentFeaturesDiscovery.V2_EVP_PROXY_ENDPOINT -import static datadog.communication.ddagent.DDAgentFeaturesDiscovery.V4_EVP_PROXY_ENDPOINT -import static datadog.trace.agent.test.server.http.TestHttpServer.httpServer - -@Timeout(20) -class DDEvpProxyApiTest extends DDCoreSpecification { - - static CiVisibilityWellKnownTags wellKnownTags = new CiVisibilityWellKnownTags( - "my-runtime-id", "my-env", "my-language", - "my-runtime-name", "my-runtime-version", "my-runtime-vendor", - "my-os-arch", "my-os-platform", "my-os-version", "false") - - static String intakeSubdomain = "citestcycle-intake" - static msgPackMapper = new ObjectMapper(new MessagePackFactory()) - - static newAgentEvpProxy(String path) { - httpServer { - handlers { - post(path) { - if (request.contentType != "application/msgpack") { - response.status(400).send("wrong type: $request.contentType") - } else { - response.status(200).send() - } - } - } - } - } - - def "sending an empty list of traces returns no errors"() { - setup: - def path = buildAgentEvpProxyPath(evpProxyEndpoint, trackType, apiVersion) - def agentEvpProxy = newAgentEvpProxy(path) - def client = createEvpProxyApi(agentEvpProxy.address.toString(), evpProxyEndpoint, trackType, false) - def payload = prepareTraces(trackType, false, []) - - expect: - def clientResponse = client.sendSerializedTraces(payload) - clientResponse.success() - clientResponse.status().present - clientResponse.status().asInt == 200 - agentEvpProxy.getLastRequest().path == path - agentEvpProxy.getLastRequest().getHeader(DDEvpProxyApi.DD_EVP_SUBDOMAIN_HEADER) == intakeSubdomain - - cleanup: - agentEvpProxy.close() - - where: - trackType | apiVersion | evpProxyEndpoint - TrackType.CITESTCYCLE | "v2" | V2_EVP_PROXY_ENDPOINT - } - - def "retries when backend returns 5xx"() { - setup: - def retry = 1 - def path = buildAgentEvpProxyPath(evpProxyEndpoint, trackType, apiVersion) - def agentEvpProxy = httpServer { - handlers { - post(path) { - if (retry < 5) { - response.status(503).send() - retry += 1 - } else { - response.status(200).send() - } - } - } - } - - def client = createEvpProxyApi(agentEvpProxy.address.toString(), evpProxyEndpoint, trackType, false) - def payload = prepareTraces(trackType, false, []) - - expect: - def clientResponse = client.sendSerializedTraces(payload) - clientResponse.success() - clientResponse.status().present - clientResponse.status().asInt == 200 - agentEvpProxy.getLastRequest().path == path - agentEvpProxy.getLastRequest().getHeader(DDEvpProxyApi.DD_EVP_SUBDOMAIN_HEADER) == intakeSubdomain - - cleanup: - agentEvpProxy.close() - - where: - trackType | apiVersion | evpProxyEndpoint - TrackType.CITESTCYCLE | "v2" | V2_EVP_PROXY_ENDPOINT - } - - def "content is sent as MSGPACK"() { - setup: - def path = buildAgentEvpProxyPath(evpProxyEndpoint, trackType, apiVersion) - def agentEvpProxy = httpServer { - handlers { - post(path) { - response.send() - } - } - } - - def client = createEvpProxyApi(agentEvpProxy.address.toString(), evpProxyEndpoint, trackType, compressionEnabled) - def payload = prepareTraces(trackType, compressionEnabled, traces) - - expect: - client.sendSerializedTraces(payload).status() - agentEvpProxy.getLastRequest().contentType == "application/msgpack" - convertMap(agentEvpProxy.getLastRequest().body, compressionEnabled) == expectedRequestBody - - cleanup: - agentEvpProxy.close() - - where: - // spotless:off - trackType | apiVersion | evpProxyEndpoint | compressionEnabled | traces | expectedRequestBody - TrackType.CITESTCYCLE | "v2" | V2_EVP_PROXY_ENDPOINT | false | [] | [:] - - TrackType.CITESTCYCLE | "v2" | V2_EVP_PROXY_ENDPOINT | false | [[buildSpan(1L, "fakeType", ["service.name": "my-service"])]] | new TreeMap<>([ - "version" : 1, - "metadata": new TreeMap<>([ - "*": new TreeMap<>([ - "env" : "my-env", - "runtime-id" : "my-runtime-id", - "language" : "my-language", - (Tags.RUNTIME_NAME) : "my-runtime-name", - (Tags.RUNTIME_VERSION) : "my-runtime-version", - (Tags.RUNTIME_VENDOR) : "my-runtime-vendor", - (Tags.OS_ARCHITECTURE) : "my-os-arch", - (Tags.OS_PLATFORM) : "my-os-platform", - (Tags.OS_VERSION) : "my-os-version", - (DDTags.TEST_IS_USER_PROVIDED_SERVICE): "false" - ])]), - "events" : [new TreeMap<>([ - "type" : "span", - "version": 1, - "content": new TreeMap<>([ - "service" : "my-service", - "name" : "fakeOperation", - "resource" : "fakeResource", - "error" : 0, - "trace_id" : 1L, - "span_id" : 1L, - "parent_id": 0L, - "start" : 1000L, - "duration" : 10L, - "meta" : [(DDTags.DD_SVC_SRC): ServiceNameSources.MANUAL.toString()], - "metrics" : [:] - ]) - ])] - ]) - TrackType.CITESTCYCLE | "v2" | V2_EVP_PROXY_ENDPOINT | false | [[buildSpan(1L, InternalSpanTypes.TEST, ["test_suite_id": 123L, "test_module_id": 456L])]] | new TreeMap<>([ - "version" : 1, - "metadata": new TreeMap<>([ - "*": new TreeMap<>([ - "env" : "my-env", - "runtime-id" : "my-runtime-id", - "language" : "my-language", - (Tags.RUNTIME_NAME) : "my-runtime-name", - (Tags.RUNTIME_VERSION) : "my-runtime-version", - (Tags.RUNTIME_VENDOR) : "my-runtime-vendor", - (Tags.OS_ARCHITECTURE) : "my-os-arch", - (Tags.OS_PLATFORM) : "my-os-platform", - (Tags.OS_VERSION) : "my-os-version", - (DDTags.TEST_IS_USER_PROVIDED_SERVICE): "false" - ])]), - "events" : [new TreeMap<>([ - "type" : "test", - "version": 2, - "content": new TreeMap<>([ - "test_suite_id" : 123L, - "test_module_id": 456L, - "service" : "fakeService", - "name" : "fakeOperation", - "resource" : "fakeResource", - "error" : 0, - "trace_id" : 1L, - "span_id" : 1L, - "parent_id" : 0L, - "start" : 1000L, - "duration" : 10L, - "meta" : [:], - "metrics" : [:] - ]) - ])] - ]) - TrackType.CITESTCYCLE | "v2" | V2_EVP_PROXY_ENDPOINT | false | [[buildSpan(1L, InternalSpanTypes.TEST_SUITE_END, ["test_suite_id": 123L, "test_module_id": 456L])]] | new TreeMap<>([ - "version" : 1, - "metadata": new TreeMap<>([ - "*": new TreeMap<>([ - "env" : "my-env", - "runtime-id" : "my-runtime-id", - "language" : "my-language", - (Tags.RUNTIME_NAME) : "my-runtime-name", - (Tags.RUNTIME_VERSION) : "my-runtime-version", - (Tags.RUNTIME_VENDOR) : "my-runtime-vendor", - (Tags.OS_ARCHITECTURE) : "my-os-arch", - (Tags.OS_PLATFORM) : "my-os-platform", - (Tags.OS_VERSION) : "my-os-version", - (DDTags.TEST_IS_USER_PROVIDED_SERVICE): "false" - ])]), - "events" : [new TreeMap<>([ - "type" : "test_suite_end", - "version": 1, - "content": new TreeMap<>([ - "test_suite_id" : 123L, - "test_module_id": 456L, - "service" : "fakeService", - "name" : "fakeOperation", - "resource" : "fakeResource", - "error" : 0, - "start" : 1000L, - "duration" : 10L, - "meta" : [:], - "metrics" : [:] - ]) - ])] - ]) - TrackType.CITESTCYCLE | "v2" | V4_EVP_PROXY_ENDPOINT | true | [[buildSpan(1L, InternalSpanTypes.TEST_MODULE_END, ["test_module_id": 456L])]] | new TreeMap<>([ - "version" : 1, - "metadata": new TreeMap<>([ - "*": new TreeMap<>([ - "env" : "my-env", - "runtime-id" : "my-runtime-id", - "language" : "my-language", - (Tags.RUNTIME_NAME) : "my-runtime-name", - (Tags.RUNTIME_VERSION) : "my-runtime-version", - (Tags.RUNTIME_VENDOR) : "my-runtime-vendor", - (Tags.OS_ARCHITECTURE) : "my-os-arch", - (Tags.OS_PLATFORM) : "my-os-platform", - (Tags.OS_VERSION) : "my-os-version", - (DDTags.TEST_IS_USER_PROVIDED_SERVICE): "false" - ])]), - "events" : [new TreeMap<>([ - "type" : "test_module_end", - "version": 1, - "content": new TreeMap<>([ - "test_module_id": 456L, - "service" : "fakeService", - "name" : "fakeOperation", - "resource" : "fakeResource", - "error" : 0, - "start" : 1000L, - "duration" : 10L, - "meta" : [:], - "metrics" : [:] - ]) - ])] - ]) - - // spotless:on - ignore = traces.each { - it.each { - it.finish() - it.@durationNano = 10 - } - } - } - - static Map convertMap(byte[] bytes, boolean compressionEnabled) { - if (compressionEnabled) { - bytes = decompress(bytes) - } - return msgPackMapper.readValue(bytes, new TypeReference>() {}) - } - - static byte[] decompress(byte[] bytes) { - def baos = new ByteArrayOutputStream() - try (GZIPInputStream zip = new GZIPInputStream(new ByteArrayInputStream(bytes))) { - IOUtils.copy(zip, baos) - } - return baos.toByteArray() - } - - static class Traces implements ByteBufferConsumer { - int traceCount - ByteBuffer buffer - - @Override - void accept(int messageCount, ByteBuffer buffer) { - this.buffer = buffer - this.traceCount = messageCount - } - } - - def createEvpProxyApi(String agentUrl, String evpProxyEndpoint, TrackType trackType, boolean compressionEnabled) { - return DDEvpProxyApi.builder() - .agentUrl(HttpUrl.get(agentUrl)) - .evpProxyEndpoint(evpProxyEndpoint) - .trackType(trackType) - .compressionEnabled(compressionEnabled) - .build() - } - - def discoverMapper(TrackType trackType, boolean compressionEnabled) { - def mapperDiscover = new DDIntakeMapperDiscovery(trackType, wellKnownTags, compressionEnabled) - mapperDiscover.discover() - return mapperDiscover.getMapper() - } - - def buildAgentEvpProxyPath(String evpProxyEndpoint, TrackType trackType, String apiVersion) { - return "/" + evpProxyEndpoint + "api/" + apiVersion + "/" + trackType.name().toLowerCase() - } - - Payload prepareTraces(TrackType trackType, boolean compressionEnabled, List> traces) { - Traces traceCapture = new Traces() - def packer = new MsgPackWriter(new FlushingBuffer(1 << 20, traceCapture)) - def mapper = discoverMapper(trackType, compressionEnabled) - for (trace in traces) { - packer.format(trace, mapper) - } - packer.flush() - return mapper.newPayload() - .withBody(traceCapture.traceCount, - traces.isEmpty() ? ByteBuffer.allocate(0) : traceCapture.buffer) - } -} diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/ddintake/DDIntakeApiTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/ddintake/DDIntakeApiTest.groovy deleted file mode 100644 index ea3932854b4..00000000000 --- a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/ddintake/DDIntakeApiTest.groovy +++ /dev/null @@ -1,360 +0,0 @@ -package datadog.trace.common.writer.ddintake - -import com.fasterxml.jackson.core.type.TypeReference -import com.fasterxml.jackson.databind.ObjectMapper -import datadog.communication.serialization.ByteBufferConsumer -import datadog.communication.serialization.FlushingBuffer -import datadog.communication.serialization.msgpack.MsgPackWriter -import datadog.trace.api.DDTags -import datadog.trace.api.civisibility.CiVisibilityWellKnownTags -import datadog.trace.api.intake.TrackType -import datadog.trace.bootstrap.instrumentation.api.InternalSpanTypes -import datadog.trace.bootstrap.instrumentation.api.ServiceNameSources -import datadog.trace.bootstrap.instrumentation.api.Tags -import datadog.trace.common.writer.Payload -import datadog.trace.core.DDSpan -import datadog.trace.core.test.DDCoreSpecification -import okhttp3.HttpUrl -import org.apache.commons.io.IOUtils -import org.msgpack.jackson.dataformat.MessagePackFactory -import spock.lang.Timeout - -import java.nio.ByteBuffer -import java.util.zip.GZIPInputStream - -import static datadog.trace.agent.test.server.http.TestHttpServer.httpServer - -@Timeout(20) -class DDIntakeApiTest extends DDCoreSpecification { - - static CiVisibilityWellKnownTags wellKnownTags = new CiVisibilityWellKnownTags( - "my-runtime-id", "my-env", "my-language", - "my-runtime-name", "my-runtime-version", "my-runtime-vendor", - "my-os-arch", "my-os-platform", "my-os-version", "false") - - static String apiKey = "my-secret-apikey" - static msgPackMapper = new ObjectMapper(new MessagePackFactory()) - - static newIntake(String path) { - httpServer { - handlers { - post(path) { - if (request.contentType != "application/msgpack") { - response.status(400).send("wrong type: $request.contentType") - } else { - response.status(200).send() - } - } - } - } - } - - def "sending an empty list of traces returns no errors"() { - setup: - def path = buildIntakePath(trackType, apiVersion) - def intake = newIntake(path) - def client = createIntakeApi(intake.address.toString(), trackType) - def payload = prepareTraces(trackType, []) - - expect: - def clientResponse = client.sendSerializedTraces(payload) - clientResponse.success() - clientResponse.status().present - clientResponse.status().asInt == 200 - intake.getLastRequest().path == path - - cleanup: - intake.close() - - where: - trackType | apiVersion - TrackType.CITESTCYCLE | "v2" - } - - def "retries when backend returns 5xx"() { - setup: - def retry = 1 - def path = buildIntakePath(trackType, apiVersion) - def intake = httpServer { - handlers { - post(path) { - if (retry < 5) { - response.status(503).send() - retry += 1 - } else { - response.status(200).send() - } - } - } - } - - def client = createIntakeApi(intake.address.toString(), trackType) - def payload = prepareTraces(trackType, []) - - expect: - def clientResponse = client.sendSerializedTraces(payload) - clientResponse.success() - clientResponse.status().present - clientResponse.status().asInt == 200 - intake.getLastRequest().path == path - - cleanup: - intake.close() - - where: - trackType | apiVersion - TrackType.CITESTCYCLE | "v2" - } - - def "retries when backend returns 429 Too Many Requests"() { - setup: - def retry = 0 - def path = buildIntakePath(trackType, apiVersion) - def intake = httpServer { - handlers { - post(path) { - if (retry < 1) { - response.status(429).addHeader("x-ratelimit-reset", "0").send() - retry += 1 - } else { - response.status(200).send() - } - } - } - } - - def client = createIntakeApi(intake.address.toString(), trackType) - def payload = prepareTraces(trackType, []) - - expect: - def clientResponse = client.sendSerializedTraces(payload) - clientResponse.success() - clientResponse.status().present - clientResponse.status().asInt == 200 - intake.getLastRequest().path == path - - cleanup: - intake.close() - - where: - trackType | apiVersion - TrackType.CITESTCYCLE | "v2" - } - - def "content is sent as MSGPACK"() { - setup: - def path = buildIntakePath(trackType, apiVersion) - def intake = httpServer { - handlers { - post(path) { - response.send() - } - } - } - - def client = createIntakeApi(intake.address.toString(), trackType) - def payload = prepareTraces(trackType, traces) - - expect: - client.sendSerializedTraces(payload).status().present - intake.lastRequest.contentType == "application/msgpack" - convertMap(intake.lastRequest.body) == expectedRequestBody - - cleanup: - intake.close() - - where: - // spotless:off - trackType | apiVersion | traces | expectedRequestBody - TrackType.CITESTCYCLE | "v2" | [] | [:] - TrackType.CITESTCYCLE | "v2" | [[buildSpan(1L, "fakeType", ["service.name": "my-service"])]] | new TreeMap<>([ - "version" : 1, - "metadata": new TreeMap<>([ - "*": new TreeMap<>([ - "env" : "my-env", - "runtime-id" : "my-runtime-id", - "language" : "my-language", - (Tags.RUNTIME_NAME) : "my-runtime-name", - (Tags.RUNTIME_VERSION) : "my-runtime-version", - (Tags.RUNTIME_VENDOR) : "my-runtime-vendor", - (Tags.OS_ARCHITECTURE) : "my-os-arch", - (Tags.OS_PLATFORM) : "my-os-platform", - (Tags.OS_VERSION) : "my-os-version", - (DDTags.TEST_IS_USER_PROVIDED_SERVICE): "false", - ])]), - "events" : [new TreeMap<>([ - "type" : "span", - "version": 1, - "content": new TreeMap<>([ - "service" : "my-service", - "name" : "fakeOperation", - "resource" : "fakeResource", - "error" : 0, - "trace_id" : 1L, - "span_id" : 1L, - "parent_id": 0L, - "start" : 1000L, - "duration" : 10L, - "meta" : [(DDTags.DD_SVC_SRC):ServiceNameSources.MANUAL.toString()], - "metrics" : [:] - ]) - ])] - ]) - TrackType.CITESTCYCLE | "v2" | [[buildSpan(1L, InternalSpanTypes.TEST, ["test_suite_id": 123L, "test_module_id": 456L])]] | new TreeMap<>([ - "version" : 1, - "metadata": new TreeMap<>([ - "*": new TreeMap<>([ - "env" : "my-env", - "runtime-id" : "my-runtime-id", - "language" : "my-language", - (Tags.RUNTIME_NAME) : "my-runtime-name", - (Tags.RUNTIME_VERSION) : "my-runtime-version", - (Tags.RUNTIME_VENDOR) : "my-runtime-vendor", - (Tags.OS_ARCHITECTURE) : "my-os-arch", - (Tags.OS_PLATFORM) : "my-os-platform", - (Tags.OS_VERSION) : "my-os-version", - (DDTags.TEST_IS_USER_PROVIDED_SERVICE): "false" - ])]), - "events" : [new TreeMap<>([ - "type" : "test", - "version": 2, - "content": new TreeMap<>([ - "test_suite_id" : 123L, - "test_module_id": 456L, - "service" : "fakeService", - "name" : "fakeOperation", - "resource" : "fakeResource", - "error" : 0, - "trace_id" : 1L, - "span_id" : 1L, - "parent_id" : 0L, - "start" : 1000L, - "duration" : 10L, - "meta" : [:], - "metrics" : [:] - ]) - ])] - ]) - TrackType.CITESTCYCLE | "v2" | [[buildSpan(1L, InternalSpanTypes.TEST_SUITE_END, ["test_suite_id": 123L, "test_module_id": 456L])]] | new TreeMap<>([ - "version" : 1, - "metadata": new TreeMap<>([ - "*": new TreeMap<>([ - "env" : "my-env", - "runtime-id" : "my-runtime-id", - "language" : "my-language", - (Tags.RUNTIME_NAME) : "my-runtime-name", - (Tags.RUNTIME_VERSION) : "my-runtime-version", - (Tags.RUNTIME_VENDOR) : "my-runtime-vendor", - (Tags.OS_ARCHITECTURE) : "my-os-arch", - (Tags.OS_PLATFORM) : "my-os-platform", - (Tags.OS_VERSION) : "my-os-version", - (DDTags.TEST_IS_USER_PROVIDED_SERVICE): "false" - ])]), - "events" : [new TreeMap<>([ - "type" : "test_suite_end", - "version": 1, - "content": new TreeMap<>([ - "test_suite_id" : 123L, - "test_module_id": 456L, - "service" : "fakeService", - "name" : "fakeOperation", - "resource" : "fakeResource", - "error" : 0, - "start" : 1000L, - "duration" : 10L, - "meta" : [:], - "metrics" : [:] - ]) - ])] - ]) - TrackType.CITESTCYCLE | "v2" | [[buildSpan(1L, InternalSpanTypes.TEST_MODULE_END, ["test_module_id": 456L])]] | new TreeMap<>([ - "version" : 1, - "metadata": new TreeMap<>([ - "*": new TreeMap<>([ - "env" : "my-env", - "runtime-id" : "my-runtime-id", - "language" : "my-language", - (Tags.RUNTIME_NAME) : "my-runtime-name", - (Tags.RUNTIME_VERSION) : "my-runtime-version", - (Tags.RUNTIME_VENDOR) : "my-runtime-vendor", - (Tags.OS_ARCHITECTURE) : "my-os-arch", - (Tags.OS_PLATFORM) : "my-os-platform", - (Tags.OS_VERSION) : "my-os-version", - (DDTags.TEST_IS_USER_PROVIDED_SERVICE): "false" - ])]), - "events" : [new TreeMap<>([ - "type" : "test_module_end", - "version": 1, - "content": new TreeMap<>([ - "test_module_id": 456L, - "service" : "fakeService", - "name" : "fakeOperation", - "resource" : "fakeResource", - "error" : 0, - "start" : 1000L, - "duration" : 10L, - "meta" : [:], - "metrics" : [:] - ]) - ])] - ]) - // spotless:on - ignore = traces.each { - it.each { - it.finish() - it.@durationNano = 10 - } - } - } - - static Map convertMap(byte[] bytes) { - return msgPackMapper.readValue(decompress(bytes), new TypeReference>() {}) - } - - static byte[] decompress(byte[] bytes) { - def baos = new ByteArrayOutputStream() - try (GZIPInputStream zip = new GZIPInputStream(new ByteArrayInputStream(bytes))) { - IOUtils.copy(zip, baos) - } - return baos.toByteArray() - } - - static class Traces implements ByteBufferConsumer { - int traceCount - ByteBuffer buffer - - @Override - void accept(int messageCount, ByteBuffer buffer) { - this.buffer = buffer - this.traceCount = messageCount - } - } - - def createIntakeApi(String url, TrackType trackType) { - HttpUrl hostUrl = HttpUrl.get(url) - return DDIntakeApi.builder().hostUrl(hostUrl).trackType(trackType).apiKey(apiKey).build() - } - - def discoverMapper(TrackType trackType) { - def mapperDiscover = new DDIntakeMapperDiscovery(trackType, wellKnownTags, true) - mapperDiscover.discover() - return mapperDiscover.getMapper() - } - - def buildIntakePath(TrackType trackType, String apiVersion) { - return String.format("/api/%s/%s", apiVersion, trackType.name().toLowerCase()) - } - - Payload prepareTraces(TrackType trackType, List> traces) { - Traces traceCapture = new Traces() - def packer = new MsgPackWriter(new FlushingBuffer(1 << 20, traceCapture)) - def mapper = discoverMapper(trackType) - for (trace in traces) { - packer.format(trace, mapper) - } - packer.flush() - return mapper.newPayload() - .withBody(traceCapture.traceCount, - traces.isEmpty() ? ByteBuffer.allocate(0) : traceCapture.buffer) - } -} diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/ddintake/DDIntakeTraceInterceptorTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/ddintake/DDIntakeTraceInterceptorTest.groovy deleted file mode 100644 index 31c5c1c68ee..00000000000 --- a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/ddintake/DDIntakeTraceInterceptorTest.groovy +++ /dev/null @@ -1,89 +0,0 @@ -package datadog.trace.common.writer.ddintake - -import datadog.trace.bootstrap.instrumentation.api.Tags -import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString -import datadog.trace.common.writer.ListWriter -import datadog.trace.core.test.DDCoreSpecification -import spock.lang.Timeout - -@Timeout(100) -class DDIntakeTraceInterceptorTest extends DDCoreSpecification { - - def writer = new ListWriter() - def tracer = tracerBuilder().writer(writer).build() - - def setup() { - tracer.addTraceInterceptor(DDIntakeTraceInterceptor.INSTANCE) - } - - def cleanup() { - tracer?.close() - } - - def "test normalization for dd intake"() { - setup: - tracer.buildSpan("datadog", "my-operation-name") - .withResourceName("my-resource-name") - .withSpanType("my-span-type") - .withServiceName("my-service-name") - .withTag("some-tag-key", "some-tag-value") - .withTag("env", " My_____Env ") - .withTag(Tags.HTTP_STATUS, httpStatus) - .start().finish() - writer.waitForTraces(1) - - expect: - def trace = writer.firstTrace() - trace.size() == 1 - - def span = trace[0] - - span.getServiceName() == "my-service-name" - span.getOperationName() == "my_operation_name" - span.getResourceName() == "my-resource-name" - span.getSpanType() == "my-span-type" - span.getTag("some-tag-key") == "some-tag-value" - span.getTag("env") == "my_env" - span.getTag(Tags.HTTP_STATUS) == expectedHttpStatus - - where: - httpStatus | expectedHttpStatus - null | null - "" | null - "500" | 500 - 500 | 500 - 600 | null - } - - def "test normalization does not implicitly convert span type"() { - setup: - def originalSpanType = UTF8BytesString.create("a UTF8 span type") - tracer.buildSpan("datadog", "my-operation-name") - .withSpanType(originalSpanType) - .start().finish() - - when: - writer.waitForTraces(1) - - then: - def trace = writer.firstTrace() - trace.size() == 1 - - def span = trace[0] - span.type == originalSpanType - } - - def "test default env setting"() { - setup: - tracer.buildSpan("datadog", "my-operation-name").start().finish() - writer.waitForTraces(1) - - expect: - def trace = writer.firstTrace() - trace.size() == 1 - - def span = trace[0] - - span.getTag("env") == "none" - } -} diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/ddintake/DDIntakeTrackTypeResolverTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/ddintake/DDIntakeTrackTypeResolverTest.groovy deleted file mode 100644 index d13bff4e1d9..00000000000 --- a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/ddintake/DDIntakeTrackTypeResolverTest.groovy +++ /dev/null @@ -1,24 +0,0 @@ -package datadog.trace.common.writer.ddintake - -import datadog.trace.api.Config -import datadog.trace.api.intake.TrackType -import datadog.trace.test.util.DDSpecification - -class DDIntakeTrackTypeResolverTest extends DDSpecification { - - def "should return the correct TrackType"() { - setup: - Config config = Mock(Config) - config.ciVisibilityEnabled >> ciVisibilityEnabled - config.ciVisibilityAgentlessEnabled >> ciVisibilityAgentlessEnabled - - expect: - DDIntakeTrackTypeResolver.resolve(config) == expectedTrackType - - where: - ciVisibilityEnabled | ciVisibilityAgentlessEnabled | expectedTrackType - false | false | TrackType.NOOP - true | false | TrackType.CITESTCYCLE - true | true | TrackType.CITESTCYCLE - } -} diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/DDAgentApiTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/DDAgentApiTest.java new file mode 100644 index 00000000000..1452c640509 --- /dev/null +++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/DDAgentApiTest.java @@ -0,0 +1,742 @@ +package datadog.trace.common.writer; + +import static datadog.trace.api.ProtocolVersion.V0_5; +import static java.util.Collections.emptyList; +import static java.util.Collections.singletonList; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import datadog.communication.ddagent.DDAgentFeaturesDiscovery; +import datadog.communication.http.OkHttpUtils; +import datadog.communication.serialization.ByteBufferConsumer; +import datadog.communication.serialization.FlushingBuffer; +import datadog.communication.serialization.msgpack.MsgPackWriter; +import datadog.metrics.api.Monitoring; +import datadog.metrics.api.statsd.StatsDClient; +import datadog.metrics.impl.MonitoringImpl; +import datadog.trace.agent.test.server.http.JavaTestHttpServer; +import datadog.trace.api.Config; +import datadog.trace.api.ProcessTags; +import datadog.trace.api.ProtocolVersion; +import datadog.trace.bootstrap.instrumentation.api.InstrumentationTags; +import datadog.trace.common.sampling.RateByServiceTraceSampler; +import datadog.trace.common.writer.RemoteApi.Response; +import datadog.trace.common.writer.ddagent.DDAgentApi; +import datadog.trace.common.writer.ddagent.TraceMapper; +import datadog.trace.common.writer.ddagent.TraceMapperV0_4; +import datadog.trace.common.writer.ddagent.TraceMapperV0_5; +import datadog.trace.common.writer.ddagent.TraceMapperV1; +import datadog.trace.core.DDCoreJavaSpecification; +import datadog.trace.core.DDSpan; +import datadog.trace.core.DDSpanContext; +import datadog.trace.core.propagation.PropagationTags; +import datadog.trace.junit.utils.tabletest.TableTestTypeConverters; +import java.io.IOException; +import java.lang.reflect.Field; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.RejectedExecutionException; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicLong; +import java.util.concurrent.atomic.AtomicReference; +import okhttp3.HttpUrl; +import okhttp3.OkHttpClient; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; +import org.msgpack.jackson.dataformat.MessagePackFactory; +import org.tabletest.junit.TableTest; +import org.tabletest.junit.TypeConverterSources; + +@Timeout(20) +@TypeConverterSources(TableTestTypeConverters.class) +public class DDAgentApiTest extends DDCoreJavaSpecification { + + static final Monitoring monitoring = new MonitoringImpl(StatsDClient.NO_OP, 1, TimeUnit.SECONDS); + static final ObjectMapper mapper = new ObjectMapper(new MessagePackFactory()); + + // --- Helper: create a minimal agent server responding 200 to PUT latestVersion --- + + static JavaTestHttpServer newAgent(String latestVersion) { + return JavaTestHttpServer.httpServer( + s -> + s.handlers( + h -> + h.put( + latestVersion, + api -> { + if (!"application/msgpack".equals(api.getRequest().getContentType())) { + api.getResponse() + .status(400) + .send("wrong type: " + api.getRequest().getContentType()); + } else if (api.getRequest().getContentLength() <= 0) { + api.getResponse().status(400).send("no content"); + } else { + api.getResponse().status(200).send(); + } + }))); + } + + // --- Tests --- + + @TableTest({ + "scenario | agentVersion | protocolVersion", + "v0.3 traces | 'v0.3/traces' | V0_4 ", + "v0.4 traces | 'v0.4/traces' | V0_4 ", + "v0.5 traces | 'v0.5/traces' | V0_5 ", + "v1.0 traces | 'v1.0/traces' | V1_0 " + }) + void testSendingAnEmptyListOfTracesReturnsNoErrors( + String agentVersion, ProtocolVersion protocolVersion) { + JavaTestHttpServer agent = newAgent(agentVersion); + try { + DDAgentApi client = createAgentApi(agent.getAddress().toString(), protocolVersion).api; + Payload payload = prepareTraces(agentVersion, emptyList()); + Response response = client.sendSerializedTraces(payload); + assertTrue(response.success()); + assertTrue(response.status().isPresent()); + assertEquals(200, response.status().getAsInt()); + assertEquals("/" + agentVersion, agent.getLastRequest().getPath()); + } finally { + agent.close(); + } + } + + @Test + void testResponseBodyPropagatedInCaseOfNon200Response() { + JavaTestHttpServer agent = + JavaTestHttpServer.httpServer( + s -> + s.handlers( + h -> + h.put( + "v0.4/traces", + api -> api.getResponse().status(400).send("Test error")))); + try { + DDAgentApi client = createAgentApi(agent.getAddress().toString()).api; + Payload payload = prepareTraces("v0.4/traces", emptyList()); + Response clientResponse = client.sendSerializedTraces(payload); + assertFalse(clientResponse.success()); + assertTrue(clientResponse.status().isPresent()); + assertEquals(400, clientResponse.status().getAsInt()); + assertEquals("Test error", clientResponse.response()); + } finally { + agent.close(); + } + } + + @Test + void testNon200Response() { + JavaTestHttpServer agent = + JavaTestHttpServer.httpServer( + s -> + s.handlers( + h -> { + h.put("v0.4/traces", api -> api.getResponse().status(404).send()); + h.put("v0.3/traces", api -> api.getResponse().status(404).send()); + })); + try { + DDAgentApi client = createAgentApi(agent.getAddress().toString()).api; + Payload payload = prepareTraces("v0.3/traces", emptyList()); + Response clientResponse = client.sendSerializedTraces(payload); + assertFalse(clientResponse.success()); + assertTrue(clientResponse.status().isPresent()); + assertEquals(404, clientResponse.status().getAsInt()); + assertEquals("/v0.3/traces", agent.getLastRequest().getPath()); + } finally { + agent.close(); + } + } + + @Test + void testContentIsSentAsMsgpackEmptyTraces() throws IOException { + String agentVersion = "v0.3/traces"; + List> traces = emptyList(); + JavaTestHttpServer agent = + JavaTestHttpServer.httpServer( + s -> s.handlers(h -> h.put(agentVersion, api -> api.getResponse().send()))); + try { + DDAgentApi client = createAgentApi(agent.getAddress().toString()).api; + Payload payload = prepareTraces(agentVersion, traces); + assertTrue(client.sendSerializedTraces(payload).success()); + assertEquals("application/msgpack", agent.getLastRequest().getContentType()); + assertEquals( + "true", agent.getLastRequest().getHeaders().get("Datadog-Client-Computed-Top-Level")); + assertEquals("java", agent.getLastRequest().getHeaders().get("Datadog-Meta-Lang")); + assertEquals( + System.getProperty("java.version", "unknown"), + agent.getLastRequest().getHeaders().get("Datadog-Meta-Lang-Version")); + assertEquals( + "Stubbed-Test-Version", + agent.getLastRequest().getHeaders().get("Datadog-Meta-Tracer-Version")); + assertEquals( + String.valueOf(traces.size()), + agent.getLastRequest().getHeaders().get("X-Datadog-Trace-Count")); + assertEquals( + String.valueOf(payload.droppedTraces()), + agent.getLastRequest().getHeaders().get("Datadog-Client-Dropped-P0-Traces")); + assertEquals( + String.valueOf(payload.droppedSpans()), + agent.getLastRequest().getHeaders().get("Datadog-Client-Dropped-P0-Spans")); + assertEquals(emptyList(), convertList(agentVersion, agent.getLastRequest().getBody())); + } finally { + agent.close(); + } + } + + @Test + void testContentIsSentAsMsgpackServiceSpan() throws IOException { + String agentVersion = "v0.4/traces"; + DDSpan span = + buildSpan( + 1L, + "service.name", + "my-service", + PropagationTags.factory() + .fromHeaderValue(PropagationTags.HeaderType.DATADOG, "_dd.p.usr=123")); + span.finish(); + setDurationNano(span, 10L); + List> traces = singletonList(singletonList(span)); + + JavaTestHttpServer agent = + JavaTestHttpServer.httpServer( + s -> s.handlers(h -> h.put(agentVersion, api -> api.getResponse().send()))); + try { + DDAgentApi client = createAgentApi(agent.getAddress().toString()).api; + Payload payload = prepareTraces(agentVersion, traces); + assertTrue(client.sendSerializedTraces(payload).success()); + assertEquals("application/msgpack", agent.getLastRequest().getContentType()); + assertEquals( + "true", agent.getLastRequest().getHeaders().get("Datadog-Client-Computed-Top-Level")); + assertEquals("java", agent.getLastRequest().getHeaders().get("Datadog-Meta-Lang")); + assertEquals( + System.getProperty("java.version", "unknown"), + agent.getLastRequest().getHeaders().get("Datadog-Meta-Lang-Version")); + assertEquals( + "Stubbed-Test-Version", + agent.getLastRequest().getHeaders().get("Datadog-Meta-Tracer-Version")); + assertEquals( + String.valueOf(traces.size()), + agent.getLastRequest().getHeaders().get("X-Datadog-Trace-Count")); + assertEquals( + String.valueOf(payload.droppedTraces()), + agent.getLastRequest().getHeaders().get("Datadog-Client-Dropped-P0-Traces")); + assertEquals( + String.valueOf(payload.droppedSpans()), + agent.getLastRequest().getHeaders().get("Datadog-Client-Dropped-P0-Spans")); + + Map meta = new TreeMap<>(); + meta.put("thread.name", Thread.currentThread().getName()); + meta.put("_dd.p.usr", "123"); + meta.put("_dd.p.dm", "-1"); + meta.put("_dd.p.ksr", "1"); + meta.put("_dd.svc_src", "m"); + if (Config.get().isExperimentalPropagateProcessTagsEnabled() + && ProcessTags.getTagsForSerialization() != null) { + meta.put("_dd.tags.process", ProcessTags.getTagsForSerialization().toString()); + } + Map metrics = new TreeMap<>(); + metrics.put(DDSpanContext.PRIORITY_SAMPLING_KEY, 1); + metrics.put(InstrumentationTags.DD_TOP_LEVEL.toString(), 1); + metrics.put(RateByServiceTraceSampler.SAMPLING_AGENT_RATE, 1.0); + metrics.put("thread.id", Thread.currentThread().getId()); + Map spanMap = new TreeMap<>(); + spanMap.put("duration", 10); + spanMap.put("error", 0); + spanMap.put("meta", meta); + spanMap.put("metrics", metrics); + spanMap.put("name", "fakeOperation"); + spanMap.put("parent_id", 0); + spanMap.put("resource", "fakeResource"); + spanMap.put("service", "my-service"); + spanMap.put("span_id", 1); + spanMap.put("start", 1000); + spanMap.put("trace_id", 1); + spanMap.put("type", "fakeType"); + List>> expectedRequestBody = singletonList(singletonList(spanMap)); + assertDeepEquals( + expectedRequestBody, convertList(agentVersion, agent.getLastRequest().getBody())); + } finally { + agent.close(); + } + } + + @Test + void testContentIsSentAsMsgpackResourceSpan() throws IOException { + String agentVersion = "v0.4/traces"; + DDSpan span = + buildSpan( + 100L, + "resource.name", + "my-resource", + PropagationTags.factory() + .fromHeaderValue(PropagationTags.HeaderType.DATADOG, "_dd.p.usr=123")); + span.finish(); + setDurationNano(span, 10L); + List> traces = singletonList(singletonList(span)); + + JavaTestHttpServer agent = + JavaTestHttpServer.httpServer( + s -> s.handlers(h -> h.put(agentVersion, api -> api.getResponse().send()))); + try { + DDAgentApi client = createAgentApi(agent.getAddress().toString()).api; + Payload payload = prepareTraces(agentVersion, traces); + assertTrue(client.sendSerializedTraces(payload).success()); + assertEquals("application/msgpack", agent.getLastRequest().getContentType()); + assertEquals( + "true", agent.getLastRequest().getHeaders().get("Datadog-Client-Computed-Top-Level")); + assertEquals("java", agent.getLastRequest().getHeaders().get("Datadog-Meta-Lang")); + assertEquals( + System.getProperty("java.version", "unknown"), + agent.getLastRequest().getHeaders().get("Datadog-Meta-Lang-Version")); + assertEquals( + "Stubbed-Test-Version", + agent.getLastRequest().getHeaders().get("Datadog-Meta-Tracer-Version")); + assertEquals( + String.valueOf(traces.size()), + agent.getLastRequest().getHeaders().get("X-Datadog-Trace-Count")); + assertEquals( + String.valueOf(payload.droppedTraces()), + agent.getLastRequest().getHeaders().get("Datadog-Client-Dropped-P0-Traces")); + assertEquals( + String.valueOf(payload.droppedSpans()), + agent.getLastRequest().getHeaders().get("Datadog-Client-Dropped-P0-Spans")); + + Map meta = new TreeMap<>(); + meta.put("thread.name", Thread.currentThread().getName()); + meta.put("_dd.p.usr", "123"); + meta.put("_dd.p.dm", "-1"); + meta.put("_dd.p.ksr", "1"); + if (Config.get().isExperimentalPropagateProcessTagsEnabled() + && ProcessTags.getTagsForSerialization() != null) { + meta.put("_dd.tags.process", ProcessTags.getTagsForSerialization().toString()); + } + Map metrics = new TreeMap<>(); + metrics.put(DDSpanContext.PRIORITY_SAMPLING_KEY, 1); + metrics.put(InstrumentationTags.DD_TOP_LEVEL.toString(), 1); + metrics.put(RateByServiceTraceSampler.SAMPLING_AGENT_RATE, 1.0); + metrics.put("thread.id", Thread.currentThread().getId()); + Map spanMap = new TreeMap<>(); + spanMap.put("duration", 10); + spanMap.put("error", 0); + spanMap.put("meta", meta); + spanMap.put("metrics", metrics); + spanMap.put("name", "fakeOperation"); + spanMap.put("parent_id", 0); + spanMap.put("resource", "my-resource"); + spanMap.put("service", "fakeService"); + spanMap.put("span_id", 1); + spanMap.put("start", 100000); + spanMap.put("trace_id", 1); + spanMap.put("type", "fakeType"); + List>> expectedRequestBody = singletonList(singletonList(spanMap)); + assertDeepEquals( + expectedRequestBody, convertList(agentVersion, agent.getLastRequest().getBody())); + } finally { + agent.close(); + } + } + + @TableTest({ + "scenario | agentVersion ", + "v0.3 traces | 'v0.3/traces'", + "v0.4 traces | 'v0.4/traces'", + "v0.5 traces | 'v0.5/traces'" + }) + void testApiResponseListenersSee200Responses(String agentVersion) { + AtomicReference>> agentResponse = new AtomicReference<>(null); + RemoteResponseListener responseListener = + (endpoint, responseJson) -> agentResponse.set(responseJson); + + JavaTestHttpServer agent = + JavaTestHttpServer.httpServer( + s -> + s.handlers( + h -> + h.put( + agentVersion, + api -> { + int status = api.getRequest().getContentLength() > 0 ? 200 : 500; + api.getResponse().status(status).send("{\"hello\":{}}"); + }))); + try { + DDAgentApi client = createAgentApi(agent.getAddress().toString()).api; + client.addResponseListener(responseListener); + List> traces = Arrays.asList(emptyList(), emptyList(), emptyList()); + Payload payload = prepareTraces(agentVersion, traces); + payload.withDroppedTraces(1); + payload.withDroppedTraces(3); + + client.sendSerializedTraces(payload); + + Map> response = agentResponse.get(); + assertTrue(response != null && response.containsKey("hello")); + assertEquals("java", agent.getLastRequest().getHeaders().get("Datadog-Meta-Lang")); + assertEquals( + System.getProperty("java.version", "unknown"), + agent.getLastRequest().getHeaders().get("Datadog-Meta-Lang-Version")); + assertEquals( + "Stubbed-Test-Version", + agent.getLastRequest().getHeaders().get("Datadog-Meta-Tracer-Version")); + assertEquals("3", agent.getLastRequest().getHeaders().get("X-Datadog-Trace-Count")); + assertEquals( + String.valueOf(payload.droppedTraces()), + agent.getLastRequest().getHeaders().get("Datadog-Client-Dropped-P0-Traces")); + assertEquals( + String.valueOf(payload.droppedSpans()), + agent.getLastRequest().getHeaders().get("Datadog-Client-Dropped-P0-Spans")); + } finally { + agent.close(); + } + } + + @Test + void testApiDowngradesToV3IfV04NotAvailable() { + JavaTestHttpServer v3Agent = + JavaTestHttpServer.httpServer( + s -> + s.handlers( + h -> + h.put( + "v0.3/traces", + api -> { + int status = api.getRequest().getContentLength() > 0 ? 200 : 500; + api.getResponse().status(status).send(); + }))); + try { + DDAgentApi client = createAgentApi(v3Agent.getAddress().toString()).api; + Payload payload = prepareTraces("v0.4/traces", emptyList()); + assertTrue(client.sendSerializedTraces(payload).success()); + assertEquals("/v0.3/traces", v3Agent.getLastRequest().getPath()); + } finally { + v3Agent.close(); + } + } + + @TableTest({ + "scenario | endpointVersion | delayTrace | badPort", + "v0.4 ok | 'v0.4' | 0 | false ", + "v0.3 bad port | 'v0.3' | 0 | true ", + "v0.4 short delay | 'v0.4' | 500 | false ", + "v0.3 long delay | 'v0.3' | 30000 | false " + }) + void testApiDowngradesToV3IfTimeoutExceeded( + String endpointVersion, int delayTrace, boolean badPort) { + JavaTestHttpServer agent = + JavaTestHttpServer.httpServer( + s -> + s.handlers( + h -> { + h.put( + "v0.3/traces", + api -> { + int status = api.getRequest().getContentLength() > 0 ? 200 : 500; + api.getResponse().status(status).send(); + }); + h.put( + "v0.4/traces", + api -> { + if (delayTrace > 0) { + try { + Thread.sleep(delayTrace); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + } + } + int status = api.getRequest().getContentLength() > 0 ? 200 : 500; + api.getResponse().status(status).send(); + }); + })); + try { + int port = badPort ? 999 : agent.getAddress().getPort(); + String url = "http://" + agent.getAddress().getHost() + ":" + port; + DDAgentApi client = createAgentApi(url).api; + Payload payload = prepareTraces("v0.4/traces", emptyList()); + Response result = client.sendSerializedTraces(payload); + assertEquals(!badPort, result.success()); + if (!badPort) { + assertEquals("/" + endpointVersion + "/traces", agent.getLastRequest().getPath()); + } + } finally { + agent.close(); + } + } + + // all the tested traces are empty and it just so happens that + // arrays and maps take the same amount of space in messagepack, so + // all the sizes match, except in v0.5 where there is 1 byte for a + // 2 element array header and 1 byte for an empty dictionary + @TableTest({ + "scenario | agentVersion | expectedLength | traceCount", + "v0.4 empty | 'v0.4/traces' | 1 | 0 ", + "v0.4 2 traces | 'v0.4/traces' | 3 | 2 ", + "v0.4 15 traces | 'v0.4/traces' | 16 | 15 ", + "v0.4 16 traces | 'v0.4/traces' | 19 | 16 ", + "v0.4 65535 traces | 'v0.4/traces' | 65538 | 65535 ", + "v0.4 65536 traces | 'v0.4/traces' | 65541 | 65536 ", + "v0.5 empty | 'v0.5/traces' | 3 | 0 ", + "v0.5 2 traces | 'v0.5/traces' | 5 | 2 ", + "v0.5 15 traces | 'v0.5/traces' | 18 | 15 ", + "v0.5 16 traces | 'v0.5/traces' | 21 | 16 ", + "v0.5 65535 traces | 'v0.5/traces' | 65540 | 65535 ", + "v0.5 65536 traces | 'v0.5/traces' | 65543 | 65536 " + }) + void testVerifyContentLength(String agentVersion, long expectedLength, int traceCount) { + List> traces = generateEmptyTraces(traceCount); + AtomicLong receivedContentLength = new AtomicLong(); + JavaTestHttpServer agent = + JavaTestHttpServer.httpServer( + s -> + s.handlers( + h -> + h.put( + agentVersion, + api -> { + receivedContentLength.set(api.getRequest().getContentLength()); + api.getResponse().status(200).send(); + }))); + try { + DDAgentApi client = createAgentApi(agent.getAddress().toString()).api; + Payload payload = prepareTraces(agentVersion, traces); + assertTrue(client.sendSerializedTraces(payload).success()); + assertEquals(expectedLength, receivedContentLength.get()); + } finally { + agent.close(); + } + } + + @Test + void testEmbeddedHttpClientRejectsAsyncRequests() throws Exception { + JavaTestHttpServer agent = newAgent("v0.5/traces"); + try { + AgentApiPair pair = createAgentApi(agent.getAddress().toString()); + pair.discovery.discover(); + Field httpClientField = DDAgentApi.class.getDeclaredField("httpClient"); + httpClientField.setAccessible(true); + OkHttpClient httpClient = (OkHttpClient) httpClientField.get(pair.api); + ExecutorService httpExecutorService = httpClient.dispatcher().executorService(); + assertThrows(RejectedExecutionException.class, () -> httpExecutorService.execute(() -> {})); + assertTrue(httpExecutorService.isShutdown()); + } finally { + agent.close(); + } + } + + @Test + void testMetaStructSupportOnTheEncodedSpans() throws IOException { + String agentVersion = "v0.4/traces"; + JavaTestHttpServer agent = + JavaTestHttpServer.httpServer( + s -> s.handlers(h -> h.put(agentVersion, api -> api.getResponse().send()))); + try { + DDAgentApi client = createAgentApi(agent.getAddress().toString()).api; + DDSpan span = buildSpan(1L, "fakeType", Collections.emptyMap()); + span.setMetaStruct("meta_1", "Hello World!"); + Map meta2 = new HashMap<>(); + meta2.put("Hello", " World!"); + span.setMetaStruct("meta_2", meta2); + Payload payload = prepareTraces(agentVersion, singletonList(singletonList(span))); + assertTrue(client.sendSerializedTraces(payload).success()); + + List>> body = + convertList(agentVersion, agent.getLastRequest().getBody()); + @SuppressWarnings("unchecked") + Map metaStruct = (Map) body.get(0).get(0).get("meta_struct"); + assertEquals(2, metaStruct.size()); + assertEquals("Hello World!", mapper.readValue(metaStruct.get("meta_1"), String.class)); + @SuppressWarnings("unchecked") + Map actualMeta2 = mapper.readValue(metaStruct.get("meta_2"), Map.class); + assertEquals(meta2, actualMeta2); + } finally { + agent.close(); + } + } + + // --- Inner types --- + + static class AgentApiPair { + final DDAgentFeaturesDiscovery discovery; + final DDAgentApi api; + + AgentApiPair(DDAgentFeaturesDiscovery discovery, DDAgentApi api) { + this.discovery = discovery; + this.api = api; + } + } + + static class TracesCapture implements ByteBufferConsumer { + int traceCount; + ByteBuffer buffer; + + @Override + public void accept(int messageCount, ByteBuffer buffer) { + this.buffer = buffer; + this.traceCount = messageCount; + } + } + + // --- Helper methods --- + + AgentApiPair createAgentApi(String url, ProtocolVersion protocolVersion) { + HttpUrl agentUrl = HttpUrl.get(url); + OkHttpClient client = OkHttpUtils.buildHttpClient(agentUrl, 1000); + DDAgentFeaturesDiscovery discovery = + new DDAgentFeaturesDiscovery(client, monitoring, agentUrl, protocolVersion, true, false); + return new AgentApiPair( + discovery, new DDAgentApi(client, agentUrl, discovery, monitoring, false)); + } + + AgentApiPair createAgentApi(String url) { + return createAgentApi(url, V0_5); + } + + Payload prepareTraces(String agentVersion, List> traces) { + TracesCapture traceCapture = new TracesCapture(); + MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(1 << 20, traceCapture)); + + TraceMapper traceMapper; + if ("v1.0/traces".equals(agentVersion)) { + traceMapper = new TraceMapperV1(); + } else if ("v0.5/traces".equals(agentVersion)) { + traceMapper = new TraceMapperV0_5(); + } else { + traceMapper = new TraceMapperV0_4(); + } + + for (List trace : traces) { + packer.format(trace, traceMapper); + } + packer.flush(); + + return traceMapper + .newPayload() + .withBody( + traceCapture.traceCount, + traces.isEmpty() ? ByteBuffer.allocate(0) : traceCapture.buffer); + } + + static List>> convertList(String agentVersion, byte[] bytes) + throws IOException { + if ("v0.5/traces".equals(agentVersion)) { + return convertListV5(bytes); + } + List>> returnVal = + mapper.readValue(bytes, new TypeReference>>>() {}); + for (List> trace : returnVal) { + for (TreeMap span : trace) { + @SuppressWarnings("unchecked") + Map meta = (Map) span.get("meta"); + if (meta != null) { + meta.remove("runtime-id"); + meta.remove("language"); + } + } + } + return returnVal; + } + + static List>> convertListV5(byte[] bytes) throws IOException { + List>> traces = + mapper.readValue(bytes, new TypeReference>>>() {}); + List>> maps = new ArrayList<>(traces.size()); + for (List> trace : traces) { + List> mapTrace = new ArrayList<>(); + for (List span : trace) { + TreeMap map = new TreeMap<>(); + if (!span.isEmpty()) { + map.put("service", span.get(0)); + map.put("name", span.get(1)); + map.put("resource", span.get(2)); + map.put("trace_id", span.get(3)); + map.put("span_id", span.get(4)); + map.put("parent_id", span.get(5)); + map.put("start", span.get(6)); + map.put("duration", span.get(7)); + map.put("error", span.get(8)); + map.put("meta", span.get(9)); + map.put("metrics", span.get(10)); + map.put("type", span.get(11)); + + @SuppressWarnings("unchecked") + Map meta = (Map) map.get("meta"); + if (meta != null) { + meta.remove("runtime-id"); + meta.remove("language"); + } + } + mapTrace.add(map); + } + maps.add(mapTrace); + } + return maps; + } + + static List> generateEmptyTraces(int count) { + List> traces = new ArrayList<>(count); + for (int i = 0; i < count; i++) { + traces.add(emptyList()); + } + return traces; + } + + static void setDurationNano(DDSpan span, long duration) { + try { + Field field = DDSpan.class.getDeclaredField("durationNano"); + field.setAccessible(true); + field.setLong(span, duration); + } catch (NoSuchFieldException | IllegalAccessException e) { + Assertions.fail("Could not set durationNano: " + e.getMessage()); + } + } + + @SuppressWarnings("unchecked") + static void assertDeepEquals(Object expected, Object actual) { + if (expected == null && actual == null) { + return; + } + if (expected == null || actual == null) { + Assertions.fail("Expected " + expected + " but got " + actual); + } + if (expected instanceof Map) { + assertInstanceOf(Map.class, actual, "Expected Map but got " + actual.getClass()); + Map expectedMap = (Map) expected; + Map actualMap = (Map) actual; + assertEquals(expectedMap.size(), actualMap.size(), "Map size mismatch"); + for (Map.Entry entry : expectedMap.entrySet()) { + assertTrue(actualMap.containsKey(entry.getKey()), "Missing key: " + entry.getKey()); + assertDeepEquals(entry.getValue(), actualMap.get(entry.getKey())); + } + } else if (expected instanceof List) { + assertInstanceOf(List.class, actual, "Expected List but got " + actual.getClass()); + List expectedList = (List) expected; + List actualList = (List) actual; + assertEquals(expectedList.size(), actualList.size(), "List size mismatch"); + for (int i = 0; i < expectedList.size(); i++) { + assertDeepEquals(expectedList.get(i), actualList.get(i)); + } + } else if (expected instanceof Number && actual instanceof Number) { + if (expected instanceof Float + || expected instanceof Double + || actual instanceof Float + || actual instanceof Double) { + assertEquals(((Number) expected).doubleValue(), ((Number) actual).doubleValue(), 0.0001); + } else { + assertEquals(((Number) expected).longValue(), ((Number) actual).longValue()); + } + } else { + assertEquals(expected, actual); + } + } +} diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/DDAgentWriterCombinedTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/DDAgentWriterCombinedTest.java new file mode 100644 index 00000000000..284d40b1736 --- /dev/null +++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/DDAgentWriterCombinedTest.java @@ -0,0 +1,837 @@ +package datadog.trace.common.writer; + +import static datadog.trace.api.ProtocolVersion.V0_5; +import static datadog.trace.api.config.GeneralConfig.EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED; +import static datadog.trace.common.writer.ddagent.Prioritization.ENSURE_TRACE; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.argThat; +import static org.mockito.Mockito.clearInvocations; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; +import static org.mockito.Mockito.when; + +import datadog.communication.ddagent.DDAgentFeaturesDiscovery; +import datadog.communication.http.OkHttpUtils; +import datadog.communication.serialization.FlushingBuffer; +import datadog.communication.serialization.msgpack.MsgPackWriter; +import datadog.metrics.api.statsd.StatsDClient; +import datadog.metrics.impl.MonitoringImpl; +import datadog.trace.agent.test.server.http.JavaTestHttpServer; +import datadog.trace.api.Config; +import datadog.trace.api.ProcessTags; +import datadog.trace.common.writer.ddagent.DDAgentApi; +import datadog.trace.common.writer.ddagent.TraceMapper; +import datadog.trace.common.writer.ddagent.TraceMapperV0_4; +import datadog.trace.common.writer.ddagent.TraceMapperV0_5; +import datadog.trace.core.CoreTracer; +import datadog.trace.core.DDCoreJavaSpecification; +import datadog.trace.core.DDSpan; +import datadog.trace.core.monitor.HealthMetrics; +import datadog.trace.core.monitor.TracerHealthMetrics; +import datadog.trace.junit.utils.config.WithConfig; +import datadog.trace.test.util.Flaky; +import java.io.IOException; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.Phaser; +import java.util.concurrent.Semaphore; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; +import okhttp3.HttpUrl; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; +import org.mockito.Mockito; +import org.tabletest.junit.TableTest; + +@Timeout(value = 10, unit = TimeUnit.SECONDS) +class DDAgentWriterCombinedTest extends DDCoreJavaSpecification { + + // DDAgentWriter default buffer size (matches private DDAgentWriter.BUFFER_SIZE) + private static final int AGENT_WRITER_BUFFER_SIZE = 1024; + + MonitoringImpl monitoring = new MonitoringImpl(StatsDClient.NO_OP, 1, TimeUnit.SECONDS); + Phaser phaser = new Phaser(); + + // Only used to create spans + CoreTracer dummyTracer; + + @BeforeEach + void setup() { + // Register for two threads. + phaser.register(); + phaser.register(); + dummyTracer = tracerBuilder().writer(new ListWriter()).build(); + } + + @AfterEach + void cleanup() { + if (dummyTracer != null) { + dummyTracer.close(); + } + } + + @BeforeEach + void resetProcessTags() { + // Sync ProcessTags.enabled with the current Config (which may be modified by @WithConfig) + ProcessTags.reset(Config.get()); + } + + List createMinimalTrace() { + // Use buildSpan from DDCoreJavaSpecification to create a real DDSpan with minimal fields + DDSpan span = buildSpan(0L, "", Collections.emptyMap()); + return Collections.singletonList(span); + } + + @Test + void noInteractionsBecauseOfInitialFlush() { + DDAgentApi api = Mockito.mock(DDAgentApi.class); + DDAgentWriter writer = + DDAgentWriter.builder() + .agentApi(api) + .traceBufferSize(8) + .monitoring(monitoring) + .flushIntervalMilliseconds(-1) + .build(); + writer.start(); + + writer.flush(); + + // then: 0 * _ (no interactions at all on mocked api) + verifyNoMoreInteractions(api); + + writer.close(); + } + + @TableTest({ + "scenario | agentVersion ", + "v0.3 | 'v0.3/traces'", + "v0.4 | 'v0.4/traces'", + "v0.5 | 'v0.5/traces'" + }) + void testHappyPath(String agentVersion) { + DDAgentApi api = mock(DDAgentApi.class); + DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class); + DDAgentWriter writer = + DDAgentWriter.builder() + .featureDiscovery(discovery) + .agentApi(api) + .traceBufferSize(1024) + .monitoring(monitoring) + .flushIntervalMilliseconds(-1) + .build(); + writer.start(); + DDSpan span = (DDSpan) dummyTracer.buildSpan("datadog", "fakeOperation").start(); + List trace = Collections.singletonList(span); + + when(discovery.getTraceEndpoint()).thenReturn(agentVersion); + when(api.sendSerializedTraces(argThat(payload -> payload.traceCount() == 2))) + .thenReturn(RemoteApi.Response.success(200)); + + writer.write(trace); + writer.write(trace); + writer.flush(); + + verify(discovery, times(2)).getTraceEndpoint(); + verify(api, times(1)).sendSerializedTraces(argThat(payload -> payload.traceCount() == 2)); + verifyNoMoreInteractions(api, discovery); + + writer.close(); + } + + @TableTest({ + "scenario | agentVersion ", + "v0.3 | 'v0.3/traces'", + "v0.4 | 'v0.4/traces'", + "v0.5 | 'v0.5/traces'" + }) + void testFloodOfTraces(String agentVersion) { + // bufferSize = 1024; traceCount = 100 (shouldn't trigger payload, but bigger than disruptor + // size) + int bufferSize = 1024; + int traceCount = 100; + + DDAgentApi api = mock(DDAgentApi.class); + DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class); + DDAgentWriter writer = + DDAgentWriter.builder() + .featureDiscovery(discovery) + .agentApi(api) + .traceBufferSize(bufferSize) + .monitoring(monitoring) + .flushIntervalMilliseconds(-1) + .build(); + writer.start(); + DDSpan span = (DDSpan) dummyTracer.buildSpan("datadog", "fakeOperation").start(); + List trace = Collections.singletonList(span); + + when(discovery.getTraceEndpoint()).thenReturn(agentVersion); + when(api.sendSerializedTraces(argThat(payload -> payload.traceCount() <= traceCount))) + .thenReturn(RemoteApi.Response.success(200)); + + for (int i = 1; i <= traceCount; i++) { + writer.write(trace); + } + writer.flush(); + + verify(discovery, times(2)).getTraceEndpoint(); + verify(api, times(1)) + .sendSerializedTraces(argThat(payload -> payload.traceCount() <= traceCount)); + verifyNoMoreInteractions(api, discovery); + + writer.close(); + } + + @TableTest({ + "scenario | agentVersion ", + "v0.3 | 'v0.3/traces'", + "v0.4 | 'v0.4/traces'", + "v0.5 | 'v0.5/traces'" + }) + void testFlushByTime(String agentVersion) throws Exception { + HealthMetrics healthMetrics = mock(HealthMetrics.class); + DDAgentApi api = mock(DDAgentApi.class); + DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class); + DDAgentWriter writer = + DDAgentWriter.builder() + .featureDiscovery(discovery) + .agentApi(api) + .healthMetrics(healthMetrics) + .monitoring(monitoring) + .flushIntervalMilliseconds(1000) + .build(); + writer.start(); + DDSpan span = (DDSpan) dummyTracer.buildSpan("datadog", "fakeOperation").start(); + List trace = Collections.nCopies(10, span); + + when(discovery.getTraceEndpoint()).thenReturn(agentVersion); + when(api.sendSerializedTraces(argThat(payload -> payload.traceCount() == 5))) + .thenReturn(RemoteApi.Response.success(200)); + + // stub onSend to arrive at phaser + doAnswer( + invocation -> { + phaser.arrive(); + return null; + }) + .when(healthMetrics) + .onSend(anyInt(), anyInt(), any()); + + for (int i = 1; i <= 5; i++) { + writer.write(trace); + } + phaser.awaitAdvanceInterruptibly(phaser.arriveAndDeregister()); + + verify(discovery, times(2)).getTraceEndpoint(); + verify(healthMetrics, times(1)).onSerialize(anyInt()); + verify(api, times(1)).sendSerializedTraces(argThat(payload -> payload.traceCount() == 5)); + // _ * healthMetrics.onPublish(_, _) means any number, so don't verify count + verify(healthMetrics).onSend(anyInt(), anyInt(), any()); + verifyNoMoreInteractions(api, discovery); + + writer.close(); + } + + @Timeout(value = 30, unit = TimeUnit.SECONDS) + @WithConfig(key = EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, value = "false") + @TableTest({ + "scenario | agentVersion ", + "v0.3 | 'v0.3/traces'", + "v0.4 | 'v0.4/traces'", + "v0.5 | 'v0.5/traces'" + }) + void testDefaultBufferSizeFor(String agentVersion) { + // setup: disable process tags since they are only written on the first span + // and it will break the trace size estimation + List minimalTrace = createMinimalTrace(); + DDAgentApi api = mock(DDAgentApi.class); + DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class); + DDAgentWriter writer = + DDAgentWriter.builder() + .featureDiscovery(discovery) + .agentApi(api) + .traceBufferSize(AGENT_WRITER_BUFFER_SIZE) + .prioritization(ENSURE_TRACE) + .monitoring(monitoring) + .flushIntervalMilliseconds(-1) + .build(); + writer.start(); + + TraceMapper mapper = + agentVersion.equals("v0.5/traces") ? new TraceMapperV0_5() : new TraceMapperV0_4(); + int traceSize = calculateSize(minimalTrace, mapper); + int maxedPayloadTraceCount = (mapper.messageBufferSize() / traceSize); + + when(discovery.getTraceEndpoint()).thenReturn(agentVersion); + when(api.sendSerializedTraces( + argThat(payload -> payload != null && payload.traceCount() == maxedPayloadTraceCount))) + .thenReturn(RemoteApi.Response.success(200)); + when(api.sendSerializedTraces(argThat(payload -> payload != null && payload.traceCount() == 1))) + .thenReturn(RemoteApi.Response.success(200)); + + for (int i = 0; i <= maxedPayloadTraceCount; i++) { + writer.write(minimalTrace); + } + writer.flush(); + + verify(discovery, times(2)).getTraceEndpoint(); + verify(api, times(1)) + .sendSerializedTraces( + argThat(payload -> payload != null && payload.traceCount() == maxedPayloadTraceCount)); + verify(api, times(1)) + .sendSerializedTraces(argThat(payload -> payload != null && payload.traceCount() == 1)); + verifyNoMoreInteractions(api, discovery); + + writer.close(); + } + + @Test + void checkThatThereAreNoInteractionsAfterClose() { + HealthMetrics healthMetrics = mock(HealthMetrics.class); + DDAgentApi api = mock(DDAgentApi.class); + DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class); + DDAgentWriter writer = + DDAgentWriter.builder() + .featureDiscovery(discovery) + .agentApi(api) + .healthMetrics(healthMetrics) + .monitoring(monitoring) + .build(); + writer.start(); + // Clear invocations from start() (Spock only counts interactions in when: blocks) + clearInvocations(healthMetrics, api, discovery); + + writer.close(); + writer.write(Collections.emptyList()); + writer.flush(); + + // then: this will be checked during flushing + verify(healthMetrics, times(1)).onFailedPublish(anyInt(), anyInt()); + verify(healthMetrics, times(1)).onFlush(any(Boolean.class)); + verify(healthMetrics, times(1)).onShutdown(any(Boolean.class)); + verify(healthMetrics, times(1)).close(); + verifyNoMoreInteractions(healthMetrics, api, discovery); + + writer.close(); + } + + @TableTest({ + "scenario | agentVersion ", + "v0.3 | 'v0.3/traces'", + "v0.4 | 'v0.4/traces'", + "v0.5 | 'v0.5/traces'" + }) + void monitorHappyPath(String agentVersion) { + HealthMetrics healthMetrics = mock(HealthMetrics.class); + List minimalTrace = createMinimalTrace(); + + // DQH -- need to set-up a dummy agent for the final send callback to work + JavaTestHttpServer agent = + JavaTestHttpServer.httpServer( + server -> + server.handlers( + h -> h.put(agentVersion, api -> api.getResponse().status(200).send()))); + try { + HttpUrl agentUrl = HttpUrl.get(agent.getAddress()); + okhttp3.OkHttpClient client = OkHttpUtils.buildHttpClient(agentUrl, 1000); + DDAgentFeaturesDiscovery discovery = + new DDAgentFeaturesDiscovery(client, monitoring, agentUrl, V0_5, true, false); + DDAgentApi api = new DDAgentApi(client, agentUrl, discovery, monitoring, true); + DDAgentWriter writer = + DDAgentWriter.builder() + .featureDiscovery(discovery) + .agentApi(api) + .monitoring(monitoring) + .healthMetrics(healthMetrics) + .build(); + + // start + writer.start(); + + verify(healthMetrics, times(1)).onStart((int) writer.getCapacity()); + + // write and flush + writer.write(minimalTrace); + writer.flush(); + + verify(healthMetrics, times(1)).onPublish(any(), anyInt()); + verify(healthMetrics, times(1)).onSerialize(anyInt()); + verify(healthMetrics, times(1)).onFlush(false); + verify(healthMetrics, times(1)) + .onSend( + anyInt(), + anyInt(), + argThat( + response -> + response.success() + && response.status().isPresent() + && response.status().getAsInt() == 200)); + + writer.close(); + + verify(healthMetrics, times(1)).onShutdown(true); + } finally { + agent.close(); + } + } + + @TableTest({ + "scenario | agentVersion ", + "v0.3 | 'v0.3/traces'", + "v0.4 | 'v0.4/traces'", + "v0.5 | 'v0.5/traces'" + }) + void monitorAgentReturnsError(String agentVersion) { + HealthMetrics healthMetrics = mock(HealthMetrics.class); + List minimalTrace = createMinimalTrace(); + + // DQH -- need to set-up a dummy agent for the final send callback to work + final boolean[] first = {true}; + JavaTestHttpServer agent = + JavaTestHttpServer.httpServer( + server -> + server.handlers( + h -> + h.put( + agentVersion, + api -> { + // DQH - DDApi sniffs for end point existence, so respond with 200 the + // first time + if (first[0]) { + api.getResponse().status(200).send(); + first[0] = false; + } else { + api.getResponse().status(500).send(); + } + }))); + try { + HttpUrl agentUrl = HttpUrl.get(agent.getAddress()); + okhttp3.OkHttpClient client = OkHttpUtils.buildHttpClient(agentUrl, 1000); + DDAgentFeaturesDiscovery discovery = + new DDAgentFeaturesDiscovery(client, monitoring, agentUrl, V0_5, true, false); + DDAgentApi api = new DDAgentApi(client, agentUrl, discovery, monitoring, true); + DDAgentWriter writer = + DDAgentWriter.builder() + .featureDiscovery(discovery) + .agentApi(api) + .monitoring(monitoring) + .healthMetrics(healthMetrics) + .build(); + + // start + writer.start(); + + verify(healthMetrics, times(1)).onStart((int) writer.getCapacity()); + + // write and flush + writer.write(minimalTrace); + writer.flush(); + + verify(healthMetrics, times(1)).onPublish(any(), anyInt()); + verify(healthMetrics, times(1)).onSerialize(anyInt()); + verify(healthMetrics, times(1)).onFlush(false); + verify(healthMetrics, times(1)) + .onFailedSend( + anyInt(), + anyInt(), + argThat( + response -> + !response.success() + && response.status().isPresent() + && response.status().getAsInt() == 500)); + + writer.close(); + + verify(healthMetrics, times(1)).onShutdown(true); + } finally { + agent.close(); + } + } + + @TableTest({ + "scenario | agentVersion ", + "v0.3 | 'v0.3/traces'", + "v0.4 | 'v0.4/traces'", + "v0.5 | 'v0.5/traces'" + }) + void unreachableAgentTest(String agentVersion) { + HealthMetrics healthMetrics = mock(HealthMetrics.class); + List minimalTrace = createMinimalTrace(); + DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class); + when(discovery.getTraceEndpoint()).thenReturn(agentVersion); + DDAgentApi api = mock(DDAgentApi.class); + // simulating a communication failure to a server + when(api.sendSerializedTraces(any())) + .thenReturn(RemoteApi.Response.failed(new IOException("comm error"))); + + DDAgentWriter writer = + DDAgentWriter.builder() + .featureDiscovery(discovery) + .agentApi(api) + .monitoring(monitoring) + .healthMetrics(healthMetrics) + .build(); + + // start + writer.start(); + + verify(healthMetrics, times(1)).onStart((int) writer.getCapacity()); + + // write and flush + writer.write(minimalTrace); + writer.flush(); + + // then: if we know there's no agent, we'll drop the traces before serialising them + // but we also know that there's nowhere to send health metrics to + verify(healthMetrics, times(1)).onPublish(any(), anyInt()); + verify(healthMetrics, times(1)).onFlush(false); + + writer.close(); + + verify(healthMetrics, times(1)).onShutdown(true); + } + + @Flaky("If execution is too slow, the http client timeout may trigger") + @TableTest({ + "scenario | agentVersion ", + "v0.3 | 'v0.3/traces'", + "v0.4 | 'v0.4/traces'", + "v0.5 | 'v0.5/traces'" + }) + void slowResponseTest(String agentVersion) throws Exception { + int numWritten = 0; + AtomicInteger numFlushes = new AtomicInteger(0); + AtomicInteger numPublished = new AtomicInteger(0); + AtomicInteger numFailedPublish = new AtomicInteger(0); + AtomicInteger numRequests = new AtomicInteger(0); + AtomicInteger numFailedRequests = new AtomicInteger(0); + + Semaphore responseSemaphore = new Semaphore(1); + + // Need to set-up a dummy agent for the final send callback to work + JavaTestHttpServer agent = + JavaTestHttpServer.httpServer( + server -> + server.handlers( + h -> + h.put( + agentVersion, + api -> { + responseSemaphore.acquire(); + try { + api.getResponse().status(200).send(); + } finally { + responseSemaphore.release(); + } + }))); + + // This test focuses just on failed publish, so not verifying every callback + HealthMetrics healthMetrics = mock(HealthMetrics.class); + doAnswer( + invocation -> { + numPublished.incrementAndGet(); + return null; + }) + .when(healthMetrics) + .onPublish(any(), anyInt()); + doAnswer( + invocation -> { + numFailedPublish.incrementAndGet(); + return null; + }) + .when(healthMetrics) + .onFailedPublish(anyInt(), anyInt()); + doAnswer( + invocation -> { + numFlushes.incrementAndGet(); + return null; + }) + .when(healthMetrics) + .onFlush(any(Boolean.class)); + doAnswer( + invocation -> { + numRequests.incrementAndGet(); + return null; + }) + .when(healthMetrics) + .onSend(anyInt(), anyInt(), any()); + doAnswer( + invocation -> { + numFailedRequests.incrementAndGet(); + return null; + }) + .when(healthMetrics) + .onFailedSend(anyInt(), anyInt(), any()); + + int bufferSize = 16; + List minimalTrace = createMinimalTrace(); + DDAgentWriter writer = + DDAgentWriter.builder() + .traceAgentProtocolVersion(V0_5) + .traceAgentPort(agent.getAddress().getPort()) + .monitoring(monitoring) + .healthMetrics(healthMetrics) + .traceBufferSize(bufferSize) + .build(); + writer.start(); + + // gate responses + responseSemaphore.acquire(); + + try { + // when: write a single trace and flush + // with responseSemaphore held, the response is blocked but may still time out + writer.write(minimalTrace); + numWritten += 1; + + // sanity check coordination mechanism of test + // release to allow response to be generated + responseSemaphore.release(); + writer.flush(); + + // reacquire semaphore to stall further responses + responseSemaphore.acquire(); + + assertEquals(0, numFailedPublish.get()); + assertEquals(numWritten, numPublished.get()); + assertEquals(numWritten, numPublished.get() + numFailedPublish.get()); + assertEquals(1, numFlushes.get()); + + // when: send many traces to fill the sender queue... + // loop until outstanding requests > finished requests + while (writer.traceProcessingWorker.getRemainingCapacity() > 0 + || numFailedPublish.get() == 0) { + writer.write(minimalTrace); + numWritten += 1; + } + + assertTrue(numFailedPublish.get() > 0); + assertEquals(numWritten, numPublished.get() + numFailedPublish.get()); + + // with both disruptor & queue full, should reject everything + int expectedRejects = 100; + for (int i = 1; i <= expectedRejects; i++) { + writer.write(minimalTrace); + numWritten += 1; + } + + assertEquals(numWritten, numPublished.get() + numFailedPublish.get()); + } finally { + responseSemaphore.release(); + writer.close(); + agent.close(); + } + } + + @TableTest({ + "scenario | agentVersion ", + "v0.3 | 'v0.3/traces'", + "v0.4 | 'v0.4/traces'", + "v0.5 | 'v0.5/traces'" + }) + void multiThreaded(String agentVersion) throws Exception { + AtomicInteger numPublished = new AtomicInteger(0); + AtomicInteger numFailedPublish = new AtomicInteger(0); + AtomicInteger numRepSent = new AtomicInteger(0); + + List minimalTrace = createMinimalTrace(); + + // Need to set-up a dummy agent for the final send callback to work + JavaTestHttpServer agent = + JavaTestHttpServer.httpServer( + server -> + server.handlers( + h -> h.put(agentVersion, api -> api.getResponse().status(200).send()))); + + // This test focuses just on failed publish, so not verifying every callback + HealthMetrics healthMetrics = mock(HealthMetrics.class); + doAnswer( + invocation -> { + numPublished.incrementAndGet(); + return null; + }) + .when(healthMetrics) + .onPublish(any(), anyInt()); + doAnswer( + invocation -> { + numFailedPublish.incrementAndGet(); + return null; + }) + .when(healthMetrics) + .onFailedPublish(anyInt(), anyInt()); + doAnswer( + invocation -> { + int repCount = invocation.getArgument(0); + numRepSent.addAndGet(repCount); + return null; + }) + .when(healthMetrics) + .onSend(anyInt(), anyInt(), any()); + + DDAgentWriter writer = + DDAgentWriter.builder() + .traceAgentProtocolVersion(V0_5) + .traceAgentPort(agent.getAddress().getPort()) + .monitoring(monitoring) + .healthMetrics(healthMetrics) + .build(); + writer.start(); + + try { + Runnable producer = + () -> { + for (int i = 1; i <= 100; i++) { + writer.write(minimalTrace); + } + }; + + Thread t1 = new Thread(producer); + t1.start(); + + Thread t2 = new Thread(producer); + t2.start(); + + t1.join(); + t2.join(); + + writer.flush(); + + // then: conditions.eventually { assert numPublished.get() == 200 && numRepSent.get() == 200 } + int totalTraces = 100 + 100; + long deadline = System.currentTimeMillis() + 5000; + while (System.currentTimeMillis() < deadline) { + if (numPublished.get() == totalTraces && numRepSent.get() == totalTraces) { + break; + } + Thread.sleep(50); + } + assertEquals(totalTraces, numPublished.get()); + assertEquals(totalTraces, numRepSent.get()); + } finally { + writer.close(); + agent.close(); + } + } + + @TableTest({ + "scenario | agentVersion ", + "v0.3 | 'v0.3/traces'", + "v0.4 | 'v0.4/traces'", + "v0.5 | 'v0.5/traces'" + }) + void statsdSuccess(String agentVersion) { + AtomicInteger numTracesAccepted = new AtomicInteger(0); + AtomicInteger numRequests = new AtomicInteger(0); + AtomicInteger numResponses = new AtomicInteger(0); + + List minimalTrace = createMinimalTrace(); + + // Need to set-up a dummy agent for the final send callback to work + JavaTestHttpServer agent = + JavaTestHttpServer.httpServer( + server -> + server.handlers( + h -> h.put(agentVersion, api -> api.getResponse().status(200).send()))); + + HealthMetrics healthMetrics = mock(HealthMetrics.class); + doAnswer( + invocation -> { + numTracesAccepted.incrementAndGet(); + return null; + }) + .when(healthMetrics) + .onPublish(any(), anyInt()); + doAnswer( + invocation -> { + numRequests.incrementAndGet(); + numResponses.incrementAndGet(); + return null; + }) + .when(healthMetrics) + .onSend(anyInt(), anyInt(), any()); + DDAgentWriter writer = + DDAgentWriter.builder() + .agentHost(agent.getAddress().getHost()) + .traceAgentProtocolVersion(V0_5) + .traceAgentPort(agent.getAddress().getPort()) + .monitoring(monitoring) + .healthMetrics(healthMetrics) + .build(); + writer.start(); + + try { + writer.write(minimalTrace); + writer.flush(); + + assertEquals(1, numTracesAccepted.get()); + assertEquals(1, numRequests.get()); + assertEquals(1, numResponses.get()); + } finally { + agent.close(); + writer.close(); + } + } + + @Test + void statsdCommFailure() throws Exception { + List minimalTrace = createMinimalTrace(); + + DDAgentApi api = Mockito.mock(DDAgentApi.class); + when(api.sendSerializedTraces(any())) + .thenReturn(RemoteApi.Response.failed(new IOException("comm error"))); + + CountDownLatch latch = new CountDownLatch(2); + StatsDClient statsd = mock(StatsDClient.class); + TracerHealthMetrics healthMetrics = new TracerHealthMetrics(statsd, 100, TimeUnit.MILLISECONDS); + DDAgentWriter writer = + DDAgentWriter.builder() + .traceAgentProtocolVersion(V0_5) + .agentApi(api) + .monitoring(monitoring) + .healthMetrics(healthMetrics) + .build(); + healthMetrics.start(); + writer.start(); + + // stub statsd.count for latch coordination - called with varargs String... tags + doAnswer( + invocation -> { + latch.countDown(); + return null; + }) + .when(statsd) + .count(anyString(), anyLong()); + + writer.write(minimalTrace); + writer.flush(); + latch.await(10, TimeUnit.SECONDS); + + verify(statsd, times(1)).count("api.requests.total", 1L); + verify(statsd, times(0)).incrementCounter("api.responses.total"); + verify(statsd, times(1)).count("api.errors.total", 1L); + + writer.close(); + healthMetrics.close(); + } + + static int calculateSize(List trace, TraceMapper mapper) { + AtomicInteger size = new AtomicInteger(); + MsgPackWriter packer = + new MsgPackWriter( + new FlushingBuffer( + 1024, (messageCount, buffer) -> size.set(buffer.limit() - buffer.position()))); + packer.format(trace, mapper); + packer.flush(); + return size.get(); + } +} diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/DDAgentWriterTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/DDAgentWriterTest.java new file mode 100644 index 00000000000..8aeea35d6f2 --- /dev/null +++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/DDAgentWriterTest.java @@ -0,0 +1,226 @@ +package datadog.trace.common.writer; + +import static datadog.trace.common.writer.ddagent.PrioritizationStrategy.PublishResult.ENQUEUED_FOR_SERIALIZATION; +import static datadog.trace.common.writer.ddagent.PrioritizationStrategy.PublishResult.ENQUEUED_FOR_SINGLE_SPAN_SAMPLING; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.clearInvocations; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; +import static org.mockito.Mockito.when; + +import datadog.communication.ddagent.DDAgentFeaturesDiscovery; +import datadog.metrics.api.statsd.StatsDClient; +import datadog.metrics.impl.MonitoringImpl; +import datadog.trace.common.writer.ddagent.DDAgentApi; +import datadog.trace.common.writer.ddagent.DDAgentMapperDiscovery; +import datadog.trace.common.writer.ddagent.PrioritizationStrategy.PublishResult; +import datadog.trace.core.CoreTracer; +import datadog.trace.core.DDCoreJavaSpecification; +import datadog.trace.core.DDSpan; +import datadog.trace.core.monitor.HealthMetrics; +import datadog.trace.core.propagation.PropagationTags; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.TimeUnit; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.tabletest.junit.TableTest; + +class DDAgentWriterTest extends DDCoreJavaSpecification { + + HealthMetrics monitor = mock(HealthMetrics.class); + TraceProcessingWorker worker = mock(TraceProcessingWorker.class); + DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class); + DDAgentApi api = mock(DDAgentApi.class); + MonitoringImpl monitoring = new MonitoringImpl(StatsDClient.NO_OP, 1, TimeUnit.SECONDS); + PayloadDispatcherImpl dispatcher = + new PayloadDispatcherImpl(new DDAgentMapperDiscovery(discovery), api, monitor, monitoring); + DDAgentWriter writer = new DDAgentWriter(worker, dispatcher, monitor, 1, TimeUnit.SECONDS, false); + + // Only used to create spans + CoreTracer dummyTracer; + + @BeforeEach + void setup() { + dummyTracer = tracerBuilder().writer(new ListWriter()).build(); + } + + @AfterEach + void cleanup() { + writer.close(); + if (dummyTracer != null) { + dummyTracer.close(); + } + } + + @Test + void testWriterBuilder() { + DDAgentWriter builtWriter = DDAgentWriter.builder().build(); + + assertNotNull(builtWriter); + } + + @Test + void testWriterStart() { + int capacity = 5; + + when(worker.getCapacity()).thenReturn(capacity); + writer.start(); + + verify(monitor).start(); + verify(worker).start(); + verify(worker).getCapacity(); + verify(monitor).onStart(capacity); + verifyNoMoreInteractions(monitor, worker, discovery, api); + } + + @Test + void testWriterStartClosed() { + writer.close(); + clearInvocations(monitor, worker, discovery, api); + + writer.start(); + + verifyNoMoreInteractions(monitor, worker, discovery, api); + } + + @Test + void testWriterFlush() { + when(worker.flush(1, TimeUnit.SECONDS)).thenReturn(true, false); + + // first flush succeeds + writer.flush(); + + // monitor is notified + verify(worker).flush(1, TimeUnit.SECONDS); + verify(monitor).onFlush(false); + verifyNoMoreInteractions(monitor, worker, discovery, api); + + clearInvocations(monitor, worker, discovery, api); + + // second flush returns false + writer.flush(); + + // no additional monitor notifications + verify(worker).flush(1, TimeUnit.SECONDS); + verifyNoMoreInteractions(monitor, worker, discovery, api); + } + + @Test + void testWriterFlushClosed() { + writer.close(); + clearInvocations(monitor, worker, discovery, api); + + writer.flush(); + + verifyNoMoreInteractions(monitor, worker, discovery, api); + } + + @Test + void testWriterWritePublishSucceeds() { + List trace = + Collections.singletonList( + (DDSpan) dummyTracer.buildSpan("datadog", "fakeOperation").start()); + + // publish succeeds + when(worker.publish(any(), anyInt(), eq(trace))).thenReturn(ENQUEUED_FOR_SERIALIZATION); + writer.write(trace); + + // monitor is notified of successful publication + verify(worker).publish(any(), anyInt(), eq(trace)); + verify(monitor).onPublish(any(), anyInt()); + verifyNoMoreInteractions(monitor, worker, discovery, api); + } + + @Test + void testWriterWritePublishForSingleSpanSampling() { + List trace = + Collections.singletonList( + (DDSpan) dummyTracer.buildSpan("datadog", "fakeOperation").start()); + + // publish succeeds (single span sampling) + when(worker.publish(any(), anyInt(), eq(trace))).thenReturn(ENQUEUED_FOR_SINGLE_SPAN_SAMPLING); + writer.write(trace); + + // monitor should not call onPublish for single span sampling + verify(worker).publish(any(), anyInt(), eq(trace)); + verifyNoMoreInteractions(monitor, worker, discovery, api); + } + + @TableTest({ + "scenario | publishResult ", + "buffer overflow | DROPPED_BUFFER_OVERFLOW", + "dropped by policy | DROPPED_BY_POLICY " + }) + void testWriterWritePublishFails(PublishResult publishResult) { + List trace = + Collections.singletonList( + (DDSpan) dummyTracer.buildSpan("datadog", "fakeOperation").start()); + + // publish fails + when(worker.publish(any(), anyInt(), eq(trace))).thenReturn(publishResult); + writer.write(trace); + + // monitor is notified of unsuccessful publication + verify(worker).publish(any(), anyInt(), eq(trace)); + verify(monitor).onFailedPublish(anyInt(), anyInt()); + verifyNoMoreInteractions(monitor, worker, discovery, api); + } + + @Test + void testEmptyTracesShouldBeReportedAsFailures() { + // trace is empty + writer.write(Collections.emptyList()); + + // monitor is notified of unsuccessful publication + verify(monitor).onFailedPublish(anyInt(), anyInt()); + verifyNoMoreInteractions(monitor, worker, discovery, api); + } + + @Test + void testWriterWriteClosed() { + writer.close(); + clearInvocations(monitor, worker, discovery, api); + List trace = + Collections.singletonList( + (DDSpan) dummyTracer.buildSpan("datadog", "fakeOperation").start()); + + writer.write(trace); + + verify(monitor).onFailedPublish(anyInt(), anyInt()); + verifyNoMoreInteractions(monitor, worker, discovery, api); + } + + @TableTest({ + "scenario | publishResult ", + "dropped by policy | DROPPED_BY_POLICY ", + "buffer overflow | DROPPED_BUFFER_OVERFLOW" + }) + void testDroppedTraceIsCounted(PublishResult publishResult) { + // setup - use local mocks to avoid interference with instance-level mocks + TraceProcessingWorker localWorker = mock(TraceProcessingWorker.class); + HealthMetrics localMonitor = mock(HealthMetrics.class); + PayloadDispatcherImpl localDispatcher = mock(PayloadDispatcherImpl.class); + DDAgentWriter localWriter = + new DDAgentWriter(localWorker, localDispatcher, localMonitor, 1, TimeUnit.SECONDS, false); + + DDSpan p0 = newSpan(); + List trace = java.util.Arrays.asList(p0, newSpan()); + + when(localWorker.publish(eq(trace.get(0)), anyInt(), eq(trace))).thenReturn(publishResult); + localWriter.write(trace); + + verify(localWorker).publish(eq(trace.get(0)), anyInt(), eq(trace)); + verify(localDispatcher).onDroppedTrace(trace.size()); + } + + DDSpan newSpan() { + // Use the UNSET-priority variant so setSamplingPriority() can change the priority later + return buildSpan(0L, "test.tag", "test.value", PropagationTags.factory().empty()); + } +} diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/DDIntakeWriterCombinedTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/DDIntakeWriterCombinedTest.java new file mode 100644 index 00000000000..56883149858 --- /dev/null +++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/DDIntakeWriterCombinedTest.java @@ -0,0 +1,825 @@ +package datadog.trace.common.writer; + +import static datadog.trace.common.writer.ddagent.Prioritization.ENSURE_TRACE; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.argThat; +import static org.mockito.Mockito.clearInvocations; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; + +import datadog.communication.http.OkHttpUtils; +import datadog.communication.serialization.FlushingBuffer; +import datadog.communication.serialization.msgpack.MsgPackWriter; +import datadog.metrics.api.statsd.StatsDClient; +import datadog.metrics.impl.MonitoringImpl; +import datadog.trace.agent.test.server.http.JavaTestHttpServer; +import datadog.trace.api.civisibility.CiVisibilityWellKnownTags; +import datadog.trace.api.intake.TrackType; +import datadog.trace.common.writer.ddintake.DDIntakeApi; +import datadog.trace.common.writer.ddintake.DDIntakeMapperDiscovery; +import datadog.trace.core.DDCoreJavaSpecification; +import datadog.trace.core.DDSpan; +import datadog.trace.core.monitor.HealthMetrics; +import datadog.trace.core.monitor.TracerHealthMetrics; +import datadog.trace.test.util.Flaky; +import java.io.IOException; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.Phaser; +import java.util.concurrent.Semaphore; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; +import okhttp3.HttpUrl; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; + +@Timeout(value = 10, unit = TimeUnit.SECONDS) +class DDIntakeWriterCombinedTest extends DDCoreJavaSpecification { + + private static final CiVisibilityWellKnownTags wellKnownTags = + new CiVisibilityWellKnownTags( + "my-runtime-id", + "my-env", + "my-language", + "my-runtime-name", + "my-runtime-version", + "my-runtime-vendor", + "my-os-arch", + "my-os-platform", + "my-os-version", + "false"); + + MonitoringImpl monitoring = new MonitoringImpl(StatsDClient.NO_OP, 1, TimeUnit.SECONDS); + Phaser phaser = new Phaser(); + + // Only used to create spans + datadog.trace.core.CoreTracer dummyTracer; + + @BeforeEach + void setup() { + // Register for two threads. + phaser.register(); + phaser.register(); + dummyTracer = tracerBuilder().writer(new ListWriter()).build(); + } + + @AfterEach + void cleanup() { + if (dummyTracer != null) { + dummyTracer.close(); + } + } + + List createMinimalTrace() { + // Use buildSpan from DDCoreJavaSpecification to create a real DDSpan with minimal fields + DDSpan span = buildSpan(0L, "", Collections.emptyMap()); + return Collections.singletonList(span); + } + + @Test + void noInteractionsBecauseOfInitialFlush() { + DDIntakeApi api = mock(DDIntakeApi.class); + DDIntakeWriter writer = + DDIntakeWriter.builder() + .addTrack(TrackType.NOOP, api) + .traceBufferSize(8) + .monitoring(monitoring) + .flushIntervalMilliseconds(-1) + .alwaysFlush(false) + .build(); + writer.start(); + // Clear setup-time interactions (e.g. isCompressionEnabled() called during build()) + clearInvocations(api); + + writer.flush(); + + // then: 0 * _ (no interactions at all on mocked api) + verifyNoMoreInteractions(api); + + writer.close(); + } + + @Test + void testHappyPath() { + TrackType trackType = TrackType.CITESTCYCLE; + DDIntakeApi api = mock(DDIntakeApi.class); + DDIntakeWriter writer = + DDIntakeWriter.builder() + .addTrack(trackType, api) + .traceBufferSize(1024) + .monitoring(monitoring) + .flushIntervalMilliseconds(-1) + .alwaysFlush(false) + .build(); + writer.start(); + // Clear setup-time interactions (e.g. isCompressionEnabled() called during build()) + clearInvocations(api); + DDSpan span = (DDSpan) dummyTracer.buildSpan("datadog", "fakeOperation").start(); + List trace = Collections.singletonList(span); + + doAnswer(invocation -> RemoteApi.Response.success(200)) + .when(api) + .sendSerializedTraces(argThat(payload -> payload.traceCount() == 2)); + + writer.write(trace); + writer.write(trace); + writer.flush(); + + verify(api, times(1)).sendSerializedTraces(argThat(payload -> payload.traceCount() == 2)); + verifyNoMoreInteractions(api); + + writer.close(); + } + + @Test + void testFloodOfTraces() { + // bufferSize = 1024; traceCount = 100 (shouldn't trigger payload, but bigger than disruptor + // size) + int traceCount = 100; + TrackType trackType = TrackType.CITESTCYCLE; + DDIntakeApi api = mock(DDIntakeApi.class); + DDIntakeWriter writer = + DDIntakeWriter.builder() + .addTrack(trackType, api) + .traceBufferSize(1024) + .monitoring(monitoring) + .flushIntervalMilliseconds(-1) + .alwaysFlush(false) + .build(); + writer.start(); + // Clear setup-time interactions (e.g. isCompressionEnabled() called during build()) + clearInvocations(api); + DDSpan span = (DDSpan) dummyTracer.buildSpan("datadog", "fakeOperation").start(); + List trace = Collections.singletonList(span); + + doAnswer(invocation -> RemoteApi.Response.success(200)) + .when(api) + .sendSerializedTraces(argThat(payload -> payload.traceCount() <= traceCount)); + + for (int i = 1; i <= traceCount; i++) { + writer.write(trace); + } + writer.flush(); + + verify(api, times(1)) + .sendSerializedTraces(argThat(payload -> payload.traceCount() <= traceCount)); + verifyNoMoreInteractions(api); + + writer.close(); + } + + @Test + void testFlushByTime() throws Exception { + TrackType trackType = TrackType.CITESTCYCLE; + HealthMetrics healthMetrics = mock(HealthMetrics.class); + DDIntakeApi api = mock(DDIntakeApi.class); + DDIntakeWriter writer = + DDIntakeWriter.builder() + .addTrack(trackType, api) + .healthMetrics(healthMetrics) + .monitoring(monitoring) + .flushIntervalMilliseconds(1000) + .alwaysFlush(false) + .build(); + writer.start(); + // Clear setup-time interactions (e.g. isCompressionEnabled() called during build(), onStart + // from start()) + clearInvocations(api, healthMetrics); + DDSpan span = (DDSpan) dummyTracer.buildSpan("datadog", "fakeOperation").start(); + List trace = Collections.nCopies(10, span); + + doAnswer(invocation -> RemoteApi.Response.success(200)) + .when(api) + .sendSerializedTraces(argThat(payload -> payload.traceCount() == 5)); + + // stub onSend to arrive at phaser + doAnswer( + invocation -> { + phaser.arrive(); + return null; + }) + .when(healthMetrics) + .onSend(anyInt(), anyInt(), any()); + + for (int i = 1; i <= 5; i++) { + writer.write(trace); + } + phaser.awaitAdvanceInterruptibly(phaser.arriveAndDeregister()); + + verify(healthMetrics, times(1)).onSerialize(anyInt()); + verify(api, times(1)).sendSerializedTraces(argThat(payload -> payload.traceCount() == 5)); + // _ * healthMetrics.onPublish(_, _) means any number, so don't verify count + verify(healthMetrics).onSend(anyInt(), anyInt(), any()); + verifyNoMoreInteractions(api); + + writer.close(); + } + + @Timeout(value = 30, unit = TimeUnit.SECONDS) + @Test + void testDefaultBufferSizeForCitestcycle() { + TrackType trackType = TrackType.CITESTCYCLE; + List minimalTrace = createMinimalTrace(); + DDIntakeApi api = mock(DDIntakeApi.class); + DDIntakeWriter writer = + DDIntakeWriter.builder() + .addTrack(trackType, api) + .wellKnownTags(wellKnownTags) + .traceBufferSize(1024) + .prioritization(ENSURE_TRACE) + .monitoring(monitoring) + .flushIntervalMilliseconds(-1) + .alwaysFlush(false) + .build(); + writer.start(); + // Clear setup-time interactions (e.g. isCompressionEnabled() called during build()) + clearInvocations(api); + + DDIntakeMapperDiscovery discovery = + new DDIntakeMapperDiscovery(trackType, wellKnownTags, false); + discovery.discover(); + RemoteMapper mapper = discovery.getMapper(); + int traceSize = calculateSize(minimalTrace, mapper); + int maxedPayloadTraceCount = (mapper.messageBufferSize() / traceSize); + + doAnswer(invocation -> RemoteApi.Response.success(200)) + .when(api) + .sendSerializedTraces( + argThat(payload -> payload != null && payload.traceCount() == maxedPayloadTraceCount)); + doAnswer(invocation -> RemoteApi.Response.success(200)) + .when(api) + .sendSerializedTraces(argThat(payload -> payload != null && payload.traceCount() == 1)); + + for (int i = 0; i <= maxedPayloadTraceCount; i++) { + writer.write(minimalTrace); + } + writer.flush(); + + verify(api, times(1)) + .sendSerializedTraces( + argThat(payload -> payload != null && payload.traceCount() == maxedPayloadTraceCount)); + verify(api, times(1)) + .sendSerializedTraces(argThat(payload -> payload != null && payload.traceCount() == 1)); + verifyNoMoreInteractions(api); + + writer.close(); + } + + @Test + void checkThatThereAreNoInteractionsAfterClose() { + TrackType trackType = TrackType.CITESTCYCLE; + DDIntakeApi api = mock(DDIntakeApi.class); + HealthMetrics healthMetrics = mock(HealthMetrics.class); + DDIntakeWriter writer = + DDIntakeWriter.builder() + .addTrack(trackType, api) + .healthMetrics(healthMetrics) + .monitoring(monitoring) + .alwaysFlush(false) + .build(); + writer.start(); + // Clear setup-time interactions (e.g. isCompressionEnabled() called during build(), onStart + // from start()) + clearInvocations(api, healthMetrics); + + writer.close(); + writer.write(Collections.emptyList()); + writer.flush(); + + // then: this will be checked during flushing + verify(healthMetrics, times(1)).onFailedPublish(anyInt(), anyInt()); + verify(healthMetrics, times(1)).onFlush(any(Boolean.class)); + verify(healthMetrics, times(1)).onShutdown(any(Boolean.class)); + verify(healthMetrics, times(1)).close(); + verifyNoMoreInteractions(healthMetrics, api); + + writer.close(); + } + + @Test + void monitorHappyPath() { + TrackType trackType = TrackType.CITESTCYCLE; + String apiVersion = "v2"; + HealthMetrics healthMetrics = mock(HealthMetrics.class); + List minimalTrace = createMinimalTrace(); + String path = buildIntakePath(trackType, apiVersion); + + JavaTestHttpServer intake = + JavaTestHttpServer.httpServer( + server -> + server.handlers(h -> h.post(path, api -> api.getResponse().status(200).send()))); + try { + HttpUrl hostUrl = HttpUrl.get(intake.getAddress()); + okhttp3.OkHttpClient httpClient = OkHttpUtils.buildHttpClient(hostUrl, 1000); + DDIntakeApi api = + DDIntakeApi.builder() + .hostUrl(hostUrl) + .httpClient(httpClient) + .apiKey("my-api-key") + .trackType(trackType) + .build(); + DDIntakeWriter writer = + DDIntakeWriter.builder() + .addTrack(trackType, api) + .healthMetrics(healthMetrics) + .monitoring(monitoring) + .alwaysFlush(false) + .build(); + + // start + writer.start(); + + verify(healthMetrics, times(1)).onStart((int) writer.getCapacity()); + + // write and flush + writer.write(minimalTrace); + writer.flush(); + + verify(healthMetrics, times(1)).onPublish(any(), anyInt()); + verify(healthMetrics, times(1)).onSerialize(anyInt()); + verify(healthMetrics, times(1)).onFlush(false); + verify(healthMetrics, times(1)) + .onSend( + anyInt(), + anyInt(), + argThat( + response -> + response.success() + && response.status().isPresent() + && response.status().getAsInt() == 200)); + + writer.close(); + + verify(healthMetrics, times(1)).onShutdown(true); + } finally { + intake.close(); + } + } + + @Test + void monitorIntakeReturnsError() { + TrackType trackType = TrackType.CITESTCYCLE; + String apiVersion = "v2"; + HealthMetrics healthMetrics = mock(HealthMetrics.class); + List minimalTrace = createMinimalTrace(); + String path = buildIntakePath(trackType, apiVersion); + + JavaTestHttpServer intake = + JavaTestHttpServer.httpServer( + server -> + server.handlers(h -> h.post(path, api -> api.getResponse().status(500).send()))); + try { + HttpUrl hostUrl = HttpUrl.get(intake.getAddress()); + okhttp3.OkHttpClient httpClient = OkHttpUtils.buildHttpClient(hostUrl, 1000); + DDIntakeApi api = + DDIntakeApi.builder() + .hostUrl(hostUrl) + .httpClient(httpClient) + .apiKey("my-api-key") + .trackType(trackType) + .build(); + DDIntakeWriter writer = + DDIntakeWriter.builder() + .addTrack(trackType, api) + .healthMetrics(healthMetrics) + .monitoring(monitoring) + .alwaysFlush(false) + .build(); + + // start + writer.start(); + + verify(healthMetrics, times(1)).onStart((int) writer.getCapacity()); + + // write and flush + writer.write(minimalTrace); + writer.flush(); + + verify(healthMetrics, times(1)).onPublish(any(), anyInt()); + verify(healthMetrics, times(1)).onSerialize(anyInt()); + verify(healthMetrics, times(1)).onFlush(false); + verify(healthMetrics, times(1)) + .onFailedSend( + anyInt(), + anyInt(), + argThat( + response -> + !response.success() + && response.status().isPresent() + && response.status().getAsInt() == 500)); + + writer.close(); + + verify(healthMetrics, times(1)).onShutdown(true); + } finally { + intake.close(); + } + } + + @Test + void unreachableIntakeTest() { + TrackType trackType = TrackType.CITESTCYCLE; + HealthMetrics healthMetrics = mock(HealthMetrics.class); + List minimalTrace = createMinimalTrace(); + DDIntakeApi api = mock(DDIntakeApi.class); + // simulating a communication failure to a server + doAnswer(invocation -> RemoteApi.Response.failed(new IOException("comm error"))) + .when(api) + .sendSerializedTraces(any()); + + DDIntakeWriter writer = + DDIntakeWriter.builder() + .addTrack(trackType, api) + .monitoring(monitoring) + .healthMetrics(healthMetrics) + .alwaysFlush(false) + .build(); + + // start + writer.start(); + + verify(healthMetrics, times(1)).onStart((int) writer.getCapacity()); + + // write and flush + writer.write(minimalTrace); + writer.flush(); + + // then: if we know there's no agent, we'll drop the traces before serialising them + // but we also know that there's nowhere to send health metrics to + verify(healthMetrics, times(1)).onPublish(any(), anyInt()); + verify(healthMetrics, times(1)).onFlush(false); + + writer.close(); + + verify(healthMetrics, times(1)).onShutdown(true); + } + + @Flaky("If execution is too slow, the http client timeout may trigger") + @Test + void slowResponseTest() throws Exception { + int numWritten = 0; + AtomicInteger numFlushes = new AtomicInteger(0); + AtomicInteger numPublished = new AtomicInteger(0); + AtomicInteger numFailedPublish = new AtomicInteger(0); + AtomicInteger numRequests = new AtomicInteger(0); + AtomicInteger numFailedRequests = new AtomicInteger(0); + + Semaphore responseSemaphore = new Semaphore(1); + + TrackType trackType = TrackType.CITESTCYCLE; + String apiVersion = "v2"; + int bufferSize = 16; + List minimalTrace = createMinimalTrace(); + String path = buildIntakePath(trackType, apiVersion); + + JavaTestHttpServer intake = + JavaTestHttpServer.httpServer( + server -> + server.handlers( + h -> + h.post( + path, + api -> { + responseSemaphore.acquire(); + try { + api.getResponse().status(200).send(); + } finally { + responseSemaphore.release(); + } + }))); + + // This test focuses just on failed publish, so not verifying every callback + HealthMetrics healthMetrics = mock(HealthMetrics.class); + doAnswer( + invocation -> { + numPublished.incrementAndGet(); + return null; + }) + .when(healthMetrics) + .onPublish(any(), anyInt()); + doAnswer( + invocation -> { + numFailedPublish.incrementAndGet(); + return null; + }) + .when(healthMetrics) + .onFailedPublish(anyInt(), anyInt()); + doAnswer( + invocation -> { + numFlushes.incrementAndGet(); + return null; + }) + .when(healthMetrics) + .onFlush(any(Boolean.class)); + doAnswer( + invocation -> { + numRequests.incrementAndGet(); + return null; + }) + .when(healthMetrics) + .onSend(anyInt(), anyInt(), any()); + doAnswer( + invocation -> { + numFailedRequests.incrementAndGet(); + return null; + }) + .when(healthMetrics) + .onFailedSend(anyInt(), anyInt(), any()); + + HttpUrl hostUrl = HttpUrl.get(intake.getAddress()); + okhttp3.OkHttpClient httpClient = OkHttpUtils.buildHttpClient(hostUrl, 1000); + DDIntakeApi api = + DDIntakeApi.builder() + .hostUrl(hostUrl) + .httpClient(httpClient) + .apiKey("my-api-key") + .trackType(trackType) + .build(); + DDIntakeWriter writer = + DDIntakeWriter.builder() + .addTrack(trackType, api) + .healthMetrics(healthMetrics) + .traceBufferSize(bufferSize) + .alwaysFlush(false) + .build(); + writer.start(); + + // gate responses + responseSemaphore.acquire(); + + try { + // sanity check coordination mechanism of test + // release to allow response to be generated + responseSemaphore.release(); + writer.flush(); + + // reacquire semaphore to stall further responses + responseSemaphore.acquire(); + + // when: write a single trace and flush + // with responseSemaphore held, the response is blocked but may still time out + writer.write(minimalTrace); + numWritten += 1; + + assertEquals(0, numFailedPublish.get()); + assertEquals(numWritten, numPublished.get()); + assertEquals(numWritten, numPublished.get() + numFailedPublish.get()); + assertEquals(1, numFlushes.get()); + + // when: send many traces to fill the sender queue... + // loop until outstanding requests > finished requests + while (writer.traceProcessingWorker.getRemainingCapacity() > 0 + || numFailedPublish.get() == 0) { + writer.write(minimalTrace); + numWritten += 1; + } + + assertTrue(numFailedPublish.get() > 0); + assertEquals(numWritten, numPublished.get() + numFailedPublish.get()); + + // with both disruptor & queue full, should reject everything + int expectedRejects = 100; + for (int i = 1; i <= expectedRejects; i++) { + writer.write(minimalTrace); + numWritten += 1; + } + + assertEquals(numWritten, numPublished.get() + numFailedPublish.get()); + } finally { + responseSemaphore.release(); + writer.close(); + intake.close(); + } + } + + @Test + void multiThreaded() throws Exception { + TrackType trackType = TrackType.CITESTCYCLE; + String apiVersion = "v2"; + AtomicInteger numPublished = new AtomicInteger(0); + AtomicInteger numFailedPublish = new AtomicInteger(0); + AtomicInteger numRepSent = new AtomicInteger(0); + + List minimalTrace = createMinimalTrace(); + String path = buildIntakePath(trackType, apiVersion); + + JavaTestHttpServer intake = + JavaTestHttpServer.httpServer( + server -> + server.handlers(h -> h.post(path, api -> api.getResponse().status(200).send()))); + + // This test focuses just on failed publish, so not verifying every callback + HealthMetrics healthMetrics = mock(HealthMetrics.class); + doAnswer( + invocation -> { + numPublished.incrementAndGet(); + return null; + }) + .when(healthMetrics) + .onPublish(any(), anyInt()); + doAnswer( + invocation -> { + numFailedPublish.incrementAndGet(); + return null; + }) + .when(healthMetrics) + .onFailedPublish(anyInt(), anyInt()); + doAnswer( + invocation -> { + int repCount = invocation.getArgument(0); + numRepSent.addAndGet(repCount); + return null; + }) + .when(healthMetrics) + .onSend(anyInt(), anyInt(), any()); + + HttpUrl hostUrl = HttpUrl.get(intake.getAddress()); + okhttp3.OkHttpClient httpClient = OkHttpUtils.buildHttpClient(hostUrl, 1000); + DDIntakeApi api = + DDIntakeApi.builder() + .hostUrl(hostUrl) + .httpClient(httpClient) + .apiKey("my-api-key") + .trackType(trackType) + .build(); + DDIntakeWriter writer = + DDIntakeWriter.builder() + .addTrack(trackType, api) + .monitoring(monitoring) + .healthMetrics(healthMetrics) + .alwaysFlush(false) + .build(); + writer.start(); + + try { + Runnable producer = + () -> { + for (int i = 1; i <= 100; i++) { + writer.write(minimalTrace); + } + }; + + Thread t1 = new Thread(producer); + t1.start(); + + Thread t2 = new Thread(producer); + t2.start(); + + t1.join(); + t2.join(); + + writer.flush(); + + // then: conditions.eventually { assert numPublished.get() == 200 && numRepSent.get() == 200 } + int totalTraces = 100 + 100; + long deadline = System.currentTimeMillis() + 5000; + while (System.currentTimeMillis() < deadline) { + if (numPublished.get() == totalTraces && numRepSent.get() == totalTraces) { + break; + } + Thread.sleep(50); + } + assertEquals(totalTraces, numPublished.get()); + assertEquals(totalTraces, numRepSent.get()); + } finally { + writer.close(); + intake.close(); + } + } + + @Test + void statsdSuccess() { + TrackType trackType = TrackType.CITESTCYCLE; + String apiVersion = "v2"; + AtomicInteger numTracesAccepted = new AtomicInteger(0); + AtomicInteger numRequests = new AtomicInteger(0); + AtomicInteger numResponses = new AtomicInteger(0); + + List minimalTrace = createMinimalTrace(); + String path = buildIntakePath(trackType, apiVersion); + + JavaTestHttpServer intake = + JavaTestHttpServer.httpServer( + server -> + server.handlers(h -> h.post(path, api -> api.getResponse().status(200).send()))); + + HealthMetrics healthMetrics = mock(HealthMetrics.class); + doAnswer( + invocation -> { + numTracesAccepted.incrementAndGet(); + return null; + }) + .when(healthMetrics) + .onPublish(any(), anyInt()); + doAnswer( + invocation -> { + numRequests.incrementAndGet(); + numResponses.incrementAndGet(); + return null; + }) + .when(healthMetrics) + .onSend(anyInt(), anyInt(), any()); + + HttpUrl hostUrl = HttpUrl.get(intake.getAddress()); + okhttp3.OkHttpClient httpClient = OkHttpUtils.buildHttpClient(hostUrl, 1000); + DDIntakeApi api = + DDIntakeApi.builder() + .hostUrl(hostUrl) + .httpClient(httpClient) + .apiKey("my-api-key") + .trackType(trackType) + .build(); + DDIntakeWriter writer = + DDIntakeWriter.builder() + .addTrack(trackType, api) + .monitoring(monitoring) + .healthMetrics(healthMetrics) + .alwaysFlush(false) + .build(); + writer.start(); + + try { + writer.write(minimalTrace); + writer.flush(); + + assertEquals(1, numTracesAccepted.get()); + assertEquals(1, numRequests.get()); + assertEquals(1, numResponses.get()); + } finally { + intake.close(); + writer.close(); + } + } + + @Test + void statsdCommFailure() throws Exception { + TrackType trackType = TrackType.CITESTCYCLE; + List minimalTrace = createMinimalTrace(); + + DDIntakeApi api = mock(DDIntakeApi.class); + doAnswer(invocation -> RemoteApi.Response.failed(new IOException("comm error"))) + .when(api) + .sendSerializedTraces(any()); + + CountDownLatch latch = new CountDownLatch(2); + StatsDClient statsd = mock(StatsDClient.class); + TracerHealthMetrics healthMetrics = new TracerHealthMetrics(statsd, 100, TimeUnit.MILLISECONDS); + DDIntakeWriter writer = + DDIntakeWriter.builder() + .addTrack(trackType, api) + .monitoring(monitoring) + .healthMetrics(healthMetrics) + .alwaysFlush(false) + .build(); + healthMetrics.start(); + writer.start(); + + // Set up stubs with countDown BEFORE the action + doAnswer( + invocation -> { + latch.countDown(); + return null; + }) + .when(statsd) + .count(anyString(), anyLong()); + + writer.write(minimalTrace); + writer.flush(); + latch.await(10, TimeUnit.SECONDS); + + verify(statsd, times(1)).count("api.requests.total", 1L); + verify(statsd, never()).incrementCounter("api.responses.total"); + verify(statsd, times(1)).count("api.errors.total", 1L); + + writer.close(); + healthMetrics.close(); + } + + static String buildIntakePath(TrackType trackType, String apiVersion) { + return String.format("/api/%s/%s", apiVersion, trackType.name().toLowerCase()); + } + + static int calculateSize(List trace, RemoteMapper mapper) { + AtomicInteger size = new AtomicInteger(); + MsgPackWriter packer = + new MsgPackWriter( + new FlushingBuffer( + mapper.messageBufferSize(), + (messageCount, buffer) -> size.set(buffer.limit() - buffer.position()))); + packer.format(trace, mapper); + packer.flush(); + return size.get(); + } +} diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/DDIntakeWriterTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/DDIntakeWriterTest.java new file mode 100644 index 00000000000..eb7f00ac75e --- /dev/null +++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/DDIntakeWriterTest.java @@ -0,0 +1,222 @@ +package datadog.trace.common.writer; + +import static datadog.trace.common.writer.ddagent.PrioritizationStrategy.PublishResult.ENQUEUED_FOR_SERIALIZATION; +import static datadog.trace.common.writer.ddagent.PrioritizationStrategy.PublishResult.ENQUEUED_FOR_SINGLE_SPAN_SAMPLING; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.clearInvocations; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; +import static org.mockito.Mockito.when; + +import datadog.communication.ddagent.DDAgentFeaturesDiscovery; +import datadog.metrics.api.statsd.StatsDClient; +import datadog.metrics.impl.MonitoringImpl; +import datadog.trace.api.intake.TrackType; +import datadog.trace.common.writer.ddagent.DDAgentApi; +import datadog.trace.common.writer.ddagent.DDAgentMapperDiscovery; +import datadog.trace.common.writer.ddagent.PrioritizationStrategy.PublishResult; +import datadog.trace.core.CoreTracer; +import datadog.trace.core.DDCoreJavaSpecification; +import datadog.trace.core.DDSpan; +import datadog.trace.core.monitor.HealthMetrics; +import datadog.trace.core.propagation.PropagationTags; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.TimeUnit; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.tabletest.junit.TableTest; + +class DDIntakeWriterTest extends DDCoreJavaSpecification { + + HealthMetrics healthMetrics = mock(HealthMetrics.class); + TraceProcessingWorker worker = mock(TraceProcessingWorker.class); + DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class); + DDAgentApi api = mock(DDAgentApi.class); + MonitoringImpl monitoring = new MonitoringImpl(StatsDClient.NO_OP, 1, TimeUnit.SECONDS); + PayloadDispatcherImpl dispatcher = + new PayloadDispatcherImpl( + new DDAgentMapperDiscovery(discovery), api, healthMetrics, monitoring); + DDIntakeWriter writer = new DDIntakeWriter(worker, dispatcher, healthMetrics, false); + + // Only used to create spans + CoreTracer dummyTracer; + + @BeforeEach + void setup() { + dummyTracer = tracerBuilder().writer(new ListWriter()).build(); + } + + @AfterEach + void cleanup() { + writer.close(); + if (dummyTracer != null) { + dummyTracer.close(); + } + } + + @Test + void testWriterBuilder() { + DDIntakeWriter builtWriter = + DDIntakeWriter.builder().addTrack(TrackType.NOOP, mock(RemoteApi.class)).build(); + + assertNotNull(builtWriter); + } + + @Test + void testWriterStart() { + int capacity = 5; + + when(worker.getCapacity()).thenReturn(capacity); + writer.start(); + + verify(healthMetrics).start(); + verify(worker).start(); + verify(worker).getCapacity(); + verify(healthMetrics).onStart(capacity); + verifyNoMoreInteractions(healthMetrics, worker, discovery, api); + } + + @Test + void testWriterFlush() { + when(worker.flush(1, TimeUnit.SECONDS)).thenReturn(true, false); + + // first flush succeeds + writer.flush(); + + // monitor is notified + verify(worker).flush(1, TimeUnit.SECONDS); + verify(healthMetrics).onFlush(false); + verifyNoMoreInteractions(healthMetrics, worker, discovery, api); + + clearInvocations(healthMetrics, worker, discovery, api); + + // second flush returns false + writer.flush(); + + // no additional monitor notifications + verify(worker).flush(1, TimeUnit.SECONDS); + verifyNoMoreInteractions(healthMetrics, worker, discovery, api); + } + + @Test + void testWriterFlushClosed() { + writer.close(); + clearInvocations(healthMetrics, worker, discovery, api); + + writer.flush(); + + verifyNoMoreInteractions(healthMetrics, worker, discovery, api); + } + + @Test + void testWriterWritePublishSucceeds() { + List trace = + Collections.singletonList( + (DDSpan) dummyTracer.buildSpan("datadog", "fakeOperation").start()); + + // publish succeeds + when(worker.publish(any(), anyInt(), eq(trace))).thenReturn(ENQUEUED_FOR_SERIALIZATION); + when(worker.flush(anyLong(), any(TimeUnit.class))).thenReturn(true); + writer.write(trace); + + // monitor is notified of successful publication + verify(worker).publish(any(), anyInt(), eq(trace)); + verify(healthMetrics).onPublish(any(), anyInt()); + verifyNoMoreInteractions(healthMetrics); + } + + @Test + void testWriterWritePublishForSingleSpanSampling() { + List trace = + Collections.singletonList( + (DDSpan) dummyTracer.buildSpan("datadog", "fakeOperation").start()); + + // publish succeeds for single span sampling + when(worker.publish(any(), anyInt(), eq(trace))).thenReturn(ENQUEUED_FOR_SINGLE_SPAN_SAMPLING); + when(worker.flush(anyLong(), any(TimeUnit.class))).thenReturn(true); + writer.write(trace); + + // monitor should not call onPublish for single span sampling + verify(worker).publish(any(), anyInt(), eq(trace)); + verifyNoMoreInteractions(healthMetrics); + } + + @TableTest({ + "scenario | publishResult ", + "buffer overflow | DROPPED_BUFFER_OVERFLOW", + "dropped by policy | DROPPED_BY_POLICY " + }) + void testWriterWritePublishFails(PublishResult publishResult) { + List trace = + Collections.singletonList( + (DDSpan) dummyTracer.buildSpan("datadog", "fakeOperation").start()); + + // publish fails + when(worker.publish(any(), anyInt(), eq(trace))).thenReturn(publishResult); + when(worker.flush(anyLong(), any(TimeUnit.class))).thenReturn(true); + writer.write(trace); + + // monitor is notified of unsuccessful publication + verify(worker).publish(any(), anyInt(), eq(trace)); + verify(healthMetrics).onFailedPublish(anyInt(), eq(1)); + verifyNoMoreInteractions(healthMetrics); + } + + @Test + void testEmptyTracesShouldBeReportedAsFailures() { + // trace is empty + when(worker.flush(anyLong(), any(TimeUnit.class))).thenReturn(true); + writer.write(Collections.emptyList()); + + // monitor is notified of unsuccessful publication + verify(healthMetrics).onFailedPublish(anyInt(), eq(0)); + verifyNoMoreInteractions(healthMetrics); + } + + @Test + void testWriterWriteClosed() { + writer.close(); + clearInvocations(healthMetrics, worker, discovery, api); + List trace = + Collections.singletonList( + (DDSpan) dummyTracer.buildSpan("datadog", "fakeOperation").start()); + + when(worker.flush(anyLong(), any(TimeUnit.class))).thenReturn(true); + writer.write(trace); + + verify(healthMetrics).onFailedPublish(anyInt(), eq(1)); + verifyNoMoreInteractions(healthMetrics); + } + + @TableTest({ + "scenario | publishResult ", + "dropped by policy | DROPPED_BY_POLICY ", + "buffer overflow | DROPPED_BUFFER_OVERFLOW" + }) + void testDroppedTraceIsCounted(PublishResult publishResult) { + // setup - use local mocks + PayloadDispatcherImpl localDispatcher = mock(PayloadDispatcherImpl.class); + DDIntakeWriter localWriter = new DDIntakeWriter(worker, localDispatcher, healthMetrics, true); + + DDSpan p0 = newSpan(); + List trace = java.util.Arrays.asList(p0, newSpan()); + + when(worker.publish(eq(trace.get(0)), anyInt(), eq(trace))).thenReturn(publishResult); + localWriter.write(trace); + + verify(worker).publish(eq(trace.get(0)), anyInt(), eq(trace)); + verify(localDispatcher).onDroppedTrace(trace.size()); + } + + DDSpan newSpan() { + // Use the UNSET-priority variant so setSamplingPriority() can change the priority later + return buildSpan(0L, "test.tag", "test.value", PropagationTags.factory().empty()); + } +} diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/MultiWriterTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/MultiWriterTest.java new file mode 100644 index 00000000000..3dd2819f39d --- /dev/null +++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/MultiWriterTest.java @@ -0,0 +1,79 @@ +package datadog.trace.common.writer; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.clearInvocations; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; +import static org.mockito.Mockito.when; + +import datadog.trace.core.DDSpan; +import datadog.trace.test.util.DDJavaSpecification; +import java.util.LinkedList; +import java.util.List; +import org.junit.jupiter.api.Test; + +class MultiWriterTest extends DDJavaSpecification { + + @Test + void testThatMultiWriterDelegatesToAll() { + Writer[] writers = new Writer[3]; + Writer mockW1 = mock(Writer.class); + Writer mockW2 = mock(Writer.class); + writers[0] = mockW1; + // null in position 1 to check that we skip that + writers[2] = mockW2; + MultiWriter writer = new MultiWriter(writers); + List trace = new LinkedList<>(); + + writer.start(); + + verify(mockW1).start(); + verify(mockW2).start(); + verifyNoMoreInteractions(mockW1, mockW2); + clearInvocations(mockW1, mockW2); + + writer.write(trace); + + verify(mockW1).write(trace); + verify(mockW2).write(trace); + verifyNoMoreInteractions(mockW1, mockW2); + clearInvocations(mockW1, mockW2); + + // flush (both return true) + when(mockW1.flush()).thenReturn(true); + when(mockW2.flush()).thenReturn(true); + boolean flushed = writer.flush(); + + verify(mockW1).flush(); + verify(mockW2).flush(); + verifyNoMoreInteractions(mockW1, mockW2); + assertTrue(flushed); + clearInvocations(mockW1, mockW2); + + // flush (one returns false) + when(mockW1.flush()).thenReturn(true); + when(mockW2.flush()).thenReturn(false); + boolean notFlushed = writer.flush(); + + verify(mockW1).flush(); + verify(mockW2).flush(); + verifyNoMoreInteractions(mockW1, mockW2); + assertFalse(notFlushed); + clearInvocations(mockW1, mockW2); + + writer.close(); + + verify(mockW1).close(); + verify(mockW2).close(); + verifyNoMoreInteractions(mockW1, mockW2); + clearInvocations(mockW1, mockW2); + + writer.incrementDropCounts(0); + + verify(mockW1).incrementDropCounts(0); + verify(mockW2).incrementDropCounts(0); + verifyNoMoreInteractions(mockW1, mockW2); + } +} diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/PayloadDispatcherImplTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/PayloadDispatcherImplTest.java new file mode 100644 index 00000000000..2bf49f69fc3 --- /dev/null +++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/PayloadDispatcherImplTest.java @@ -0,0 +1,228 @@ +package datadog.trace.common.writer; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.argThat; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.intThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import datadog.communication.ddagent.DDAgentFeaturesDiscovery; +import datadog.metrics.api.statsd.StatsDClient; +import datadog.metrics.impl.MonitoringImpl; +import datadog.trace.api.DDSpanId; +import datadog.trace.api.DDTraceId; +import datadog.trace.api.datastreams.NoopPathwayContext; +import datadog.trace.api.sampling.PrioritySampling; +import datadog.trace.common.writer.ddagent.DDAgentApi; +import datadog.trace.common.writer.ddagent.DDAgentMapperDiscovery; +import datadog.trace.core.CoreTracer; +import datadog.trace.core.DDSpan; +import datadog.trace.core.DDSpanContext; +import datadog.trace.core.PendingTrace; +import datadog.trace.core.monitor.HealthMetrics; +import datadog.trace.core.propagation.PropagationTags; +import datadog.trace.test.util.DDJavaSpecification; +import java.lang.reflect.Constructor; +import java.nio.ByteBuffer; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; +import org.tabletest.junit.TableTest; + +class PayloadDispatcherImplTest extends DDJavaSpecification { + + static final MonitoringImpl monitoring = + new MonitoringImpl(StatsDClient.NO_OP, 1, TimeUnit.SECONDS); + + // Groovy baseline: v0.5 ~5.5s, v0.4 ~1.3s; Java has higher mock overhead so use 30s timeout + @Timeout(30) + @TableTest({"scenario | traceEndpoint", "v0.5 | 'v0.5/traces'", "v0.4 | 'v0.4/traces'"}) + void testFlushAutomaticallyWhenDataLimitIsBreached(String traceEndpoint) throws Exception { + AtomicBoolean flushed = new AtomicBoolean(); + HealthMetrics healthMetrics = mock(HealthMetrics.class); + DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class); + when(discovery.getTraceEndpoint()).thenReturn(traceEndpoint); + DDAgentApi api = mock(DDAgentApi.class); + when(api.sendSerializedTraces(any())) + .thenAnswer( + inv -> { + flushed.set(true); + return RemoteApi.Response.success(200); + }); + PayloadDispatcherImpl dispatcher = + new PayloadDispatcherImpl( + new DDAgentMapperDiscovery(discovery), api, healthMetrics, monitoring); + List trace = Collections.singletonList(realSpan()); + + while (!flushed.get()) { + dispatcher.addTrace(trace); + } + + // the dispatcher has flushed + assertTrue(flushed.get()); + } + + @TableTest({ + "scenario | traceEndpoint | traceCount", + "v0.4 1 trace | 'v0.4/traces' | 1 ", + "v0.4 10 traces | 'v0.4/traces' | 10 ", + "v0.4 100 traces | 'v0.4/traces' | 100 ", + "v0.5 1 trace | 'v0.5/traces' | 1 ", + "v0.5 10 traces | 'v0.5/traces' | 10 ", + "v0.5 100 traces | 'v0.5/traces' | 100 " + }) + void testShouldFlushBufferOnDemand(String traceEndpoint, int traceCount) throws Exception { + HealthMetrics healthMetrics = mock(HealthMetrics.class); + DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class); + DDAgentApi api = mock(DDAgentApi.class); + when(discovery.getTraceEndpoint()).thenReturn(traceEndpoint); + when(api.sendSerializedTraces(any())).thenReturn(RemoteApi.Response.success(200)); + PayloadDispatcherImpl dispatcher = + new PayloadDispatcherImpl( + new DDAgentMapperDiscovery(discovery), api, healthMetrics, monitoring); + List trace = Collections.singletonList(realSpan()); + + for (int i = 0; i < traceCount; ++i) { + dispatcher.addTrace(trace); + } + dispatcher.flush(); + + verify(discovery, org.mockito.Mockito.times(2)).getTraceEndpoint(); + verify(healthMetrics).onSerialize(intThat(size -> size > 0)); + verify(api).sendSerializedTraces(argThat(p -> p.traceCount() == traceCount)); + } + + @TableTest({ + "scenario | traceEndpoint | traceCount", + "v0.4 1 trace | 'v0.4/traces' | 1 ", + "v0.4 10 traces | 'v0.4/traces' | 10 ", + "v0.4 100 traces | 'v0.4/traces' | 100 ", + "v0.5 1 trace | 'v0.5/traces' | 1 ", + "v0.5 10 traces | 'v0.5/traces' | 10 ", + "v0.5 100 traces | 'v0.5/traces' | 100 " + }) + void testShouldReportFailedRequestToMonitor(String traceEndpoint, int traceCount) + throws Exception { + HealthMetrics healthMetrics = mock(HealthMetrics.class); + DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class); + DDAgentApi api = mock(DDAgentApi.class); + when(discovery.getTraceEndpoint()).thenReturn(traceEndpoint); + when(api.sendSerializedTraces(any())).thenReturn(RemoteApi.Response.failed(400)); + PayloadDispatcherImpl dispatcher = + new PayloadDispatcherImpl( + new DDAgentMapperDiscovery(discovery), api, healthMetrics, monitoring); + List trace = Collections.singletonList(realSpan()); + + for (int i = 0; i < traceCount; ++i) { + dispatcher.addTrace(trace); + } + dispatcher.flush(); + + verify(discovery, org.mockito.Mockito.times(2)).getTraceEndpoint(); + verify(healthMetrics).onSerialize(intThat(size -> size > 0)); + verify(api).sendSerializedTraces(argThat(p -> p.traceCount() == traceCount)); + } + + @Test + void testShouldDropTraceWhenThereIsNoAgentConnectivity() throws Exception { + HealthMetrics healthMetrics = mock(HealthMetrics.class); + DDAgentApi api = mock(DDAgentApi.class); + DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class); + when(discovery.getTraceEndpoint()).thenReturn(null); + PayloadDispatcherImpl dispatcher = + new PayloadDispatcherImpl( + new DDAgentMapperDiscovery(discovery), api, healthMetrics, monitoring); + List trace = Collections.singletonList(realSpan()); + + dispatcher.addTrace(trace); + + verify(healthMetrics).onFailedPublish(eq((int) PrioritySampling.UNSET), anyInt()); + } + + @Test + void testTraceAndSpanCountsAreResetAfterAccess() { + HealthMetrics healthMetrics = mock(HealthMetrics.class); + DDAgentApi api = mock(DDAgentApi.class); + DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class); + when(discovery.getTraceEndpoint()).thenReturn("v0.4/traces"); + PayloadDispatcherImpl dispatcher = + new PayloadDispatcherImpl( + new DDAgentMapperDiscovery(discovery), api, healthMetrics, monitoring); + + // add traces and dropped counts + dispatcher.addTrace(Collections.emptyList()); + dispatcher.onDroppedTrace(20); + dispatcher.onDroppedTrace(2); + Payload payload = dispatcher.newPayload(1, ByteBuffer.allocate(0)); + + // dropped counts are accumulated + assertEquals(22, payload.droppedSpans()); + assertEquals(2, payload.droppedTraces()); + + // create another payload + Payload newPayload = dispatcher.newPayload(1, ByteBuffer.allocate(0)); + + // counts are reset after access + assertEquals(0, newPayload.droppedSpans()); + assertEquals(0, newPayload.droppedTraces()); + } + + DDSpan realSpan() throws Exception { + // getTracer() and mapServiceName() are package-private in TraceCollector; use a custom + // Answer to handle them at runtime without compile-time accessibility issues + PendingTrace trace = + mock( + PendingTrace.class, + invocation -> { + Class returnType = invocation.getMethod().getReturnType(); + if (CoreTracer.class.isAssignableFrom(returnType)) { + // Use RETURNS_DEFAULTS so getTagInterceptor() returns null (matching Groovy Stub + // behavior) + return mock(CoreTracer.class); + } + if (returnType == String.class) { + Object[] args = invocation.getArguments(); + // mapServiceName(String) - return the argument unchanged + if (args.length > 0 && args[0] instanceof String) { + return args[0]; + } + return ""; + } + return org.mockito.Mockito.RETURNS_DEFAULTS.answer(invocation); + }); + DDSpanContext context = + new DDSpanContext( + DDTraceId.ONE, + 1L, + DDSpanId.ZERO, + null, + "", + "", + "", + PrioritySampling.UNSET, + "", + Collections.emptyMap(), + false, + "", + 0, + trace, + null, + null, + NoopPathwayContext.INSTANCE, + false, + PropagationTags.factory().empty()); + Constructor ctor = + DDSpan.class.getDeclaredConstructor( + String.class, long.class, DDSpanContext.class, List.class); + ctor.setAccessible(true); + return ctor.newInstance("test", 0L, context, null); + } +} diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/PrioritizationTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/PrioritizationTest.java new file mode 100644 index 00000000000..016f0da6198 --- /dev/null +++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/PrioritizationTest.java @@ -0,0 +1,307 @@ +package datadog.trace.common.writer; + +import static datadog.trace.common.writer.ddagent.PrioritizationStrategy.PublishResult.DROPPED_BUFFER_OVERFLOW; +import static datadog.trace.common.writer.ddagent.PrioritizationStrategy.PublishResult.ENQUEUED_FOR_SERIALIZATION; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; +import static org.mockito.Mockito.when; + +import datadog.trace.api.sampling.PrioritySampling; +import datadog.trace.common.writer.ddagent.FlushEvent; +import datadog.trace.common.writer.ddagent.Prioritization; +import datadog.trace.common.writer.ddagent.PrioritizationStrategy; +import datadog.trace.common.writer.ddagent.PrioritizationStrategy.PublishResult; +import datadog.trace.core.DDSpan; +import datadog.trace.junit.utils.tabletest.PrioritySamplingConverter; +import datadog.trace.test.util.DDJavaSpecification; +import java.util.Collections; +import java.util.List; +import java.util.Queue; +import java.util.concurrent.TimeUnit; +import org.junit.jupiter.params.converter.ConvertWith; +import org.tabletest.junit.TableTest; + +class PrioritizationTest extends DDJavaSpecification { + + @SuppressWarnings("unchecked") + @TableTest({ + "scenario | primaryFull | priority | primaryOffers | secondaryOffers", + "unset full | true | PrioritySampling.UNSET | 2 | 0 ", + "drop full | true | PrioritySampling.SAMPLER_DROP | 0 | 1 ", + "keep full | true | PrioritySampling.SAMPLER_KEEP | 2 | 0 ", + "drop full 2 | true | PrioritySampling.SAMPLER_DROP | 0 | 1 ", + "user keep full | true | PrioritySampling.USER_KEEP | 2 | 0 ", + "unset not full | false | PrioritySampling.UNSET | 1 | 0 ", + "drop not full | false | PrioritySampling.SAMPLER_DROP | 0 | 1 ", + "keep not full | false | PrioritySampling.SAMPLER_KEEP | 1 | 0 ", + "drop not full 2 | false | PrioritySampling.SAMPLER_DROP | 0 | 1 ", + "user keep not full | false | PrioritySampling.USER_KEEP | 1 | 0 " + }) + void testEnsureTraceStrategyTriesToSendKeptAndUnsetPriorityTracesToPrimaryQueue( + boolean primaryFull, + @ConvertWith(PrioritySamplingConverter.class) int priority, + int primaryOffers, + int secondaryOffers) { + List trace = Collections.emptyList(); + Queue primary = mock(Queue.class); + Queue secondary = mock(Queue.class); + PrioritizationStrategy blocking = + Prioritization.ENSURE_TRACE.create(primary, secondary, null, () -> false); + // stub: first offer returns !primaryFull, second offer returns true + when(primary.offer(trace)).thenReturn(!primaryFull, true); + when(secondary.offer(trace)).thenReturn(true); + + PublishResult publishResult = blocking.publish(mock(DDSpan.class), priority, trace); + + assertEquals(ENQUEUED_FOR_SERIALIZATION, publishResult); + verify(primary, times(primaryOffers)).offer(trace); + verify(secondary, times(secondaryOffers)).offer(trace); + } + + @SuppressWarnings("unchecked") + @TableTest({ + "scenario | priority | primaryOffers | secondaryOffers", + "unset | PrioritySampling.UNSET | 1 | 0 ", + "drop | PrioritySampling.SAMPLER_DROP | 0 | 1 ", + "keep | PrioritySampling.SAMPLER_KEEP | 1 | 0 ", + "drop 2 | PrioritySampling.SAMPLER_DROP | 0 | 1 ", + "user keep | PrioritySampling.USER_KEEP | 1 | 0 " + }) + void testFastLaneStrategySendsKeptAndUnsetPriorityTracesToPrimaryQueue( + @ConvertWith(PrioritySamplingConverter.class) int priority, + int primaryOffers, + int secondaryOffers) { + List trace = Collections.emptyList(); + Queue primary = mock(Queue.class); + Queue secondary = mock(Queue.class); + PrioritizationStrategy fastLane = + Prioritization.FAST_LANE.create(primary, secondary, null, () -> false); + + PublishResult publishResult = fastLane.publish(mock(DDSpan.class), priority, trace); + + assertEquals(DROPPED_BUFFER_OVERFLOW, publishResult); + verify(primary, times(primaryOffers)).offer(trace); + verify(secondary, times(secondaryOffers)).offer(trace); + } + + @SuppressWarnings("unchecked") + @TableTest({ + "scenario | priority | primaryOffers | expectedResult ", + "unset | PrioritySampling.UNSET | 1 | ENQUEUED_FOR_SERIALIZATION", + "drop | PrioritySampling.SAMPLER_DROP | 0 | DROPPED_BY_POLICY ", + "keep | PrioritySampling.SAMPLER_KEEP | 1 | ENQUEUED_FOR_SERIALIZATION", + "drop 2 | PrioritySampling.SAMPLER_DROP | 0 | DROPPED_BY_POLICY ", + "user keep | PrioritySampling.USER_KEEP | 1 | ENQUEUED_FOR_SERIALIZATION" + }) + void testFastLaneWithActiveDroppingPolicySendsKeptAndUnsetTracesToPrimaryQueue( + @ConvertWith(PrioritySamplingConverter.class) int priority, + int primaryOffers, + PublishResult expectedResult) { + List trace = Collections.emptyList(); + Queue primary = mock(Queue.class); + Queue secondary = mock(Queue.class); + PrioritizationStrategy drop = + Prioritization.FAST_LANE.create(primary, secondary, null, () -> true); + when(primary.offer(trace)).thenReturn(true); + + PublishResult publishResult = drop.publish(mock(DDSpan.class), priority, trace); + + assertEquals(expectedResult, publishResult); + verify(primary, times(primaryOffers)).offer(trace); + verify(secondary, never()).offer(trace); + } + + @SuppressWarnings("unchecked") + @TableTest({ + "scenario | strategy ", + "fast lane | FAST_LANE ", + "ensure trace | ENSURE_TRACE" + }) + void testStrategyFlushesPrimaryQueue(Prioritization strategy) { + Queue primary = mock(Queue.class); + Queue secondary = mock(Queue.class); + PrioritizationStrategy prioritizationStrategy = + strategy.create(primary, secondary, null, () -> false); + when(primary.offer(any())).thenReturn(true); + + prioritizationStrategy.flush(100, TimeUnit.MILLISECONDS); + + verify(primary).offer(any(FlushEvent.class)); + verify(secondary, never()).offer(any()); + } + + @SuppressWarnings("unchecked") + @TableTest({ + "scenario | strategy | forceKeep | expectedResult ", + "force keep true fast lane | FAST_LANE | true | ENQUEUED_FOR_SERIALIZATION", + "force keep false fast lane | FAST_LANE | false | DROPPED_BY_POLICY " + }) + void testDropStrategyRespectsForceKeep( + Prioritization strategy, boolean forceKeep, PublishResult expectedResult) { + Queue primary = mock(Queue.class); + PrioritizationStrategy drop = strategy.create(primary, null, null, () -> true); + DDSpan root = mock(DDSpan.class); + List trace = Collections.singletonList(root); + when(root.isForceKeep()).thenReturn(forceKeep); + when(primary.offer(trace)).thenReturn(true); + + PublishResult publishResult = drop.publish(root, PrioritySampling.SAMPLER_DROP, trace); + + assertEquals(expectedResult, publishResult); + verify(root).isForceKeep(); + verify(primary, times(forceKeep ? 1 : 0)).offer(trace); + verifyNoMoreInteractions(root, primary); + } + + @SuppressWarnings("unchecked") + @TableTest({ + "scenario | primaryFull | priority | primaryOffers | singleSpanOffers | singleSpanFull | expectedResult ", + "unset full ss-not-full | true | PrioritySampling.UNSET | 2 | 0 | false | ENQUEUED_FOR_SERIALIZATION ", + "drop full ss-not-full | true | PrioritySampling.SAMPLER_DROP | 0 | 1 | false | ENQUEUED_FOR_SINGLE_SPAN_SAMPLING", + "keep full ss-not-full | true | PrioritySampling.SAMPLER_KEEP | 2 | 0 | false | ENQUEUED_FOR_SERIALIZATION ", + "drop full 2 ss-not-full | true | PrioritySampling.SAMPLER_DROP | 0 | 1 | false | ENQUEUED_FOR_SINGLE_SPAN_SAMPLING", + "ukeep full ss-not-full | true | PrioritySampling.USER_KEEP | 2 | 0 | false | ENQUEUED_FOR_SERIALIZATION ", + "unset nfull ss-not-full | false | PrioritySampling.UNSET | 1 | 0 | false | ENQUEUED_FOR_SERIALIZATION ", + "drop nfull ss-not-full | false | PrioritySampling.SAMPLER_DROP | 0 | 1 | false | ENQUEUED_FOR_SINGLE_SPAN_SAMPLING", + "keep nfull ss-not-full | false | PrioritySampling.SAMPLER_KEEP | 1 | 0 | false | ENQUEUED_FOR_SERIALIZATION ", + "drop nfull 2 ss-not-full | false | PrioritySampling.SAMPLER_DROP | 0 | 1 | false | ENQUEUED_FOR_SINGLE_SPAN_SAMPLING", + "ukeep nfull ss-not-full | false | PrioritySampling.USER_KEEP | 1 | 0 | false | ENQUEUED_FOR_SERIALIZATION ", + "unset full ss-full | true | PrioritySampling.UNSET | 2 | 0 | true | ENQUEUED_FOR_SERIALIZATION ", + "drop full ss-full | true | PrioritySampling.SAMPLER_DROP | 0 | 1 | true | DROPPED_BUFFER_OVERFLOW ", + "keep full ss-full | true | PrioritySampling.SAMPLER_KEEP | 2 | 0 | true | ENQUEUED_FOR_SERIALIZATION ", + "drop full 2 ss-full | true | PrioritySampling.SAMPLER_DROP | 0 | 1 | true | DROPPED_BUFFER_OVERFLOW ", + "ukeep full ss-full | true | PrioritySampling.USER_KEEP | 2 | 0 | true | ENQUEUED_FOR_SERIALIZATION ", + "unset nfull ss-full | false | PrioritySampling.UNSET | 1 | 0 | true | ENQUEUED_FOR_SERIALIZATION ", + "drop nfull ss-full | false | PrioritySampling.SAMPLER_DROP | 0 | 1 | true | DROPPED_BUFFER_OVERFLOW ", + "keep nfull ss-full | false | PrioritySampling.SAMPLER_KEEP | 1 | 0 | true | ENQUEUED_FOR_SERIALIZATION ", + "drop nfull 2 ss-full | false | PrioritySampling.SAMPLER_DROP | 0 | 1 | true | DROPPED_BUFFER_OVERFLOW ", + "ukeep nfull ss-full | false | PrioritySampling.USER_KEEP | 1 | 0 | true | ENQUEUED_FOR_SERIALIZATION " + }) + void testEnsureTraceStrategyWithSpanSamplingQueue( + boolean primaryFull, + @ConvertWith(PrioritySamplingConverter.class) int priority, + int primaryOffers, + int singleSpanOffers, + boolean singleSpanFull, + PublishResult expectedResult) { + List trace = Collections.emptyList(); + Queue primary = mock(Queue.class); + Queue secondary = mock(Queue.class); + Queue spanSampling = mock(Queue.class); + PrioritizationStrategy blocking = + Prioritization.ENSURE_TRACE.create(primary, secondary, spanSampling, () -> false); + when(primary.offer(trace)).thenReturn(!primaryFull, true); + when(spanSampling.offer(trace)).thenReturn(!singleSpanFull); + + PublishResult publishResult = blocking.publish(mock(DDSpan.class), priority, trace); + + assertEquals(expectedResult, publishResult); + verify(primary, times(primaryOffers)).offer(trace); + verify(secondary, never()).offer(trace); // expect no traces sent to the secondary queue + verify(spanSampling, times(singleSpanOffers)).offer(trace); + } + + @SuppressWarnings("unchecked") + @TableTest({ + "scenario | priority | primaryOffers | singleSpanOffers | singleSpanFull | expectedResult ", + "unset ss-not-full | PrioritySampling.UNSET | 1 | 0 | false | ENQUEUED_FOR_SERIALIZATION ", + "drop ss-not-full | PrioritySampling.SAMPLER_DROP | 0 | 1 | false | ENQUEUED_FOR_SINGLE_SPAN_SAMPLING", + "keep ss-not-full | PrioritySampling.SAMPLER_KEEP | 1 | 0 | false | ENQUEUED_FOR_SERIALIZATION ", + "drop 2 ss-not-full | PrioritySampling.SAMPLER_DROP | 0 | 1 | false | ENQUEUED_FOR_SINGLE_SPAN_SAMPLING", + "user keep ss-not-full | PrioritySampling.USER_KEEP | 1 | 0 | false | ENQUEUED_FOR_SERIALIZATION ", + "unset ss-full | PrioritySampling.UNSET | 1 | 0 | true | ENQUEUED_FOR_SERIALIZATION ", + "drop ss-full | PrioritySampling.SAMPLER_DROP | 0 | 1 | true | DROPPED_BUFFER_OVERFLOW ", + "keep ss-full | PrioritySampling.SAMPLER_KEEP | 1 | 0 | true | ENQUEUED_FOR_SERIALIZATION ", + "drop 2 ss-full | PrioritySampling.SAMPLER_DROP | 0 | 1 | true | DROPPED_BUFFER_OVERFLOW ", + "user keep ss-full | PrioritySampling.USER_KEEP | 1 | 0 | true | ENQUEUED_FOR_SERIALIZATION " + }) + void testFastLaneStrategyWithSpanSamplingQueue( + @ConvertWith(PrioritySamplingConverter.class) int priority, + int primaryOffers, + int singleSpanOffers, + boolean singleSpanFull, + PublishResult expectedResult) { + List trace = Collections.emptyList(); + Queue primary = mock(Queue.class); + Queue secondary = mock(Queue.class); + Queue spanSampling = mock(Queue.class); + PrioritizationStrategy fastLane = + Prioritization.FAST_LANE.create(primary, secondary, spanSampling, () -> false); + when(primary.offer(trace)).thenReturn(true); + when(spanSampling.offer(trace)).thenReturn(!singleSpanFull); + + PublishResult publishResult = fastLane.publish(mock(DDSpan.class), priority, trace); + + assertEquals(expectedResult, publishResult); + verify(primary, times(primaryOffers)).offer(trace); + verify(secondary, never()).offer(any()); // expect no traces sent to the secondary queue + verify(spanSampling, times(singleSpanOffers)).offer(trace); + } + + @SuppressWarnings("unchecked") + @TableTest({ + "scenario | priority | primaryOffers | singleSpanOffers | expectedResult ", + "unset | PrioritySampling.UNSET | 1 | 0 | ENQUEUED_FOR_SERIALIZATION ", + "drop | PrioritySampling.SAMPLER_DROP | 0 | 1 | ENQUEUED_FOR_SINGLE_SPAN_SAMPLING", + "keep | PrioritySampling.SAMPLER_KEEP | 1 | 0 | ENQUEUED_FOR_SERIALIZATION ", + "drop 2 | PrioritySampling.SAMPLER_DROP | 0 | 1 | ENQUEUED_FOR_SINGLE_SPAN_SAMPLING", + "user keep | PrioritySampling.USER_KEEP | 1 | 0 | ENQUEUED_FOR_SERIALIZATION " + }) + void testFastLaneWithActiveDroppingPolicySendToSingleSpanSampling( + @ConvertWith(PrioritySamplingConverter.class) int priority, + int primaryOffers, + int singleSpanOffers, + PublishResult expectedResult) { + List trace = Collections.emptyList(); + Queue primary = mock(Queue.class); + Queue secondary = mock(Queue.class); + Queue spanSampling = mock(Queue.class); + PrioritizationStrategy drop = + Prioritization.FAST_LANE.create(primary, secondary, spanSampling, () -> true); + when(primary.offer(trace)).thenReturn(true); + when(spanSampling.offer(trace)).thenReturn(true); + + PublishResult publishResult = drop.publish(mock(DDSpan.class), priority, trace); + + assertEquals(expectedResult, publishResult); + verify(primary, times(primaryOffers)).offer(trace); + verify(secondary, never()).offer(trace); + verify(spanSampling, times(singleSpanOffers)).offer(trace); + } + + @SuppressWarnings("unchecked") + @TableTest({ + "scenario | strategy | forceKeep | singleSpanFull | expectedResult ", + "force keep true full | FAST_LANE | true | true | ENQUEUED_FOR_SERIALIZATION ", + "force keep false full | FAST_LANE | false | true | DROPPED_BUFFER_OVERFLOW ", + "force keep true not full | FAST_LANE | true | false | ENQUEUED_FOR_SERIALIZATION ", + "force keep false not full | FAST_LANE | false | false | ENQUEUED_FOR_SINGLE_SPAN_SAMPLING" + }) + void testSpanSamplingDropStrategyRespectsForceKeep( + Prioritization strategy, + boolean forceKeep, + boolean singleSpanFull, + PublishResult expectedResult) { + Queue primary = mock(Queue.class); + Queue spanSampling = mock(Queue.class); + PrioritizationStrategy drop = strategy.create(primary, null, spanSampling, () -> true); + DDSpan root = mock(DDSpan.class); + List trace = Collections.singletonList(root); + when(root.isForceKeep()).thenReturn(forceKeep); + when(primary.offer(trace)).thenReturn(true); + when(spanSampling.offer(trace)).thenReturn(!singleSpanFull); + + PublishResult publishResult = drop.publish(root, PrioritySampling.SAMPLER_DROP, trace); + + assertEquals(expectedResult, publishResult); + verify(root).isForceKeep(); + verify(primary, times(forceKeep ? 1 : 0)).offer(trace); + verify(spanSampling, times(forceKeep ? 0 : 1)).offer(trace); + verifyNoMoreInteractions(root, primary, spanSampling); + } +} diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/SerializationTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/SerializationTest.java new file mode 100644 index 00000000000..a0254db18d0 --- /dev/null +++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/SerializationTest.java @@ -0,0 +1,65 @@ +package datadog.trace.common.writer; + +import static java.util.Collections.singletonMap; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import datadog.trace.test.util.DDJavaSpecification; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import org.junit.jupiter.api.Test; +import org.msgpack.core.MessageBufferPacker; +import org.msgpack.core.MessagePack; +import org.msgpack.jackson.dataformat.MessagePackFactory; + +class SerializationTest extends DDJavaSpecification { + + @Test + void testJsonMapperSerialization() throws Exception { + // setup + ObjectMapper mapper = new ObjectMapper(); + Map map = singletonMap("key1", "val1"); + byte[] serializedMap = mapper.writeValueAsBytes(map); + byte[] serializedList = ("[" + new String(serializedMap) + "]").getBytes(); + + // when + List> result = + mapper.readValue(serializedList, new TypeReference>>() {}); + + // then + assertEquals(Collections.singletonList(map), result); + assertEquals("[{\"key1\":\"val1\"}]", new String(serializedList)); + } + + @Test + void testMsgpackMapperSerialization() throws Exception { + // setup + ObjectMapper mapper = new ObjectMapper(new MessagePackFactory()); + // GStrings get odd results in the serializer. + List> input = new ArrayList<>(); + for (int i = 1; i <= 1; i++) { + input.add(singletonMap("key" + i, "val" + i)); + } + List serializedMaps = new ArrayList<>(); + for (Map item : input) { + serializedMaps.add(mapper.writeValueAsBytes(item)); + } + + MessageBufferPacker packer = MessagePack.newDefaultBufferPacker(); + packer.packArrayHeader(serializedMaps.size()); + for (byte[] bytes : serializedMaps) { + packer.writePayload(bytes); + } + byte[] serializedList = packer.toByteArray(); + + // when + List> result = + mapper.readValue(serializedList, new TypeReference>>() {}); + + // then + assertEquals(input, result); + } +} diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/SpanSamplingWorkerTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/SpanSamplingWorkerTest.java new file mode 100644 index 00000000000..f03ecc985df --- /dev/null +++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/SpanSamplingWorkerTest.java @@ -0,0 +1,373 @@ +package datadog.trace.common.writer; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.timeout; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import datadog.trace.api.sampling.PrioritySampling; +import datadog.trace.common.sampling.SingleSpanSampler; +import datadog.trace.core.DDSpan; +import datadog.trace.core.monitor.HealthMetrics; +import datadog.trace.test.util.DDJavaSpecification; +import java.util.Arrays; +import java.util.List; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.LinkedBlockingDeque; +import java.util.concurrent.TimeUnit; +import org.junit.jupiter.api.Test; +import org.tabletest.junit.TableTest; + +class SpanSamplingWorkerTest extends DDJavaSpecification { + + @Test + void testSendOnlySampledSpansToTheSampledSpanQueue() throws InterruptedException { + BlockingQueue primaryQueue = new LinkedBlockingDeque<>(10); + BlockingQueue secondaryQueue = new LinkedBlockingDeque<>(10); + SingleSpanSampler singleSpanSampler = mock(SingleSpanSampler.class); + HealthMetrics healthMetrics = mock(HealthMetrics.class); + SpanSamplingWorker worker = + SpanSamplingWorker.build( + 10, primaryQueue, secondaryQueue, singleSpanSampler, healthMetrics, () -> false); + worker.start(); + DDSpan span1 = mock(DDSpan.class); + DDSpan span2 = mock(DDSpan.class); + DDSpan span3 = mock(DDSpan.class); + when(singleSpanSampler.setSamplingPriority(span1)).thenReturn(true); + when(singleSpanSampler.setSamplingPriority(span2)).thenReturn(false); + when(singleSpanSampler.setSamplingPriority(span3)).thenReturn(true); + + worker.getSpanSamplingQueue().offer(Arrays.asList(span1, span2, span3)); + + assertEquals(Arrays.asList(span1, span3), primaryQueue.take()); + assertEquals(Arrays.asList(span2), secondaryQueue.take()); + + worker.close(); + } + + @Test + void testHandleMultipleTraces() throws InterruptedException { + BlockingQueue primaryQueue = new LinkedBlockingDeque<>(10); + BlockingQueue secondaryQueue = new LinkedBlockingDeque<>(10); + SingleSpanSampler singleSpanSampler = mock(SingleSpanSampler.class); + HealthMetrics healthMetrics = mock(HealthMetrics.class); + SpanSamplingWorker worker = + SpanSamplingWorker.build( + 10, primaryQueue, secondaryQueue, singleSpanSampler, healthMetrics, () -> false); + worker.start(); + DDSpan span1 = mock(DDSpan.class); + DDSpan span2 = mock(DDSpan.class); + DDSpan span3 = mock(DDSpan.class); + when(singleSpanSampler.setSamplingPriority(span1)).thenReturn(true); + when(singleSpanSampler.setSamplingPriority(span2)).thenReturn(false); + when(singleSpanSampler.setSamplingPriority(span3)).thenReturn(true); + DDSpan span4 = mock(DDSpan.class); + DDSpan span5 = mock(DDSpan.class); + when(singleSpanSampler.setSamplingPriority(span4)).thenReturn(true); + when(singleSpanSampler.setSamplingPriority(span5)).thenReturn(false); + + worker.getSpanSamplingQueue().offer(Arrays.asList(span1, span2, span3)); + worker.getSpanSamplingQueue().offer(Arrays.asList(span4, span5)); + + assertEquals(Arrays.asList(span1, span3), primaryQueue.take()); + assertEquals(Arrays.asList(span2), secondaryQueue.take()); + assertEquals(Arrays.asList(span4), primaryQueue.take()); + assertEquals(Arrays.asList(span5), secondaryQueue.take()); + + worker.close(); + } + + @Test + void testSkipTracesWithNoSampledSpans() throws InterruptedException { + BlockingQueue primaryQueue = new LinkedBlockingDeque<>(10); + BlockingQueue secondaryQueue = new LinkedBlockingDeque<>(10); + SingleSpanSampler singleSpanSampler = mock(SingleSpanSampler.class); + HealthMetrics healthMetrics = mock(HealthMetrics.class); + SpanSamplingWorker worker = + SpanSamplingWorker.build( + 10, primaryQueue, secondaryQueue, singleSpanSampler, healthMetrics, () -> false); + worker.start(); + DDSpan span1 = mock(DDSpan.class); + DDSpan span2 = mock(DDSpan.class); + DDSpan span3 = mock(DDSpan.class); + when(singleSpanSampler.setSamplingPriority(span1)).thenReturn(true); + when(singleSpanSampler.setSamplingPriority(span2)).thenReturn(false); + when(singleSpanSampler.setSamplingPriority(span3)).thenReturn(true); + DDSpan span4 = mock(DDSpan.class); + DDSpan span5 = mock(DDSpan.class); + when(singleSpanSampler.setSamplingPriority(span4)).thenReturn(false); + when(singleSpanSampler.setSamplingPriority(span5)).thenReturn(false); + DDSpan span6 = mock(DDSpan.class); + DDSpan span7 = mock(DDSpan.class); + when(singleSpanSampler.setSamplingPriority(span6)).thenReturn(true); + when(singleSpanSampler.setSamplingPriority(span7)).thenReturn(true); + + assertTrue(worker.getSpanSamplingQueue().offer(Arrays.asList(span1, span2, span3))); + assertTrue(worker.getSpanSamplingQueue().offer(Arrays.asList(span4, span5))); + assertTrue(worker.getSpanSamplingQueue().offer(Arrays.asList(span6, span7))); + + assertEquals(Arrays.asList(span1, span3), primaryQueue.take()); + assertEquals(Arrays.asList(span2), secondaryQueue.take()); + assertEquals(Arrays.asList(span4, span5), secondaryQueue.take()); + assertEquals(Arrays.asList(span6, span7), primaryQueue.take()); + + worker.close(); + } + + @Test + void testIgnoreEmptyTraces() throws InterruptedException { + BlockingQueue primaryQueue = new LinkedBlockingDeque<>(10); + BlockingQueue secondaryQueue = new LinkedBlockingDeque<>(10); + SingleSpanSampler singleSpanSampler = mock(SingleSpanSampler.class); + HealthMetrics healthMetrics = mock(HealthMetrics.class); + SpanSamplingWorker worker = + SpanSamplingWorker.build( + 10, primaryQueue, secondaryQueue, singleSpanSampler, healthMetrics, () -> false); + worker.start(); + DDSpan span1 = mock(DDSpan.class); + when(singleSpanSampler.setSamplingPriority(span1)).thenReturn(true); + + assertTrue(worker.getSpanSamplingQueue().offer(java.util.Collections.emptyList())); + assertTrue(worker.getSpanSamplingQueue().offer(Arrays.asList(span1))); + + assertEquals(Arrays.asList(span1), primaryQueue.take()); + assertTrue(secondaryQueue.isEmpty()); + + worker.close(); + } + + @Test + void testUpdateDroppedTracesMetricWhenNoTracerSpansHaveBeenSampled() throws InterruptedException { + BlockingQueue primaryQueue = new LinkedBlockingDeque<>(10); + BlockingQueue secondaryQueue = new LinkedBlockingDeque<>(10); + SingleSpanSampler singleSpanSampler = mock(SingleSpanSampler.class); + HealthMetrics healthMetrics = mock(HealthMetrics.class); + CountDownLatch latch = new CountDownLatch(1); + SpanSamplingWorker worker = + new SpanSamplingWorker.DefaultSpanSamplingWorker( + 10, primaryQueue, secondaryQueue, singleSpanSampler, healthMetrics, () -> false) { + @Override + protected void afterOnEvent() { + latch.countDown(); + } + }; + worker.start(); + DDSpan span1 = mock(DDSpan.class); + DDSpan span2 = mock(DDSpan.class); + when(span1.samplingPriority()).thenReturn((int) PrioritySampling.USER_DROP); + when(singleSpanSampler.setSamplingPriority(span1)).thenReturn(false); + when(singleSpanSampler.setSamplingPriority(span2)).thenReturn(false); + List trace = Arrays.asList(span1, span2); + + assertTrue(worker.getSpanSamplingQueue().offer(trace)); + + // wait for processing + assertTrue(latch.await(10, TimeUnit.SECONDS)); + assertTrue(primaryQueue.isEmpty()); + assertEquals(trace, secondaryQueue.take()); + verify(healthMetrics).onPublish(trace, PrioritySampling.USER_DROP); + verify(healthMetrics, never()).onFailedPublish(anyInt(), anyInt()); + verify(healthMetrics, never()).onPartialPublish(anyInt()); + + worker.close(); + } + + @Test + void testUpdateDroppedTracesMetricWhenPrimaryQueueIsFull() throws InterruptedException { + BlockingQueue primaryQueue = new LinkedBlockingDeque<>(1); + BlockingQueue secondaryQueue = new LinkedBlockingDeque<>(10); + primaryQueue.offer(java.util.Collections.emptyList()); // occupy the entire queue + SingleSpanSampler singleSpanSampler = mock(SingleSpanSampler.class); + HealthMetrics healthMetrics = mock(HealthMetrics.class); + CountDownLatch latch = new CountDownLatch(1); + SpanSamplingWorker worker = + new SpanSamplingWorker.DefaultSpanSamplingWorker( + 10, primaryQueue, secondaryQueue, singleSpanSampler, healthMetrics, () -> false) { + @Override + protected void afterOnEvent() { + latch.countDown(); + } + }; + worker.start(); + DDSpan span1 = mock(DDSpan.class); + DDSpan span2 = mock(DDSpan.class); + when(span1.samplingPriority()).thenReturn((int) PrioritySampling.SAMPLER_DROP); + when(singleSpanSampler.setSamplingPriority(span1)).thenReturn(false); + when(singleSpanSampler.setSamplingPriority(span2)).thenReturn(true); + List trace = Arrays.asList(span1, span2); + + assertTrue(worker.getSpanSamplingQueue().offer(trace)); + + // wait for processing + assertTrue(latch.await(10, TimeUnit.SECONDS)); + assertTrue(secondaryQueue.isEmpty()); + verify(healthMetrics).onFailedPublish(eq((int) PrioritySampling.SAMPLER_DROP), anyInt()); + verify(healthMetrics, never()).onPublish(any(), anyInt()); + verify(healthMetrics, never()).onPartialPublish(anyInt()); + + worker.close(); + } + + @Test + void testUpdatePublishedTracesMetricWhenAllTraceSpansHaveBeenSampled() + throws InterruptedException { + BlockingQueue primaryQueue = new LinkedBlockingDeque<>(10); + BlockingQueue secondaryQueue = new LinkedBlockingDeque<>(10); + SingleSpanSampler singleSpanSampler = mock(SingleSpanSampler.class); + HealthMetrics healthMetrics = mock(HealthMetrics.class); + SpanSamplingWorker worker = + SpanSamplingWorker.build( + 10, primaryQueue, secondaryQueue, singleSpanSampler, healthMetrics, () -> false); + worker.start(); + DDSpan span1 = mock(DDSpan.class); + DDSpan span2 = mock(DDSpan.class); + when(span1.samplingPriority()).thenReturn((int) PrioritySampling.SAMPLER_DROP); + when(singleSpanSampler.setSamplingPriority(span1)).thenReturn(true); + when(singleSpanSampler.setSamplingPriority(span2)).thenReturn(true); + List trace = Arrays.asList(span1, span2); + + assertTrue(worker.getSpanSamplingQueue().offer(trace)); + + // take() blocks until worker has put spans in primaryQueue + assertEquals(trace, primaryQueue.take()); + assertTrue(secondaryQueue.isEmpty()); + // use timeout to wait for healthMetrics to be called after queue operations + verify(healthMetrics, timeout(5000)).onPublish(trace, PrioritySampling.SAMPLER_DROP); + verify(healthMetrics, never()).onFailedPublish(anyInt(), anyInt()); + verify(healthMetrics, never()).onPartialPublish(anyInt()); + + worker.close(); + } + + @Test + void testUpdatePartialTracesMetricWhenSomeSpansDroppedAndSentToSecondaryQueue() + throws InterruptedException { + BlockingQueue primaryQueue = new LinkedBlockingDeque<>(10); + BlockingQueue secondaryQueue = new LinkedBlockingDeque<>(10); + SingleSpanSampler singleSpanSampler = mock(SingleSpanSampler.class); + HealthMetrics healthMetrics = mock(HealthMetrics.class); + SpanSamplingWorker worker = + SpanSamplingWorker.build( + 10, primaryQueue, secondaryQueue, singleSpanSampler, healthMetrics, () -> false); + worker.start(); + DDSpan span1 = mock(DDSpan.class); + DDSpan span2 = mock(DDSpan.class); + DDSpan span3 = mock(DDSpan.class); + when(singleSpanSampler.setSamplingPriority(span1)).thenReturn(false); + when(singleSpanSampler.setSamplingPriority(span2)).thenReturn(true); + when(singleSpanSampler.setSamplingPriority(span3)).thenReturn(false); + List trace = Arrays.asList(span1, span2, span3); + + assertTrue(worker.getSpanSamplingQueue().offer(trace)); + + // take() blocks until worker has put spans in queues + assertEquals(Arrays.asList(span2), primaryQueue.take()); + assertEquals(Arrays.asList(span1, span3), secondaryQueue.take()); + // use timeout to wait for healthMetrics to be called after queue operations + verify(healthMetrics, timeout(5000)).onPublish(trace, PrioritySampling.SAMPLER_DROP); + verify(healthMetrics, never()).onPartialPublish(anyInt()); + verify(healthMetrics, never()).onFailedPublish(anyInt(), anyInt()); + + worker.close(); + } + + @TableTest({ + "scenario | droppingPolicy | secondaryQueueIsFull", + "dropping active | true | false ", + "secondary queue full | false | true ", + "dropping active+full queue | true | true " + }) + void testUpdatePartialTracesMetricWhenSpansDroppedAndSecondaryQueueFullOrDroppingPolicyActive( + boolean droppingPolicy, boolean secondaryQueueIsFull) throws InterruptedException { + BlockingQueue primaryQueue = new LinkedBlockingDeque<>(10); + BlockingQueue secondaryQueue = new LinkedBlockingDeque<>(secondaryQueueIsFull ? 1 : 10); + if (secondaryQueueIsFull) { + // occupy the entire queue + secondaryQueue.offer(java.util.Collections.emptyList()); + } + SingleSpanSampler singleSpanSampler = mock(SingleSpanSampler.class); + HealthMetrics healthMetrics = mock(HealthMetrics.class); + SpanSamplingWorker worker = + new SpanSamplingWorker.DefaultSpanSamplingWorker( + 10, + primaryQueue, + secondaryQueue, + singleSpanSampler, + healthMetrics, + () -> droppingPolicy); + worker.start(); + DDSpan span1 = mock(DDSpan.class); + DDSpan span2 = mock(DDSpan.class); + DDSpan span3 = mock(DDSpan.class); + when(span1.samplingPriority()).thenReturn((int) PrioritySampling.SAMPLER_DROP); + when(singleSpanSampler.setSamplingPriority(span1)).thenReturn(false); + when(singleSpanSampler.setSamplingPriority(span2)).thenReturn(true); + when(singleSpanSampler.setSamplingPriority(span3)).thenReturn(false); + + assertTrue(worker.getSpanSamplingQueue().offer(Arrays.asList(span1, span2, span3))); + + // take() blocks until worker has put span2 in primaryQueue + assertEquals(Arrays.asList(span2), primaryQueue.take()); + // use timeout to wait for healthMetrics to be called after queue operations + verify(healthMetrics, timeout(5000)).onPartialPublish(2); + verify(healthMetrics, never()).onFailedPublish(anyInt(), anyInt()); + verify(healthMetrics, never()).onPublish(any(), anyInt()); + + worker.close(); + } + + @TableTest({ + "scenario | droppingPolicy | secondaryQueueIsFull", + "dropping active | true | false ", + "secondary queue full | false | true ", + "dropping active+full queue | true | true " + }) + void testUpdateFailedPublishMetricWhenAllSpansDroppedAndSecondaryQueueFullOrDroppingPolicyActive( + boolean droppingPolicy, boolean secondaryQueueIsFull) throws InterruptedException { + BlockingQueue primaryQueue = new LinkedBlockingDeque<>(10); + BlockingQueue secondaryQueue = new LinkedBlockingDeque<>(secondaryQueueIsFull ? 1 : 10); + if (secondaryQueueIsFull) { + // occupy the entire queue + secondaryQueue.offer(java.util.Collections.emptyList()); + } + SingleSpanSampler singleSpanSampler = mock(SingleSpanSampler.class); + HealthMetrics healthMetrics = mock(HealthMetrics.class); + CountDownLatch latch = new CountDownLatch(1); + SpanSamplingWorker worker = + new SpanSamplingWorker.DefaultSpanSamplingWorker( + 10, + primaryQueue, + secondaryQueue, + singleSpanSampler, + healthMetrics, + () -> droppingPolicy) { + @Override + protected void afterOnEvent() { + latch.countDown(); + } + }; + worker.start(); + DDSpan span1 = mock(DDSpan.class); + DDSpan span2 = mock(DDSpan.class); + when(span1.samplingPriority()).thenReturn((int) PrioritySampling.SAMPLER_DROP); + when(singleSpanSampler.setSamplingPriority(span1)).thenReturn(false); + when(singleSpanSampler.setSamplingPriority(span2)).thenReturn(false); + + assertTrue(worker.getSpanSamplingQueue().offer(Arrays.asList(span1, span2))); + + // wait for processing via latch + assertTrue(latch.await(10, TimeUnit.SECONDS)); + verify(healthMetrics).onFailedPublish(eq((int) PrioritySampling.SAMPLER_DROP), anyInt()); + verify(healthMetrics, never()).onPartialPublish(anyInt()); + verify(healthMetrics, never()).onPublish(any(), anyInt()); + + worker.close(); + } +} diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/TraceMapperTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/TraceMapperTest.java new file mode 100644 index 00000000000..2d28a395412 --- /dev/null +++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/TraceMapperTest.java @@ -0,0 +1,124 @@ +package datadog.trace.common.writer; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import datadog.communication.serialization.ByteBufferConsumer; +import datadog.communication.serialization.FlushingBuffer; +import datadog.communication.serialization.GrowableBuffer; +import datadog.communication.serialization.msgpack.MsgPackWriter; +import datadog.trace.common.writer.ddagent.TraceMapperTestBridge; +import datadog.trace.common.writer.ddagent.TraceMapperV0_5; +import datadog.trace.core.CoreTracer; +import datadog.trace.core.DDCoreJavaSpecification; +import datadog.trace.core.DDSpan; +import java.nio.ByteBuffer; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.junit.jupiter.api.Test; +import org.msgpack.core.MessagePack; +import org.msgpack.core.MessageUnpacker; + +class TraceMapperTest extends DDCoreJavaSpecification { + + @Test + void testTraceMapperV05() throws Exception { + CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build(); + DDSpan span = + (DDSpan) + tracer + .buildSpan("datadog", null) + .withTag("service.name", "my-service") + .withTag("elasticsearch.version", "7.0") + .start(); + span.setBaggageItem("baggage", "item"); + span.context().setDataTop("mydata", "[1,2,3]"); + List trace = Collections.singletonList(span); + + TraceMapperV0_5 traceMapper = new TraceMapperV0_5(); + CapturingByteBufferConsumer sink = new CapturingByteBufferConsumer(); + MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(1024, sink)); + packer.format(trace, traceMapper); + packer.flush(); + + // only top-level statements in Spock then-blocks are power assertions; + // expressions inside for-loops are not, so we only assert the critical outcomes + assertNotNull(sink.captured); + GrowableBuffer dictionaryBuffer = TraceMapperTestBridge.getDictionary(traceMapper); + ByteBuffer dictionaryBytes = dictionaryBuffer.slice(); + Map meta = new HashMap<>(); + + MessageUnpacker dictionaryUnpacker = MessagePack.newDefaultUnpacker(dictionaryBytes); + int dictionaryLength = TraceMapperTestBridge.getEncoding(traceMapper).size(); + String[] dictionary = new String[dictionaryLength]; + for (int i = 0; i < dictionary.length; ++i) { + dictionary[i] = dictionaryUnpacker.unpackString(); + } + MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(sink.captured); + int traceCount = unpacker.unpackArrayHeader(); + assertEquals(1, traceCount); + for (int i = 0; i < traceCount; ++i) { + int arrayLength = unpacker.unpackArrayHeader(); + assertEquals(12, arrayLength); + String serviceName = dictionary[unpacker.unpackInt()]; + assertEquals("my-service", serviceName); + String operationName = dictionary[unpacker.unpackInt()]; + assertTrue(operationName.isEmpty()); + String resourceName = dictionary[unpacker.unpackInt()]; + assertTrue(resourceName.isEmpty()); + long traceId = unpacker.unpackLong(); + assertTrue(traceId > 0); + long spanId = unpacker.unpackLong(); + assertTrue(spanId > 0); + long parentId = unpacker.unpackLong(); + assertEquals(0, parentId); + long start = unpacker.unpackLong(); + assertTrue(start > 0); + long duration = unpacker.unpackLong(); + assertEquals(-start, duration); + int error = unpacker.unpackInt(); + assertEquals(0, error); + int metaHeader = unpacker.unpackMapHeader(); + for (int j = 0; j < metaHeader; ++j) { + String key = dictionary[unpacker.unpackInt()]; + assertNotNull(key); + String value = dictionary[unpacker.unpackInt()]; + assertNotNull(value); + meta.put(key, value); + } + int metricsHeader = unpacker.unpackMapHeader(); + for (int j = 0; j < metricsHeader; ++j) { + String key = dictionary[unpacker.unpackInt()]; + assertNotNull(key); + unpacker.skipValue(); + } + String type = dictionary[unpacker.unpackInt()]; + assertNotNull(type); + + // find the meta entry whose key contains ".mydata." and verify its value + String myDataValue = null; + for (Map.Entry entry : meta.entrySet()) { + if (entry.getKey().contains(".mydata.")) { + myDataValue = entry.getValue(); + break; + } + } + assertEquals("[1,2,3]", myDataValue); + } + + tracer.close(); + } + + static class CapturingByteBufferConsumer implements ByteBufferConsumer { + + ByteBuffer captured; + + @Override + public void accept(int messageCount, ByteBuffer buffer) { + captured = buffer; + } + } +} diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/TraceProcessingWorkerTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/TraceProcessingWorkerTest.java new file mode 100644 index 00000000000..6f57f5d455b --- /dev/null +++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/TraceProcessingWorkerTest.java @@ -0,0 +1,645 @@ +package datadog.trace.common.writer; + +import static datadog.trace.api.sampling.PrioritySampling.SAMPLER_KEEP; +import static datadog.trace.common.writer.ddagent.Prioritization.FAST_LANE; +import static datadog.trace.common.writer.ddagent.PrioritizationStrategy.PublishResult.ENQUEUED_FOR_SERIALIZATION; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import datadog.trace.bootstrap.instrumentation.api.SpanPostProcessor; +import datadog.trace.common.sampling.SingleSpanSampler; +import datadog.trace.common.writer.ddagent.PrioritizationStrategy.PublishResult; +import datadog.trace.core.CoreSpan; +import datadog.trace.core.DDSpan; +import datadog.trace.core.DDSpanContext; +import datadog.trace.core.PendingTrace; +import datadog.trace.core.monitor.HealthMetrics; +import datadog.trace.junit.utils.tabletest.PrioritySamplingConverter; +import datadog.trace.test.util.DDJavaSpecification; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.converter.ConvertWith; +import org.tabletest.junit.TableTest; + +class TraceProcessingWorkerTest extends DDJavaSpecification { + + // ------------------------------------------------------------------------- + // Helper: flush-counting payload dispatcher + // ------------------------------------------------------------------------- + + private PayloadDispatcherImpl flushCountingPayloadDispatcher(AtomicInteger flushCounter) { + PayloadDispatcherImpl dispatcher = mock(PayloadDispatcherImpl.class); + doAnswer( + inv -> { + flushCounter.incrementAndGet(); + return null; + }) + .when(dispatcher) + .flush(); + return dispatcher; + } + + // ------------------------------------------------------------------------- + // Test 1: heartbeats should be triggered automatically when enabled + // ------------------------------------------------------------------------- + + @Test + void testHeartbeatsShouldBeTriggeredAutomaticallyWhenEnabled() throws Exception { + AtomicInteger flushCount = new AtomicInteger(); + TraceProcessingWorker worker = + new TraceProcessingWorker( + 10, + mock(HealthMetrics.class), + flushCountingPayloadDispatcher(flushCount), + () -> false, + FAST_LANE, + 1, + TimeUnit.NANOSECONDS, // stop heartbeats from being throttled + null); + + // processor is started + worker.start(); + + try { + // heartbeat occurs automatically + long deadline = System.currentTimeMillis() + 5000; + while (System.currentTimeMillis() < deadline) { + if (flushCount.get() > 0) break; + Thread.sleep(50); + } + assertTrue(flushCount.get() > 0); + } finally { + // cleanup + worker.close(); + } + } + + // ------------------------------------------------------------------------- + // Test 2: heartbeats should occur at least once per second when not throttled + // ------------------------------------------------------------------------- + + @Test + void testHeartbeatsShouldOccurAtLeastOncePerSecondWhenNotThrottled() throws Exception { + AtomicInteger flushCount = new AtomicInteger(); + TraceProcessingWorker worker = + new TraceProcessingWorker( + 10, + mock(HealthMetrics.class), + flushCountingPayloadDispatcher(flushCount), + () -> false, + FAST_LANE, + 1, + TimeUnit.NANOSECONDS, // stop heartbeats from being throttled + null); + + // processor is started + worker.start(); + + try { + // heartbeat occurs automatically approximately once per second + // wait 1 second initial delay, then poll up to 1 second + Thread.sleep(1000); + long deadline = System.currentTimeMillis() + 1000; + while (System.currentTimeMillis() < deadline) { + if (flushCount.get() > 1) break; + Thread.sleep(50); + } + assertTrue(flushCount.get() > 1); + } finally { + // cleanup + worker.close(); + } + } + + // ------------------------------------------------------------------------- + // Test 3: a flush should clear the primary queue + // ------------------------------------------------------------------------- + + @Test + void testAFlushShouldClearThePrimaryQueue() { + AtomicInteger flushCount = new AtomicInteger(); + TraceProcessingWorker worker = + new TraceProcessingWorker( + 10, + mock(HealthMetrics.class), + flushCountingPayloadDispatcher(flushCount), + () -> false, + FAST_LANE, + 100, + TimeUnit.SECONDS, // prevent heartbeats from helping the flush happen + null); + + try { + // there is pending work it is completed before a flush + // processing this span will throw an exception, but it should be caught + // and not disrupt the flush + List trace = Collections.singletonList(mock(DDSpan.class)); + worker.getPrimaryQueue().offer(trace); + worker.start(); + boolean flushed = worker.flush(10, TimeUnit.SECONDS); + + // the flush succeeds, triggers a dispatch, and the queue is empty + assertTrue(flushed); + assertEquals(1, flushCount.get()); + assertTrue(worker.getPrimaryQueue().isEmpty()); + } finally { + // cleanup + worker.close(); + } + } + + // ------------------------------------------------------------------------- + // Test 4: should report failure if serialization fails + // ------------------------------------------------------------------------- + + @TableTest({ + "scenario | priority ", + "sampler drop | PrioritySampling.SAMPLER_DROP", + "user drop | PrioritySampling.USER_DROP ", + "sampler keep | PrioritySampling.SAMPLER_KEEP", + "user keep | PrioritySampling.USER_KEEP ", + "unset | PrioritySampling.UNSET " + }) + void testShouldReportFailureIfSerializationFails( + @ConvertWith(PrioritySamplingConverter.class) int priority) throws Exception { + Throwable theError = new IllegalStateException("thrown by test"); + PayloadDispatcherImpl throwingDispatcher = mock(PayloadDispatcherImpl.class); + doAnswer( + inv -> { + throw theError; + }) + .when(throwingDispatcher) + .addTrace(any()); + + AtomicInteger errorReported = new AtomicInteger(); + HealthMetrics healthMetrics = mock(HealthMetrics.class); + // do this manually with a counter, despite mockito's lovely syntactical sugar so we don't have + // a race condition induced flaky test. All we care about is that an error was reported and that + // it was the right one + doAnswer( + inv -> { + errorReported.incrementAndGet(); + return null; + }) + .when(healthMetrics) + .onFailedSerialize(any(), any()); + + TraceProcessingWorker worker = + new TraceProcessingWorker( + 10, + healthMetrics, + throwingDispatcher, + () -> false, + FAST_LANE, + 100, + TimeUnit.SECONDS, // prevent heartbeats from helping the flush happen + null); + worker.start(); + + try { + // a trace is processed but can't be passed on + worker.publish(mock(DDSpan.class), priority, Collections.singletonList(mock(DDSpan.class))); + + // the error is reported to the monitor + long deadline = System.currentTimeMillis() + 5000; + while (System.currentTimeMillis() < deadline) { + if (errorReported.get() == 1) break; + Thread.sleep(50); + } + assertEquals(1, errorReported.get()); + } finally { + // cleanup + worker.close(); + } + } + + // ------------------------------------------------------------------------- + // Test 5: trace should be post-processed + // ------------------------------------------------------------------------- + + @Test + void testTraceShouldBePostProcessed() throws Exception { + AtomicInteger acceptedCount = new AtomicInteger(); + PayloadDispatcherImpl countingDispatcher = mock(PayloadDispatcherImpl.class); + doAnswer( + inv -> { + acceptedCount.getAndIncrement(); + return null; + }) + .when(countingDispatcher) + .addTrace(any()); + HealthMetrics healthMetrics = mock(HealthMetrics.class); + + // Create real DDSpan instances via reflection (DDSpan.create is package-private) + Method createMethod = + DDSpan.class.getDeclaredMethod( + "create", String.class, long.class, DDSpanContext.class, List.class); + createMethod.setAccessible(true); + + DDSpanContext ctx1 = mock(DDSpanContext.class); + PendingTrace pendingTrace1 = mock(PendingTrace.class); + when(ctx1.getTraceCollector()).thenReturn(pendingTrace1); + when(pendingTrace1.getCurrentTimeNano()).thenReturn(0L); + + DDSpanContext ctx2 = mock(DDSpanContext.class); + PendingTrace pendingTrace2 = mock(PendingTrace.class); + when(ctx2.getTraceCollector()).thenReturn(pendingTrace2); + when(pendingTrace2.getCurrentTimeNano()).thenReturn(0L); + + DDSpan span1 = (DDSpan) createMethod.invoke(null, "test", 0L, ctx1, Collections.emptyList()); + DDSpan span2 = (DDSpan) createMethod.invoke(null, "test", 0L, ctx2, Collections.emptyList()); + + AtomicBoolean processedSpan1 = new AtomicBoolean(false); + AtomicBoolean processedSpan2 = new AtomicBoolean(false); + + SpanPostProcessor mockProcessor = mock(SpanPostProcessor.class); + doAnswer( + inv -> { + Object spanArg = inv.getArgument(0); + if (spanArg == span1) processedSpan1.set(true); + if (spanArg == span2) processedSpan2.set(true); + return null; + }) + .when(mockProcessor) + .process(any(), any()); + + SpanPostProcessor.Holder.INSTANCE = mockProcessor; + + TraceProcessingWorker worker = + new TraceProcessingWorker( + 10, + healthMetrics, + countingDispatcher, + () -> false, + FAST_LANE, + 100, + TimeUnit.SECONDS, + null); + worker.start(); + + try { + // traces are submitted + List trace = new ArrayList<>(); + trace.add(span1); + trace.add(span2); + worker.publish(span1, SAMPLER_KEEP, trace); + worker.publish(span2, SAMPLER_KEEP, trace); + + // traces are passed through unless rejected on submission + long deadline = System.currentTimeMillis() + 5000; + while (System.currentTimeMillis() < deadline) { + if (processedSpan1.get() && processedSpan2.get()) break; + Thread.sleep(50); + } + assertTrue(processedSpan1.get()); + assertTrue(processedSpan2.get()); + } finally { + // cleanup + SpanPostProcessor.Holder.INSTANCE = SpanPostProcessor.Holder.NOOP; + worker.close(); + } + } + + // ------------------------------------------------------------------------- + // Test 6: traces should be processed + // ------------------------------------------------------------------------- + + @TableTest({ + "scenario | priority | traceCount", + "sampler drop x1 | PrioritySampling.SAMPLER_DROP | 1 ", + "user drop x1 | PrioritySampling.USER_DROP | 1 ", + "sampler keep x1 | PrioritySampling.SAMPLER_KEEP | 1 ", + "user keep x1 | PrioritySampling.USER_KEEP | 1 ", + "unset x1 | PrioritySampling.UNSET | 1 ", + "sampler drop x10 | PrioritySampling.SAMPLER_DROP | 10 ", + "user drop x10 | PrioritySampling.USER_DROP | 10 ", + "sampler keep x10 | PrioritySampling.SAMPLER_KEEP | 10 ", + "user keep x10 | PrioritySampling.USER_KEEP | 10 ", + "unset x10 | PrioritySampling.UNSET | 10 ", + "sampler drop x20 | PrioritySampling.SAMPLER_DROP | 20 ", + "user drop x20 | PrioritySampling.USER_DROP | 20 ", + "sampler keep x20 | PrioritySampling.SAMPLER_KEEP | 20 ", + "user keep x20 | PrioritySampling.USER_KEEP | 20 ", + "unset x20 | PrioritySampling.UNSET | 20 ", + "sampler drop x100 | PrioritySampling.SAMPLER_DROP | 100 ", + "user drop x100 | PrioritySampling.USER_DROP | 100 ", + "sampler keep x100 | PrioritySampling.SAMPLER_KEEP | 100 ", + "user keep x100 | PrioritySampling.USER_KEEP | 100 ", + "unset x100 | PrioritySampling.UNSET | 100 " + }) + void testTracesShouldBeProcessed( + @ConvertWith(PrioritySamplingConverter.class) int priority, int traceCount) throws Exception { + AtomicInteger acceptedCount = new AtomicInteger(); + PayloadDispatcherImpl countingDispatcher = mock(PayloadDispatcherImpl.class); + doAnswer( + inv -> { + acceptedCount.getAndIncrement(); + return null; + }) + .when(countingDispatcher) + .addTrace(any()); + HealthMetrics healthMetrics = mock(HealthMetrics.class); + TraceProcessingWorker worker = + new TraceProcessingWorker( + 10, + healthMetrics, + countingDispatcher, + () -> false, + FAST_LANE, + 100, + TimeUnit.SECONDS, // prevent heartbeats from helping the flush happen + null); + worker.start(); + + try { + // traces are submitted + int submitted = 0; + for (int i = 0; i < traceCount; ++i) { + PublishResult publishResult = + worker.publish( + mock(DDSpan.class), priority, Collections.singletonList(mock(DDSpan.class))); + submitted += publishResult == ENQUEUED_FOR_SERIALIZATION ? 1 : 0; + } + + // traces are passed through unless rejected on submission + int expectedSubmitted = submitted; + long deadline = System.currentTimeMillis() + 5000; + while (System.currentTimeMillis() < deadline) { + if (expectedSubmitted == acceptedCount.get()) break; + Thread.sleep(50); + } + assertEquals(expectedSubmitted, acceptedCount.get()); + } finally { + // cleanup + worker.close(); + } + } + + // ------------------------------------------------------------------------- + // Test 7: flush of full queue after worker thread stopped will not flush but will return + // ------------------------------------------------------------------------- + + @Test + void testFlushOfFullQueueAfterWorkerThreadStoppedWillNotFlushButWillReturn() { + PayloadDispatcherImpl countingDispatcher = mock(PayloadDispatcherImpl.class); + HealthMetrics healthMetrics = mock(HealthMetrics.class); + TraceProcessingWorker worker = + new TraceProcessingWorker( + 10, + healthMetrics, + countingDispatcher, + () -> false, + FAST_LANE, + 100, + TimeUnit.SECONDS, + null); + worker.start(); + worker.close(); + + while (worker.getPrimaryQueue().offer(Collections.singletonList(mock(DDSpan.class)))) { + // fill the queue + } + + boolean flushed = worker.flush(1, TimeUnit.SECONDS); + assertFalse(flushed); + } + + // ------------------------------------------------------------------------- + // Test 8: send unsampled traces - dropping policy is active + // ------------------------------------------------------------------------- + + @TableTest({ + "scenario | priority | traceCount | acceptedTraces | acceptedSpans | sampledSingleSpans | spanCount", + "sampler drop 1 trace 1 span | PrioritySampling.SAMPLER_DROP | 1 | 1 | 1 | 1 | 1 ", + "user drop 1 trace 2 spans | PrioritySampling.USER_DROP | 1 | 1 | 1 | 1 | 2 ", + "sampler drop 1 trace 3 spans | PrioritySampling.SAMPLER_DROP | 1 | 1 | 2 | 2 | 3 ", + "user drop 1 trace 4 spans | PrioritySampling.USER_DROP | 1 | 1 | 2 | 2 | 4 ", + "sampler drop 1 trace 5 spans | PrioritySampling.SAMPLER_DROP | 1 | 1 | 3 | 3 | 5 ", + "user drop 2 traces 1 span | PrioritySampling.USER_DROP | 2 | 1 | 1 | 1 | 1 ", + "sampler drop 2 traces 2 spans | PrioritySampling.SAMPLER_DROP | 2 | 2 | 2 | 2 | 2 ", + "user drop 2 traces 3 spans | PrioritySampling.USER_DROP | 2 | 2 | 3 | 3 | 3 ", + "sampler drop 2 traces 4 spans | PrioritySampling.SAMPLER_DROP | 2 | 2 | 4 | 4 | 4 ", + "user drop 2 traces 5 spans | PrioritySampling.USER_DROP | 2 | 2 | 5 | 5 | 5 ", + "sampler drop 10 traces 1 span | PrioritySampling.SAMPLER_DROP | 10 | 5 | 5 | 5 | 1 ", + "user drop 10 traces 2 spans | PrioritySampling.USER_DROP | 10 | 10 | 10 | 10 | 2 ", + "sampler drop 10 traces 3 spans | PrioritySampling.SAMPLER_DROP | 10 | 10 | 15 | 15 | 3 ", + "user drop 10 traces 4 spans | PrioritySampling.USER_DROP | 10 | 10 | 20 | 20 | 4 ", + "sampler drop 10 traces 5 spans | PrioritySampling.SAMPLER_DROP | 10 | 10 | 25 | 25 | 5 ", + "sampler keep 1 trace 1 span | PrioritySampling.SAMPLER_KEEP | 1 | 1 | 1 | 0 | 1 ", + "user keep 1 trace 2 spans | PrioritySampling.USER_KEEP | 1 | 1 | 2 | 0 | 2 ", + "sampler keep 1 trace 3 spans | PrioritySampling.SAMPLER_KEEP | 1 | 1 | 3 | 0 | 3 ", + "user keep 1 trace 4 spans | PrioritySampling.USER_KEEP | 1 | 1 | 4 | 0 | 4 ", + "sampler keep 1 trace 5 spans | PrioritySampling.SAMPLER_KEEP | 1 | 1 | 5 | 0 | 5 ", + "user keep 2 traces 1 span | PrioritySampling.USER_KEEP | 2 | 2 | 2 | 0 | 1 ", + "sampler keep 2 traces 2 spans | PrioritySampling.SAMPLER_KEEP | 2 | 2 | 4 | 0 | 2 ", + "user keep 2 traces 3 spans | PrioritySampling.USER_KEEP | 2 | 2 | 6 | 0 | 3 ", + "sampler keep 2 traces 4 spans | PrioritySampling.SAMPLER_KEEP | 2 | 2 | 8 | 0 | 4 ", + "user keep 2 traces 5 spans | PrioritySampling.USER_KEEP | 2 | 2 | 10 | 0 | 5 ", + "sampler keep 10 traces 1 span | PrioritySampling.SAMPLER_KEEP | 10 | 10 | 10 | 0 | 1 ", + "user keep 10 traces 2 spans | PrioritySampling.USER_KEEP | 10 | 10 | 20 | 0 | 2 ", + "sampler keep 10 traces 3 spans | PrioritySampling.SAMPLER_KEEP | 10 | 10 | 30 | 0 | 3 ", + "user keep 10 traces 4 spans | PrioritySampling.USER_KEEP | 10 | 10 | 40 | 0 | 4 ", + "sampler keep 10 traces 5 spans | PrioritySampling.SAMPLER_KEEP | 10 | 10 | 50 | 0 | 5 " + }) + void testSendUnsampledTracesDroppingPolicyIsActive( + @ConvertWith(PrioritySamplingConverter.class) int priority, + int traceCount, + int acceptedTraces, + int acceptedSpans, + int sampledSingleSpans, + int spanCount) + throws Exception { + HealthMetrics healthMetrics = mock(HealthMetrics.class); + AtomicInteger acceptedCount = new AtomicInteger(); + AtomicInteger acceptedSpanCount = new AtomicInteger(); + PayloadDispatcherImpl countingDispatcher = mock(PayloadDispatcherImpl.class); + doAnswer( + inv -> { + List traceList = inv.getArgument(0); + acceptedSpanCount.getAndAdd(traceList.size()); + acceptedCount.getAndIncrement(); + return null; + }) + .when(countingDispatcher) + .addTrace(any()); + + AtomicInteger sampledSpansCount = new AtomicInteger(); + // drop every other span + SingleSpanSampler singleSpanSampler = + new SingleSpanSampler() { + int counter = 0; + + @Override + public > boolean setSamplingPriority(T span) { + if (counter++ % 2 == 0) { + sampledSpansCount.incrementAndGet(); + return true; + } + return false; + } + }; + + TraceProcessingWorker worker = + new TraceProcessingWorker( + 10, + healthMetrics, + countingDispatcher, + () -> true, + FAST_LANE, + 100, + TimeUnit.SECONDS, + singleSpanSampler); + worker.start(); + + try { + // traces are submitted + for (int i = 0; i < traceCount; ++i) { + List trace = new ArrayList<>(); + for (int j = 0; j < spanCount; j++) { + trace.add(mock(DDSpan.class)); + } + worker.publish(trace.get(0), priority, trace); + } + + // traces are passed through unless rejected on submission + long deadline = System.currentTimeMillis() + 5000; + while (System.currentTimeMillis() < deadline) { + if (acceptedTraces == acceptedCount.get() + && acceptedSpans == acceptedSpanCount.get() + && sampledSingleSpans == sampledSpansCount.get()) break; + Thread.sleep(50); + } + assertEquals(acceptedTraces, acceptedCount.get()); + assertEquals(acceptedSpans, acceptedSpanCount.get()); + assertEquals(sampledSingleSpans, sampledSpansCount.get()); + } finally { + // cleanup + worker.close(); + } + } + + // ------------------------------------------------------------------------- + // Test 9: send unsampled traces - dropping policy is inactive + // ------------------------------------------------------------------------- + + @TableTest({ + "scenario | priority | traceCount | expectedChunks | expectedSpans | sampledSingleSpans | spanCount", + "sampler drop 1 trace 1 span | PrioritySampling.SAMPLER_DROP | 1 | 1 | 1 | 1 | 1 ", + "user drop 1 trace 2 spans | PrioritySampling.USER_DROP | 1 | 2 | 2 | 1 | 2 ", + "sampler drop 1 trace 3 spans | PrioritySampling.SAMPLER_DROP | 1 | 2 | 3 | 2 | 3 ", + "user drop 1 trace 4 spans | PrioritySampling.USER_DROP | 1 | 2 | 4 | 2 | 4 ", + "sampler drop 1 trace 5 spans | PrioritySampling.SAMPLER_DROP | 1 | 2 | 5 | 3 | 5 ", + "user drop 2 traces 1 span | PrioritySampling.USER_DROP | 2 | 2 | 2 | 1 | 1 ", + "sampler drop 2 traces 2 spans | PrioritySampling.SAMPLER_DROP | 2 | 4 | 4 | 2 | 2 ", + "user drop 2 traces 3 spans | PrioritySampling.USER_DROP | 2 | 4 | 6 | 3 | 3 ", + "sampler drop 2 traces 4 spans | PrioritySampling.SAMPLER_DROP | 2 | 4 | 8 | 4 | 4 ", + "user drop 2 traces 5 spans | PrioritySampling.USER_DROP | 2 | 4 | 10 | 5 | 5 ", + "user drop 10 traces 1 span | PrioritySampling.USER_DROP | 10 | 10 | 10 | 5 | 1 ", + "sampler drop 10 traces 2 spans | PrioritySampling.SAMPLER_DROP | 10 | 20 | 20 | 10 | 2 ", + "user drop 10 traces 3 spans | PrioritySampling.USER_DROP | 10 | 20 | 30 | 15 | 3 ", + "sampler drop 10 traces 4 spans | PrioritySampling.SAMPLER_DROP | 10 | 20 | 40 | 20 | 4 ", + "user drop 10 traces 5 spans | PrioritySampling.USER_DROP | 10 | 20 | 50 | 25 | 5 ", + "sampler keep 1 trace 1 span | PrioritySampling.SAMPLER_KEEP | 1 | 1 | 1 | 0 | 1 ", + "user keep 1 trace 2 spans | PrioritySampling.USER_KEEP | 1 | 1 | 2 | 0 | 2 ", + "sampler keep 1 trace 3 spans | PrioritySampling.SAMPLER_KEEP | 1 | 1 | 3 | 0 | 3 ", + "user keep 1 trace 4 spans | PrioritySampling.USER_KEEP | 1 | 1 | 4 | 0 | 4 ", + "sampler keep 1 trace 5 spans | PrioritySampling.SAMPLER_KEEP | 1 | 1 | 5 | 0 | 5 ", + "user keep 2 traces 1 span | PrioritySampling.USER_KEEP | 2 | 2 | 2 | 0 | 1 ", + "sampler keep 2 traces 2 spans | PrioritySampling.SAMPLER_KEEP | 2 | 2 | 4 | 0 | 2 ", + "user keep 2 traces 3 spans | PrioritySampling.USER_KEEP | 2 | 2 | 6 | 0 | 3 ", + "sampler keep 2 traces 4 spans | PrioritySampling.SAMPLER_KEEP | 2 | 2 | 8 | 0 | 4 ", + "user keep 2 traces 5 spans | PrioritySampling.USER_KEEP | 2 | 2 | 10 | 0 | 5 ", + "sampler keep 10 traces 1 span | PrioritySampling.SAMPLER_KEEP | 10 | 10 | 10 | 0 | 1 ", + "user keep 10 traces 2 spans | PrioritySampling.USER_KEEP | 10 | 10 | 20 | 0 | 2 ", + "sampler keep 10 traces 3 spans | PrioritySampling.SAMPLER_KEEP | 10 | 10 | 30 | 0 | 3 ", + "user keep 10 traces 4 spans | PrioritySampling.USER_KEEP | 10 | 10 | 40 | 0 | 4 ", + "sampler keep 10 traces 5 spans | PrioritySampling.SAMPLER_KEEP | 10 | 10 | 50 | 0 | 5 " + }) + void testSendUnsampledTracesDroppingPolicyIsInactive( + @ConvertWith(PrioritySamplingConverter.class) int priority, + int traceCount, + int expectedChunks, + int expectedSpans, + int sampledSingleSpans, + int spanCount) + throws Exception { + HealthMetrics healthMetrics = mock(HealthMetrics.class); + AtomicInteger chunksCount = new AtomicInteger(); + AtomicInteger spansCount = new AtomicInteger(); + PayloadDispatcherImpl countingDispatcher = mock(PayloadDispatcherImpl.class); + doAnswer( + inv -> { + List traceList = inv.getArgument(0); + spansCount.getAndAdd(traceList.size()); + chunksCount.getAndIncrement(); + return null; + }) + .when(countingDispatcher) + .addTrace(any()); + + AtomicInteger sampledSpansCount = new AtomicInteger(); + // drop every other span + SingleSpanSampler singleSpanSampler = + new SingleSpanSampler() { + int counter = 0; + + @Override + public > boolean setSamplingPriority(T span) { + if (counter++ % 2 == 0) { + sampledSpansCount.incrementAndGet(); + return true; + } + return false; + } + }; + + TraceProcessingWorker worker = + new TraceProcessingWorker( + 10, + healthMetrics, + countingDispatcher, + () -> false, + FAST_LANE, + 100, + TimeUnit.SECONDS, + singleSpanSampler); + worker.start(); + + try { + // traces are submitted + for (int i = 0; i < traceCount; ++i) { + List trace = new ArrayList<>(); + for (int j = 0; j < spanCount; j++) { + trace.add(mock(DDSpan.class)); + } + worker.publish(trace.get(0), priority, trace); + } + + // traces are passed through unless rejected on submission + long deadline = System.currentTimeMillis() + 5000; + while (System.currentTimeMillis() < deadline) { + if (expectedChunks == chunksCount.get() + && expectedSpans == spansCount.get() + && sampledSingleSpans == sampledSpansCount.get()) break; + Thread.sleep(50); + } + assertEquals(expectedChunks, chunksCount.get()); + assertEquals(expectedSpans, spansCount.get()); + assertEquals(sampledSingleSpans, sampledSpansCount.get()); + } finally { + // cleanup + worker.close(); + } + } +} diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/WriterFactoryTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/WriterFactoryTest.java new file mode 100644 index 00000000000..bb52f69806a --- /dev/null +++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/WriterFactoryTest.java @@ -0,0 +1,295 @@ +package datadog.trace.common.writer; + +import static datadog.trace.api.config.TracerConfig.PRIORITIZATION_TYPE; +import static java.util.Collections.singletonList; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import datadog.communication.ddagent.DDAgentFeaturesDiscovery; +import datadog.communication.ddagent.SharedCommunicationObjects; +import datadog.trace.api.Config; +import datadog.trace.api.config.OtlpConfig; +import datadog.trace.api.intake.TrackType; +import datadog.trace.common.sampling.Sampler; +import datadog.trace.common.writer.ddagent.Prioritization; +import datadog.trace.core.monitor.HealthMetrics; +import datadog.trace.test.util.DDJavaSpecification; +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import okhttp3.Call; +import okhttp3.HttpUrl; +import okhttp3.MediaType; +import okhttp3.OkHttpClient; +import okhttp3.Protocol; +import okhttp3.Request; +import okhttp3.Response; +import okhttp3.ResponseBody; +import org.tabletest.junit.TableTest; + +class WriterFactoryTest extends DDJavaSpecification { + + @TableTest({ + "scenario | configuredType | hasEvpProxy | evpProxySupportsCompression | isCiVisibilityAgentlessEnabled | expectedWriterClass | expectedApiClass | isCompressionEnabled", + "LoggingWriter agentless | LoggingWriter | true | false | true | datadog.trace.common.writer.LoggingWriter | | false ", + "PrintingWriter agentless | PrintingWriter | true | false | true | datadog.trace.common.writer.PrintingWriter | | false ", + "TraceStructureWriter agentless | TraceStructureWriter | true | false | true | datadog.trace.common.writer.TraceStructureWriter | | false ", + "MultiWriter agentless | 'MultiWriter:LoggingWriter,PrintingWriter' | true | false | true | datadog.trace.common.writer.MultiWriter | | false ", + "DDIntakeWriter evp agentless | DDIntakeWriter | true | false | true | datadog.trace.common.writer.DDIntakeWriter | datadog.trace.common.writer.ddintake.DDIntakeApi | true ", + "DDIntakeWriter evp not agentless | DDIntakeWriter | true | false | false | datadog.trace.common.writer.DDIntakeWriter | datadog.trace.common.writer.ddintake.DDEvpProxyApi | false ", + "DDIntakeWriter no evp agentless | DDIntakeWriter | false | false | true | datadog.trace.common.writer.DDIntakeWriter | datadog.trace.common.writer.ddintake.DDIntakeApi | true ", + "DDIntakeWriter no evp not agentless | DDIntakeWriter | false | false | false | datadog.trace.common.writer.DDIntakeWriter | datadog.trace.common.writer.ddintake.DDIntakeApi | true ", + "DDAgentWriter evp agentless | DDAgentWriter | true | false | true | datadog.trace.common.writer.DDIntakeWriter | datadog.trace.common.writer.ddintake.DDIntakeApi | true ", + "DDAgentWriter evp not agentless | DDAgentWriter | true | false | false | datadog.trace.common.writer.DDIntakeWriter | datadog.trace.common.writer.ddintake.DDEvpProxyApi | false ", + "DDAgentWriter evp compression not agentless | DDAgentWriter | true | true | false | datadog.trace.common.writer.DDIntakeWriter | datadog.trace.common.writer.ddintake.DDEvpProxyApi | true ", + "DDAgentWriter no evp agentless | DDAgentWriter | false | false | true | datadog.trace.common.writer.DDIntakeWriter | datadog.trace.common.writer.ddintake.DDIntakeApi | true ", + "DDAgentWriter no evp not agentless | DDAgentWriter | false | false | false | datadog.trace.common.writer.DDAgentWriter | datadog.trace.common.writer.ddagent.DDAgentApi | false ", + "not-found evp agentless | 'not-found' | true | false | true | datadog.trace.common.writer.DDIntakeWriter | datadog.trace.common.writer.ddintake.DDIntakeApi | true ", + "not-found evp not agentless | 'not-found' | true | false | false | datadog.trace.common.writer.DDIntakeWriter | datadog.trace.common.writer.ddintake.DDEvpProxyApi | false ", + "not-found no evp agentless | 'not-found' | false | false | true | datadog.trace.common.writer.DDIntakeWriter | datadog.trace.common.writer.ddintake.DDIntakeApi | true ", + "not-found no evp not agentless | 'not-found' | false | false | false | datadog.trace.common.writer.DDAgentWriter | datadog.trace.common.writer.ddagent.DDAgentApi | false " + }) + void testWriterCreationForCiVisibility( + String configuredType, + boolean hasEvpProxy, + boolean evpProxySupportsCompression, + boolean isCiVisibilityAgentlessEnabled, + Class expectedWriterClass, + Class expectedApiClass, + boolean isCompressionEnabled) + throws Exception { + Config config = mock(Config.class); + when(config.getApiKey()).thenReturn("my-api-key"); + when(config.getAgentUrl()).thenReturn("http://my-agent.url"); + //noinspection unchecked + doReturn(Prioritization.FAST_LANE) + .when(config) + .getEnumValue( + eq(PRIORITIZATION_TYPE), + (Class) any(Class.class), + any(Prioritization.class)); + when(config.isTracerMetricsEnabled()).thenReturn(true); + when(config.isCiVisibilityEnabled()).thenReturn(true); + when(config.isCiVisibilityCodeCoverageEnabled()).thenReturn(false); + when(config.isCiVisibilityAgentlessEnabled()).thenReturn(isCiVisibilityAgentlessEnabled); + + // Mock agent info response + Response response = + buildHttpResponse( + hasEvpProxy, evpProxySupportsCompression, HttpUrl.parse("http://my-agent.url/info")); + + // Mock HTTP client that simulates delayed response for async feature discovery + Call mockCall = mock(Call.class); + OkHttpClient mockHttpClient = mock(OkHttpClient.class); + when(mockCall.execute()) + .thenAnswer( + inv -> { + // Add a delay + Thread.sleep(400); + return response; + }); + when(mockHttpClient.newCall(any(Request.class))).thenReturn(mockCall); + + // Create SharedCommunicationObjects with mocked HTTP client + SharedCommunicationObjects sharedComm = new SharedCommunicationObjects(); + sharedComm.agentHttpClient = mockHttpClient; + sharedComm.agentUrl = HttpUrl.parse("http://my-agent.url"); + sharedComm.createRemaining(config); + Sampler sampler = mock(Sampler.class); + + Writer writer = + WriterFactory.createWriter( + config, sharedComm, sampler, null, HealthMetrics.NO_OP, configuredType); + + List> expectedApiClasses = + expectedApiClass != null ? singletonList(expectedApiClass) : null; + Collection apis; + List> apiClasses; + if (expectedApiClasses != null) { + apis = ((RemoteWriter) writer).getApis(); + apiClasses = apis.stream().map(Object::getClass).collect(Collectors.toList()); + } else { + apis = java.util.Collections.emptyList(); + apiClasses = java.util.Collections.emptyList(); + } + + assertEquals(expectedWriterClass, writer.getClass()); + assertTrue(expectedApiClasses == null || apiClasses.equals(expectedApiClasses)); + assertTrue( + expectedApiClasses == null + || apis.stream().allMatch(api -> api.isCompressionEnabled() == isCompressionEnabled)); + } + + @TableTest({ + "scenario | configuredType | agentRunning | hasEvpProxy | isLlmObsAgentlessEnabled | expectedWriterClass | expectedLlmObsApiClass ", + "evp proxy not agentless | DDIntakeWriter | true | true | false | datadog.trace.common.writer.DDIntakeWriter | datadog.trace.common.writer.ddintake.DDEvpProxyApi", + "no evp not agentless | DDIntakeWriter | true | false | false | datadog.trace.common.writer.DDIntakeWriter | datadog.trace.common.writer.ddintake.DDIntakeApi ", + "agent not running not agentless | DDIntakeWriter | false | false | false | datadog.trace.common.writer.DDIntakeWriter | datadog.trace.common.writer.ddintake.DDIntakeApi ", + "evp proxy agentless | DDIntakeWriter | true | true | true | datadog.trace.common.writer.DDIntakeWriter | datadog.trace.common.writer.ddintake.DDIntakeApi ", + "no evp agentless | DDIntakeWriter | true | false | true | datadog.trace.common.writer.DDIntakeWriter | datadog.trace.common.writer.ddintake.DDIntakeApi ", + "agent not running agentless | DDIntakeWriter | false | false | true | datadog.trace.common.writer.DDIntakeWriter | datadog.trace.common.writer.ddintake.DDIntakeApi " + }) + void testWriterCreationForLlmObservability( + String configuredType, + boolean agentRunning, + boolean hasEvpProxy, + boolean isLlmObsAgentlessEnabled, + Class expectedWriterClass, + Class expectedLlmObsApiClass) + throws Exception { + Config config = mock(Config.class); + when(config.getApiKey()).thenReturn("my-api-key"); + when(config.getAgentUrl()).thenReturn("http://my-agent.url"); + //noinspection unchecked + doReturn(Prioritization.FAST_LANE) + .when(config) + .getEnumValue( + eq(PRIORITIZATION_TYPE), + (Class) any(Class.class), + any(Prioritization.class)); + when(config.isTracerMetricsEnabled()).thenReturn(true); + when(config.isLlmObsEnabled()).thenReturn(true); + when(config.isLlmObsAgentlessEnabled()).thenReturn(isLlmObsAgentlessEnabled); + + // Mock agent info response + Response response; + if (agentRunning) { + response = buildHttpResponse(hasEvpProxy, true, HttpUrl.parse("http://my-agent.url/info")); + } else { + response = buildHttpResponseNotOk(HttpUrl.parse("http://my-agent.url/info")); + } + + // Mock HTTP client that simulates delayed response for async feature discovery + Call mockCall = mock(Call.class); + OkHttpClient mockHttpClient = mock(OkHttpClient.class); + when(mockCall.execute()) + .thenAnswer( + inv -> { + // Add a delay + Thread.sleep(400); + return response; + }); + when(mockHttpClient.newCall(any(Request.class))).thenReturn(mockCall); + + // Create SharedCommunicationObjects with mocked HTTP client + SharedCommunicationObjects sharedComm = new SharedCommunicationObjects(); + sharedComm.agentHttpClient = mockHttpClient; + sharedComm.agentUrl = HttpUrl.parse("http://my-agent.url"); + sharedComm.createRemaining(config); + Sampler sampler = mock(Sampler.class); + + Writer writer = + WriterFactory.createWriter( + config, sharedComm, sampler, null, HealthMetrics.NO_OP, configuredType); + List> llmObsApiClasses = + ((RemoteWriter) writer) + .getApis().stream() + .filter( + api -> { + try { + Field trackTypeField = api.getClass().getDeclaredField("trackType"); + trackTypeField.setAccessible(true); + return trackTypeField.get(api) == TrackType.LLMOBS; + } catch (Exception e) { + return false; + } + }) + .map(Object::getClass) + .collect(Collectors.toList()); + + assertEquals(expectedWriterClass, writer.getClass()); + assertEquals(singletonList(expectedLlmObsApiClass), llmObsApiClasses); + } + + @TableTest({ + "scenario | protocol | compression | endpoint | expectedSenderClass | expectedUrl | expectedGzip", + "http no gzip | HTTP_PROTOBUF | NONE | 'http://otel-collector:4318/v1/traces' | datadog.trace.core.otlp.common.OtlpHttpSender | 'http://otel-collector:4318/v1/traces' | false ", + "http gzip | HTTP_PROTOBUF | GZIP | 'http://otel-collector:4318/v1/traces' | datadog.trace.core.otlp.common.OtlpHttpSender | 'http://otel-collector:4318/v1/traces' | true ", + "grpc no gzip | GRPC | NONE | 'http://otel-collector:4317' | datadog.trace.core.otlp.common.OtlpGrpcSender | 'http://otel-collector:4317/opentelemetry.proto.collector.trace.v1.TraceService/Export' | false " + }) + void testWriterCreationForOtlpWriter( + OtlpConfig.Protocol protocol, + OtlpConfig.Compression compression, + String endpoint, + Class expectedSenderClass, + String expectedUrl, + boolean expectedGzip) + throws Exception { + Config config = mock(Config.class); + Map headers = new HashMap<>(); + headers.put("api-key", "secret"); + + when(config.getTraceFlushIntervalSeconds()).thenReturn(1.0f); + when(config.getOtlpTracesEndpoint()).thenReturn(endpoint); + when(config.getOtlpTracesHeaders()).thenReturn(headers); + when(config.getOtlpTracesProtocol()).thenReturn(protocol); + when(config.getOtlpTracesCompression()).thenReturn(compression); + when(config.getOtlpTracesTimeout()).thenReturn(5000); + + // OTLP branch in WriterFactory does not consult sharedComm or sampler, so nulls are safe here. + Writer writer = + WriterFactory.createWriter(config, null, null, null, HealthMetrics.NO_OP, "OtlpWriter"); + Object sender = readField(writer, "sender"); + + assertEquals(OtlpWriter.class, writer.getClass()); + assertEquals(expectedSenderClass, sender.getClass()); + assertEquals(expectedUrl, readField(sender, "url").toString()); + assertEquals(headers, readField(sender, "headers")); + assertEquals(expectedGzip, readField(sender, "gzip")); + + writer.close(); + } + + private static Response buildHttpResponse( + boolean hasEvpProxy, boolean evpProxySupportsCompression, HttpUrl agentUrl) { + List endpoints = new ArrayList<>(); + if (hasEvpProxy && evpProxySupportsCompression) { + endpoints.add(DDAgentFeaturesDiscovery.V4_EVP_PROXY_ENDPOINT); + } else if (hasEvpProxy) { + endpoints.add(DDAgentFeaturesDiscovery.V2_EVP_PROXY_ENDPOINT); + } else { + endpoints.add(DDAgentFeaturesDiscovery.V04_ENDPOINT); + } + + StringBuilder endpointsJson = new StringBuilder("["); + for (int i = 0; i < endpoints.size(); i++) { + if (i > 0) endpointsJson.append(","); + endpointsJson.append("\"").append(endpoints.get(i)).append("\""); + } + endpointsJson.append("]"); + String json = "{\"version\":\"7.40.0\",\"endpoints\":" + endpointsJson + "}"; + + return new Response.Builder() + .code(200) + .message("OK") + .protocol(Protocol.HTTP_1_1) + .request(new Request.Builder().url(agentUrl.resolve("/info")).build()) + .body(ResponseBody.create(MediaType.parse("application/json"), json)) + .build(); + } + + private static Response buildHttpResponseNotOk(HttpUrl agentUrl) { + return new Response.Builder() + .code(500) + .message("ERROR") + .protocol(Protocol.HTTP_1_1) + .request(new Request.Builder().url(agentUrl.resolve("/info")).build()) + .body(ResponseBody.create(MediaType.parse("application/json"), "")) + .build(); + } + + private static Object readField(Object instance, String fieldName) throws Exception { + Field field = instance.getClass().getDeclaredField(fieldName); + field.setAccessible(true); + return field.get(instance); + } +} diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV04PayloadTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV04PayloadTest.java new file mode 100644 index 00000000000..87496e430df --- /dev/null +++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV04PayloadTest.java @@ -0,0 +1,451 @@ +package datadog.trace.common.writer.ddagent; + +import static datadog.trace.bootstrap.instrumentation.api.InstrumentationTags.DD_MEASURED; +import static datadog.trace.common.writer.TraceGenerator.generateRandomTraces; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.params.provider.Arguments.arguments; + +import datadog.communication.serialization.ByteBufferConsumer; +import datadog.communication.serialization.FlushingBuffer; +import datadog.communication.serialization.msgpack.MsgPackWriter; +import datadog.trace.api.Config; +import datadog.trace.api.DD64bTraceId; +import datadog.trace.api.DDTags; +import datadog.trace.api.DDTraceId; +import datadog.trace.api.ProcessTags; +import datadog.trace.bootstrap.instrumentation.api.Tags; +import datadog.trace.common.writer.Payload; +import datadog.trace.common.writer.TraceGenerator; +import datadog.trace.core.DDSpanContext; +import datadog.trace.test.util.DDJavaSpecification; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.nio.channels.WritableByteChannel; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Stream; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; +import org.msgpack.core.MessageFormat; +import org.msgpack.core.MessagePack; +import org.msgpack.core.MessageUnpacker; +import org.tabletest.junit.TableTest; + +class TraceMapperV04PayloadTest extends DDJavaSpecification { + + @TableTest({ + "scenario | bufferSize | traceCount | lowCardinality", + "0 traces low card | 20480 | 0 | true ", + "1 trace low card 20k | 20480 | 1 | true ", + "1 trace low card 30k | 30720 | 1 | true ", + "2 traces low card | 30720 | 2 | true ", + "0 traces high card | 20480 | 0 | false ", + "1 trace high card 20k | 20480 | 1 | false ", + "1 trace high card 30k | 30720 | 1 | false ", + "2 traces high card | 30720 | 2 | false ", + "0 traces 100k low | 102400 | 0 | true ", + "1 trace 100k low | 102400 | 1 | true ", + "10 traces 100k low | 102400 | 10 | true ", + "100 traces 100k low | 102400 | 100 | true ", + "1000 traces 100k low | 102400 | 1000 | true ", + "0 traces 100k high | 102400 | 0 | false ", + "1 trace 100k high | 102400 | 1 | false ", + "10 traces 100k high | 102400 | 10 | false ", + "100 traces 100k high | 102400 | 100 | false ", + "1000 traces 100k high | 102400 | 1000 | false " + }) + void testTracesWrittenCorrectly(int bufferSize, int traceCount, boolean lowCardinality) { + List> traces = generateRandomTraces(traceCount, lowCardinality); + TraceMapperV0_4 traceMapper = new TraceMapperV0_4(); + PayloadVerifier verifier = new PayloadVerifier(traces, traceMapper); + MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(bufferSize, verifier)); + + boolean tracesFitInBuffer = true; + for (List trace : traces) { + if (!packer.format(trace, traceMapper)) { + verifier.skipLargeTrace(); + tracesFitInBuffer = false; + // in the real life the mapper is always reset each trace. + // here we need to force it when we fail since the buffer will be reset as well + traceMapper.reset(); + } + } + packer.flush(); + + if (tracesFitInBuffer) { + verifier.verifyTracesConsumed(); + } + } + + static Stream testFull64BitTraceAndSpanIdentifiersArguments() { + return Stream.of( + arguments(DD64bTraceId.ONE, 2L, 3L), + arguments(DD64bTraceId.MAX, 2L, 3L), + arguments(DD64bTraceId.from(-10), -11L, -12L)); + } + + @ParameterizedTest + @MethodSource("testFull64BitTraceAndSpanIdentifiersArguments") + void testFull64BitTraceAndSpanIdentifiers(DDTraceId traceId, long spanId, long parentId) { + TraceGenerator.PojoSpan span = + new TraceGenerator.PojoSpan( + "service", + "operation", + "resource", + traceId, + spanId, + parentId, + 123L, + 456L, + 0, + Collections.emptyMap(), + Collections.emptyMap(), + "type", + false, + 0, + 0, + "origin"); + List> traces = + Collections.singletonList(Collections.singletonList(span)); + TraceMapperV0_4 traceMapper = new TraceMapperV0_4(); + PayloadVerifier verifier = new PayloadVerifier(traces, traceMapper); + MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(20 << 10, verifier)); + + packer.format(Collections.singletonList(span), traceMapper); + packer.flush(); + + verifier.verifyTracesConsumed(); + } + + @Test + void testMetaStructSupport() { + TraceGenerator.PojoSpan span = + new TraceGenerator.PojoSpan( + "service", + "operation", + "resource", + DDTraceId.ONE, + 1L, + -1L, + 123L, + 456L, + 0, + Collections.emptyMap(), + Collections.emptyMap(), + "type", + false, + 0, + 0, + "origin"); + + StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace(); + List> stackList = new ArrayList<>(); + for (StackTraceElement element : stackTrace) { + Map entry = new HashMap<>(); + entry.put("file", element.getFileName() != null ? element.getFileName() : ""); + entry.put("class_name", element.getClassName()); + entry.put("function", element.getMethodName()); + stackList.add(entry); + } + span.setMetaStruct("stack", stackList); + + List> traces = + Collections.singletonList(Collections.singletonList(span)); + TraceMapperV0_4 traceMapper = new TraceMapperV0_4(); + PayloadVerifier verifier = + new PayloadVerifier( + traces, + traceMapper, + (expectedObj, received) -> { + List expected = (List) expectedObj; + MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(received); + int size = unpacker.unpackArrayHeader(); + assertEquals(expected.size(), size); + for (int i = 0; i < size; i++) { + Map stackEntry = (Map) expected.get(i); + int fields = unpacker.unpackMapHeader(); + for (int j = 0; j < fields; j++) { + String field = unpacker.unpackString(); + assertEquals(stackEntry.get(field), unpacker.unpackString()); + } + } + }); + MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(20 << 10, verifier)); + + packer.format(Collections.singletonList(span), traceMapper); + packer.flush(); + + verifier.verifyTracesConsumed(); + } + + @Test + void testProcessTagsSerialization() { + assertNotNull(ProcessTags.getTagsForSerialization()); + + List spans = new ArrayList<>(); + for (int spanId = 1; spanId <= 2; spanId++) { + spans.add( + new TraceGenerator.PojoSpan( + "service", + "operation", + "resource", + DDTraceId.ONE, + spanId, + -1L, + 123L, + 456L, + 0, + Collections.emptyMap(), + Collections.emptyMap(), + "type", + false, + 0, + 0, + "origin")); + } + + List> traces = Collections.singletonList(spans); + TraceMapperV0_4 traceMapper = new TraceMapperV0_4(); + PayloadVerifier verifier = new PayloadVerifier(traces, traceMapper); + MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(20 << 10, verifier)); + + packer.format(spans, traceMapper); + packer.flush(); + + verifier.verifyTracesConsumed(); + } + + // --- Inner classes --- + + private interface MetaStructVerifier { + void verify(Object expected, byte[] received) throws IOException; + } + + private static final class PayloadVerifier implements ByteBufferConsumer, WritableByteChannel { + + private final List> expectedTraces; + private final TraceMapperV0_4 mapper; + private ByteBuffer captured = ByteBuffer.allocate(200 << 10); + private final MetaStructVerifier metaStructVerifier; + private int position = 0; + + private PayloadVerifier(List> traces, TraceMapperV0_4 mapper) { + this(traces, mapper, null); + } + + private PayloadVerifier( + List> traces, + TraceMapperV0_4 mapper, + MetaStructVerifier metaStructVerifier) { + this.expectedTraces = traces; + this.mapper = mapper; + this.metaStructVerifier = metaStructVerifier; + } + + void skipLargeTrace() { + ++position; + } + + @Override + public void accept(int messageCount, ByteBuffer buffer) { + if (expectedTraces.isEmpty() && messageCount == 0) { + return; + } + int processTagsCount = 0; + try { + Payload payload = mapper.newPayload().withBody(messageCount, buffer); + payload.writeTo(this); + captured.flip(); + MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(captured); + int traceCount = unpacker.unpackArrayHeader(); + for (int i = 0; i < traceCount; ++i) { + List expectedTrace = expectedTraces.get(position++); + int spanCount = unpacker.unpackArrayHeader(); + assertEquals(expectedTrace.size(), spanCount); + for (int k = 0; k < spanCount; ++k) { + TraceGenerator.PojoSpan expectedSpan = expectedTrace.get(k); + int elementCount = unpacker.unpackMapHeader(); + boolean hasMetaStruct = !expectedSpan.getMetaStruct().isEmpty(); + assertEquals(hasMetaStruct ? 13 : 12, elementCount); + assertEquals("service", unpacker.unpackString()); + String serviceName = unpacker.unpackString(); + assertEqualsWithNullAsEmpty(expectedSpan.getServiceName(), serviceName); + assertEquals("name", unpacker.unpackString()); + String operationName = unpacker.unpackString(); + assertEqualsWithNullAsEmpty(expectedSpan.getOperationName(), operationName); + assertEquals("resource", unpacker.unpackString()); + String resourceName = unpacker.unpackString(); + assertEqualsWithNullAsEmpty(expectedSpan.getResourceName(), resourceName); + assertEquals("trace_id", unpacker.unpackString()); + long traceId = unpacker.unpackValue().asNumberValue().toLong(); + assertEquals(expectedSpan.getTraceId().toLong(), traceId); + assertEquals("span_id", unpacker.unpackString()); + long spanId = unpacker.unpackValue().asNumberValue().toLong(); + assertEquals(expectedSpan.getSpanId(), spanId); + assertEquals("parent_id", unpacker.unpackString()); + long parentId = unpacker.unpackValue().asNumberValue().toLong(); + assertEquals(expectedSpan.getParentId(), parentId); + assertEquals("start", unpacker.unpackString()); + long startTime = unpacker.unpackLong(); + assertEquals(expectedSpan.getStartTime(), startTime); + assertEquals("duration", unpacker.unpackString()); + long duration = unpacker.unpackLong(); + assertEquals(expectedSpan.getDurationNano(), duration); + assertEquals("type", unpacker.unpackString()); + String type = unpacker.unpackString(); + assertEquals(expectedSpan.getType(), type); + assertEquals("error", unpacker.unpackString()); + int error = unpacker.unpackInt(); + assertEquals(expectedSpan.getError(), error); + assertEquals("metrics", unpacker.unpackString()); + int metricsSize = unpacker.unpackMapHeader(); + HashMap metrics = new HashMap<>(); + for (int j = 0; j < metricsSize; ++j) { + String key = unpacker.unpackString(); + Number metricValue = null; + MessageFormat format = unpacker.getNextFormat(); + switch (format) { + case NEGFIXINT: + case POSFIXINT: + case INT8: + case UINT8: + case INT16: + case UINT16: + case INT32: + case UINT32: + metricValue = unpacker.unpackInt(); + break; + case INT64: + case UINT64: + metricValue = unpacker.unpackLong(); + break; + case FLOAT32: + metricValue = unpacker.unpackFloat(); + break; + case FLOAT64: + metricValue = unpacker.unpackDouble(); + break; + default: + Assertions.fail("Unexpected type in metrics values: " + format); + } + if (DD_MEASURED.toString().equals(key)) { + assertTrue(metricValue.intValue() == 1 || !expectedSpan.isMeasured()); + } else if (DDSpanContext.PRIORITY_SAMPLING_KEY.equals(key)) { + // check that priority sampling is only on first and last span + if (k == 0 || k == spanCount - 1) { + assertEquals(expectedSpan.samplingPriority(), metricValue.intValue()); + } else { + assertFalse(expectedSpan.hasSamplingPriority()); + } + } else { + metrics.put(key, metricValue); + } + } + for (Map.Entry metric : metrics.entrySet()) { + if (metric.getValue() instanceof Double || metric.getValue() instanceof Float) { + assertEquals( + ((Number) expectedSpan.getTag(metric.getKey())).doubleValue(), + metric.getValue().doubleValue(), + 0.001); + } else { + // Groovy compared numerically, Java requires explicit long comparison to avoid + // Long/Integer type mismatch from different msgpack integer encoding widths + assertEquals( + ((Number) expectedSpan.getTag(metric.getKey())).longValue(), + metric.getValue().longValue()); + } + } + assertEquals("meta", unpacker.unpackString()); + int metaSize = unpacker.unpackMapHeader(); + HashMap meta = new HashMap<>(); + for (int j = 0; j < metaSize; ++j) { + meta.put(unpacker.unpackString(), unpacker.unpackString()); + } + for (Map.Entry entry : meta.entrySet()) { + if (Tags.HTTP_STATUS.equals(entry.getKey())) { + assertEquals(String.valueOf(expectedSpan.getHttpStatusCode()), entry.getValue()); + } else if (DDTags.ORIGIN_KEY.equals(entry.getKey())) { + assertEquals(expectedSpan.getOrigin(), entry.getValue()); + } else if (DDTags.PROCESS_TAGS.equals(entry.getKey())) { + assertTrue(Config.get().isExperimentalPropagateProcessTagsEnabled()); + assertEquals(0, k); + assertEquals(ProcessTags.getTagsForSerialization().toString(), entry.getValue()); + processTagsCount++; + } else { + Object tag = expectedSpan.getTag(entry.getKey()); + if (null != tag) { + assertEquals(String.valueOf(tag), entry.getValue()); + } else { + assertEquals(expectedSpan.getBaggage().get(entry.getKey()), entry.getValue()); + } + } + } + if (hasMetaStruct) { + Map metaStruct = expectedSpan.getMetaStruct(); + assertEquals("meta_struct", unpacker.unpackString()); + int metaStructSize = unpacker.unpackMapHeader(); + for (int j = 0; j < metaStructSize; ++j) { + String field = unpacker.unpackString(); + if (metaStructVerifier != null) { + byte[] binary = new byte[unpacker.unpackBinaryHeader()]; + unpacker.readPayload(binary); + metaStructVerifier.verify(metaStruct.get(field), binary); + } + } + } + } + } + } catch (IOException e) { + Assertions.fail(e.getMessage()); + } finally { + mapper.reset(); + captured.position(0); + captured.limit(captured.capacity()); + assertEquals( + Config.get().isExperimentalPropagateProcessTagsEnabled() ? 1 : 0, processTagsCount); + } + } + + @Override + public int write(ByteBuffer src) { + if (captured.remaining() < src.remaining()) { + ByteBuffer newBuffer = ByteBuffer.allocate(captured.capacity() + src.capacity()); + captured.flip(); + newBuffer.put(captured); + captured = newBuffer; + return write(src); + } + captured.put(src); + return src.position(); + } + + void verifyTracesConsumed() { + assertEquals(expectedTraces.size(), position); + } + + @Override + public boolean isOpen() { + return true; + } + + @Override + public void close() {} + } + + private static void assertEqualsWithNullAsEmpty(CharSequence expected, CharSequence actual) { + if (null == expected) { + assertEquals("", actual); + } else { + assertEquals(expected.toString(), actual.toString()); + } + } +} diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV05PayloadTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV05PayloadTest.java new file mode 100644 index 00000000000..453a35f04bc --- /dev/null +++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV05PayloadTest.java @@ -0,0 +1,402 @@ +package datadog.trace.common.writer.ddagent; + +import static datadog.trace.api.config.GeneralConfig.EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED; +import static datadog.trace.bootstrap.instrumentation.api.InstrumentationTags.DD_MEASURED; +import static datadog.trace.common.writer.TraceGenerator.generateRandomTraces; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import datadog.communication.serialization.ByteBufferConsumer; +import datadog.communication.serialization.FlushingBuffer; +import datadog.communication.serialization.msgpack.MsgPackWriter; +import datadog.trace.api.Config; +import datadog.trace.api.DDSpanId; +import datadog.trace.api.DDTags; +import datadog.trace.api.DDTraceId; +import datadog.trace.api.ProcessTags; +import datadog.trace.api.sampling.PrioritySampling; +import datadog.trace.bootstrap.instrumentation.api.Tags; +import datadog.trace.common.writer.Payload; +import datadog.trace.common.writer.TraceGenerator; +import datadog.trace.core.DDSpanContext; +import datadog.trace.junit.utils.config.WithConfig; +import datadog.trace.test.util.DDJavaSpecification; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.nio.channels.WritableByteChannel; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.atomic.AtomicInteger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.msgpack.core.MessageFormat; +import org.msgpack.core.MessagePack; +import org.msgpack.core.MessageUnpacker; +import org.tabletest.junit.TableTest; + +class TraceMapperV05PayloadTest extends DDJavaSpecification { + + @BeforeEach + void resetProcessTags() { + // Sync ProcessTags.enabled with the current Config (which may be modified by @WithConfig) + ProcessTags.reset(Config.get()); + } + + @WithConfig(key = EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, value = "false") + @Test + void testBodyOverflowCausesFlush() { + // disable process tags since they are only on the first span of the chunk otherwise the + // calculation woes + // 4x 36 ASCII characters and 2 bytes of msgpack string prefix + int dictionarySpacePerTrace = 4 * (36 + 2); + // enough space for two traces with distinct string values, plus the header + int dictionarySize = dictionarySpacePerTrace * 2 + 5; + TraceMapperV0_5 traceMapper = new TraceMapperV0_5(dictionarySize); + List repeatedTrace = + Collections.singletonList( + new TraceGenerator.PojoSpan( + UUID.randomUUID().toString(), + UUID.randomUUID().toString(), + UUID.randomUUID().toString(), + DDTraceId.ZERO, + DDSpanId.ZERO, + DDSpanId.ZERO, + 10000, + 100, + 0, + Collections.emptyMap(), + Collections.emptyMap(), + UUID.randomUUID().toString(), + false, + PrioritySampling.UNSET, + 0, + null)); + int traceSize = calculateSize(repeatedTrace); + // 30KB body + int bufferSize = 30 << 10; + int tracesRequiredToOverflowBody = (int) Math.ceil((double) bufferSize / traceSize) + 1; + List> traces = new ArrayList<>(tracesRequiredToOverflowBody); + for (int i = 0; i < tracesRequiredToOverflowBody; ++i) { + traces.add(repeatedTrace); + } + // the last one won't be flushed + List> flushedTraces = new ArrayList<>(traces); + flushedTraces.remove(traces.size() - 1); + // need space for the overflowing buffer, the dictionary, and two small array headers + PayloadVerifier verifier = + new PayloadVerifier(flushedTraces, traceMapper, bufferSize + dictionarySize + 1 + 1 + 5); + MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(bufferSize, verifier)); + + for (List trace : traces) { + packer.format(trace, traceMapper); + } + + verifier.verifyTracesConsumed(); + } + + @TableTest({ + "scenario | bufferSize | dictionarySize | traceCount | lowCardinality", + "0 traces 10k buf 10k dict low | 10240 | 10240 | 0 | true ", + "1 trace 10k buf 10k dict low | 10240 | 10240 | 1 | true ", + "10 traces 10k buf 10k dict low | 10240 | 10240 | 10 | true ", + "100 traces 10k buf 10k dict low | 10240 | 10240 | 100 | true ", + "1 trace 10k buf 100k dict low | 10240 | 102400 | 1 | true ", + "10 traces 10k buf 100k dict low | 10240 | 102400 | 10 | true ", + "100 traces 10k buf 100k dict low | 10240 | 102400 | 100 | true ", + "0 traces 10k buf 10k dict high | 10240 | 10240 | 0 | false ", + "1 trace 10k buf 10k dict high | 10240 | 10240 | 1 | false ", + "10 traces 10k buf 10k dict high | 10240 | 10240 | 10 | false ", + "100 traces 10k buf 10k dict high | 10240 | 10240 | 100 | false ", + "1 trace 10k buf 100k dict high | 10240 | 102400 | 1 | false ", + "10 traces 10k buf 100k dict high | 10240 | 102400 | 10 | false ", + "100 traces 10k buf 100k dict high | 10240 | 102400 | 100 | false ", + "0 traces 100k buf 10k dict low | 102400 | 10240 | 0 | true ", + "1 trace 100k buf 10k dict low | 102400 | 10240 | 1 | true ", + "10 traces 100k buf 10k dict low | 102400 | 10240 | 10 | true ", + "100 traces 100k buf 10k dict low | 102400 | 10240 | 100 | true ", + "1 trace 100k buf 100k dict low | 102400 | 102400 | 1 | true ", + "10 traces 100k buf 100k dict low | 102400 | 102400 | 10 | true ", + "100 traces 100k buf 100k dict low | 102400 | 102400 | 100 | true ", + "0 traces 100k buf 10k dict high | 102400 | 10240 | 0 | false ", + "1 trace 100k buf 10k dict high | 102400 | 10240 | 1 | false ", + "10 traces 100k buf 10k dict high | 102400 | 10240 | 10 | false ", + "100 traces 100k buf 10k dict high | 102400 | 10240 | 100 | false ", + "1 trace 100k buf 100k dict high | 102400 | 102400 | 1 | false ", + "10 traces 100k buf 100k dict high | 102400 | 102400 | 10 | false ", + "100 traces 100k buf 100k dict high | 102400 | 102400 | 100 | false ", + "1000 traces 100k buf 100k dict high | 102400 | 102400 | 1000 | false " + }) + void testDictionaryCompressedTracesWrittenCorrectly( + int bufferSize, int dictionarySize, int traceCount, boolean lowCardinality) { + List> traces = generateRandomTraces(traceCount, lowCardinality); + TraceMapperV0_5 traceMapper = new TraceMapperV0_5(dictionarySize); + PayloadVerifier verifier = new PayloadVerifier(traces, traceMapper); + MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(bufferSize, verifier)); + + boolean tracesFitInBuffer = true; + for (List trace : traces) { + if (!packer.format(trace, traceMapper)) { + verifier.skipLargeTrace(); + tracesFitInBuffer = false; + } + } + packer.flush(); + + if (tracesFitInBuffer) { + verifier.verifyTracesConsumed(); + } + } + + @Test + void testProcessTagsSerialization() { + assertNotNull(ProcessTags.getTagsForSerialization()); + + List spans = new ArrayList<>(); + for (int spanId = 1; spanId <= 2; spanId++) { + spans.add( + new TraceGenerator.PojoSpan( + "service", + "operation", + "resource", + DDTraceId.ONE, + spanId, + -1L, + 123L, + 456L, + 0, + Collections.emptyMap(), + Collections.emptyMap(), + "type", + false, + 0, + 0, + "origin")); + } + + List> traces = Collections.singletonList(spans); + TraceMapperV0_5 traceMapper = new TraceMapperV0_5(); + PayloadVerifier verifier = new PayloadVerifier(traces, traceMapper); + MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(20 << 10, verifier)); + + packer.format(spans, traceMapper); + packer.flush(); + + verifier.verifyTracesConsumed(); + } + + // --- Inner classes --- + + private static final class PayloadVerifier implements ByteBufferConsumer, WritableByteChannel { + + private final List> expectedTraces; + private final TraceMapperV0_5 mapper; + private ByteBuffer captured; + private int position = 0; + + private PayloadVerifier(List> traces, TraceMapperV0_5 mapper) { + this(traces, mapper, 200 << 10); + } + + private PayloadVerifier( + List> traces, TraceMapperV0_5 mapper, int size) { + this.expectedTraces = traces; + this.mapper = mapper; + this.captured = ByteBuffer.allocate(size); + } + + void skipLargeTrace() { + ++position; + } + + @Override + public void accept(int messageCount, ByteBuffer buffer) { + int processTagsCount = 0; + try { + Payload payload = mapper.newPayload().withBody(messageCount, buffer); + payload.writeTo(this); + captured.flip(); + MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(captured); + int header = unpacker.unpackArrayHeader(); + assertEquals(2, header); + int dictionarySize = unpacker.unpackArrayHeader(); + String[] dictionary = new String[dictionarySize]; + for (int i = 0; i < dictionary.length; ++i) { + dictionary[i] = unpacker.unpackString(); + } + int traceCount = unpacker.unpackArrayHeader(); + for (int i = 0; i < traceCount; ++i) { + List expectedTrace = expectedTraces.get(position++); + int spanCount = unpacker.unpackArrayHeader(); + assertEquals(expectedTrace.size(), spanCount); + for (int k = 0; k < spanCount; ++k) { + TraceGenerator.PojoSpan expectedSpan = expectedTrace.get(k); + int elementCount = unpacker.unpackArrayHeader(); + assertEquals(12, elementCount); + String serviceName = dictionary[unpacker.unpackInt()]; + assertEqualsWithNullAsEmpty(expectedSpan.getServiceName(), serviceName); + String operationName = dictionary[unpacker.unpackInt()]; + assertEqualsWithNullAsEmpty(expectedSpan.getOperationName(), operationName); + String resourceName = dictionary[unpacker.unpackInt()]; + assertEqualsWithNullAsEmpty(expectedSpan.getResourceName(), resourceName); + long traceId = unpacker.unpackValue().asNumberValue().toLong(); + assertEquals(expectedSpan.getTraceId().toLong(), traceId); + long spanId = unpacker.unpackValue().asNumberValue().toLong(); + assertEquals(expectedSpan.getSpanId(), spanId); + long parentId = unpacker.unpackValue().asNumberValue().toLong(); + assertEquals(expectedSpan.getParentId(), parentId); + long startTime = unpacker.unpackLong(); + assertEquals(expectedSpan.getStartTime(), startTime); + long duration = unpacker.unpackLong(); + assertEquals(expectedSpan.getDurationNano(), duration); + int error = unpacker.unpackInt(); + assertEquals(expectedSpan.getError(), error); + int metaSize = unpacker.unpackMapHeader(); + HashMap meta = new HashMap<>(); + for (int j = 0; j < metaSize; ++j) { + meta.put(dictionary[unpacker.unpackInt()], dictionary[unpacker.unpackInt()]); + } + for (Map.Entry entry : meta.entrySet()) { + if (Tags.HTTP_STATUS.equals(entry.getKey())) { + assertEquals(String.valueOf(expectedSpan.getHttpStatusCode()), entry.getValue()); + } else if (DDTags.ORIGIN_KEY.equals(entry.getKey())) { + assertEquals(expectedSpan.getOrigin(), entry.getValue()); + } else if (DDTags.PROCESS_TAGS.equals(entry.getKey())) { + processTagsCount++; + assertTrue(Config.get().isExperimentalPropagateProcessTagsEnabled()); + assertEquals(0, k); + assertEquals(ProcessTags.getTagsForSerialization().toString(), entry.getValue()); + } else { + Object tag = expectedSpan.getTag(entry.getKey()); + if (null != tag) { + assertEquals(String.valueOf(tag), entry.getValue()); + } else { + assertEquals(expectedSpan.getBaggage().get(entry.getKey()), entry.getValue()); + } + } + } + int metricsSize = unpacker.unpackMapHeader(); + HashMap metrics = new HashMap<>(); + for (int j = 0; j < metricsSize; ++j) { + String key = dictionary[unpacker.unpackInt()]; + Number metricValue = null; + MessageFormat format = unpacker.getNextFormat(); + switch (format) { + case NEGFIXINT: + case POSFIXINT: + case INT8: + case UINT8: + case INT16: + case UINT16: + case INT32: + case UINT32: + metricValue = unpacker.unpackInt(); + break; + case INT64: + case UINT64: + metricValue = unpacker.unpackLong(); + break; + case FLOAT32: + metricValue = unpacker.unpackFloat(); + break; + case FLOAT64: + metricValue = unpacker.unpackDouble(); + break; + default: + Assertions.fail( + "Unexpected type in metrics values: " + format + " for key " + key); + } + if (DD_MEASURED.toString().equals(key)) { + assertTrue(metricValue.intValue() == 1 || !expectedSpan.isMeasured()); + } else if (DDSpanContext.PRIORITY_SAMPLING_KEY.equals(key)) { + // check that priority sampling is only on first and last span + if (k == 0 || k == spanCount - 1) { + assertEquals(expectedSpan.samplingPriority(), metricValue.intValue()); + } else { + assertFalse(expectedSpan.hasSamplingPriority()); + } + } else { + metrics.put(key, metricValue); + } + } + for (Map.Entry metric : metrics.entrySet()) { + if (metric.getValue() instanceof Double || metric.getValue() instanceof Float) { + assertEquals( + ((Number) expectedSpan.getTag(metric.getKey())).doubleValue(), + metric.getValue().doubleValue(), + 0.001, + metric.getKey()); + } else { + // Groovy compared numerically; use longValue() to avoid Long/Integer type mismatch + assertEquals( + ((Number) expectedSpan.getTag(metric.getKey())).longValue(), + metric.getValue().longValue(), + metric.getKey()); + } + } + String type = dictionary[unpacker.unpackInt()]; + assertEquals(expectedSpan.getType(), type); + } + } + } catch (IOException e) { + Assertions.fail(e.getMessage()); + } finally { + assertEquals( + Config.get().isExperimentalPropagateProcessTagsEnabled() ? 1 : 0, processTagsCount); + mapper.reset(); + captured.position(0); + captured.limit(captured.capacity()); + } + } + + @Override + public int write(ByteBuffer src) { + if (captured.remaining() < src.remaining()) { + ByteBuffer newBuffer = ByteBuffer.allocate(captured.capacity() + src.remaining()); + captured.flip(); + newBuffer.put(captured); + captured = newBuffer; + return write(src); + } + captured.put(src); + return src.position(); + } + + void verifyTracesConsumed() { + assertEquals(expectedTraces.size(), position); + } + + @Override + public boolean isOpen() { + return true; + } + + @Override + public void close() {} + } + + private static void assertEqualsWithNullAsEmpty(CharSequence expected, CharSequence actual) { + if (null == expected) { + assertEquals("", actual); + } else { + assertEquals(expected.toString(), actual.toString()); + } + } + + static int calculateSize(List trace) { + AtomicInteger size = new AtomicInteger(); + MsgPackWriter packer = + new MsgPackWriter( + new FlushingBuffer( + 1024, (messageCount, buffer) -> size.set(buffer.limit() - buffer.position()))); + packer.format(trace, new TraceMapperV0_5(1024)); + packer.flush(); + return size.get(); + } +} diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV1PayloadTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV1PayloadTest.java new file mode 100644 index 00000000000..2b5ea0bf7c7 --- /dev/null +++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV1PayloadTest.java @@ -0,0 +1,1827 @@ +package datadog.trace.common.writer.ddagent; + +import static datadog.trace.common.writer.TraceGenerator.generateRandomTraces; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.msgpack.core.MessageFormat.FIXSTR; +import static org.msgpack.core.MessageFormat.STR16; +import static org.msgpack.core.MessageFormat.STR32; +import static org.msgpack.core.MessageFormat.STR8; + +import datadog.communication.serialization.ByteBufferConsumer; +import datadog.communication.serialization.FlushingBuffer; +import datadog.communication.serialization.msgpack.MsgPackWriter; +import datadog.trace.api.DDSpanId; +import datadog.trace.api.DDTags; +import datadog.trace.api.DDTraceId; +import datadog.trace.api.ProcessTags; +import datadog.trace.api.sampling.PrioritySampling; +import datadog.trace.api.sampling.SamplingMechanism; +import datadog.trace.bootstrap.instrumentation.api.AgentSpanLink; +import datadog.trace.bootstrap.instrumentation.api.InstrumentationTags; +import datadog.trace.bootstrap.instrumentation.api.SpanAttributes; +import datadog.trace.bootstrap.instrumentation.api.SpanLink; +import datadog.trace.bootstrap.instrumentation.api.Tags; +import datadog.trace.common.writer.Payload; +import datadog.trace.common.writer.TraceGenerator; +import datadog.trace.core.MetadataConsumer; +import datadog.trace.junit.utils.tabletest.SamplingMechanismConverter; +import datadog.trace.test.util.DDJavaSpecification; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.nio.channels.WritableByteChannel; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.converter.ConvertWith; +import org.msgpack.core.MessageFormat; +import org.msgpack.core.MessagePack; +import org.msgpack.core.MessageUnpacker; +import org.tabletest.junit.TableTest; + +class TraceMapperV1PayloadTest extends DDJavaSpecification { + + @TableTest({ + "scenario | bufferSize | traceCount | lowCardinality", + "0 traces low card | 20480 | 0 | true ", + "1 trace low card | 20480 | 1 | true ", + "2 traces low card | 30720 | 2 | true ", + "0 traces high card | 20480 | 0 | false ", + "1 trace high card | 20480 | 1 | false ", + "2 traces high card | 30720 | 2 | false ", + "10 traces low card | 102400 | 10 | true ", + "100 traces high card | 102400 | 100 | false " + }) + void testTracesWrittenCorrectly(int bufferSize, int traceCount, boolean lowCardinality) { + List> traces = generateRandomTraces(traceCount, lowCardinality); + TraceMapperV1 traceMapper = new TraceMapperV1(); + PayloadVerifier verifier = new PayloadVerifier(traces, traceMapper); + MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(bufferSize, verifier)); + + boolean tracesFitInBuffer = true; + for (List trace : traces) { + if (!packer.format(trace, traceMapper)) { + verifier.skipLargeTrace(); + tracesFitInBuffer = false; + traceMapper.reset(); + } + } + packer.flush(); + + if (tracesFitInBuffer) { + verifier.verifyTracesConsumed(); + } + } + + @Test + void testEndpointReturnsV10() { + assertEquals("v1.0", new TraceMapperV1().endpoint()); + } + + @Test + void testSpanKindValueConversion() { + assertEquals(TraceMapperV1.SPAN_KIND_UNSPECIFIED, TraceMapperV1.getSpanKindValue(null)); + assertEquals( + TraceMapperV1.SPAN_KIND_INTERNAL, TraceMapperV1.getSpanKindValue(Tags.SPAN_KIND_INTERNAL)); + assertEquals( + TraceMapperV1.SPAN_KIND_SERVER, TraceMapperV1.getSpanKindValue(Tags.SPAN_KIND_SERVER)); + assertEquals( + TraceMapperV1.SPAN_KIND_CLIENT, TraceMapperV1.getSpanKindValue(Tags.SPAN_KIND_CLIENT)); + assertEquals( + TraceMapperV1.SPAN_KIND_PRODUCER, TraceMapperV1.getSpanKindValue(Tags.SPAN_KIND_PRODUCER)); + assertEquals( + TraceMapperV1.SPAN_KIND_CONSUMER, TraceMapperV1.getSpanKindValue(Tags.SPAN_KIND_CONSUMER)); + assertEquals(TraceMapperV1.SPAN_KIND_INTERNAL, TraceMapperV1.getSpanKindValue("unknown")); + } + + @Test + void testPayloadContainsExpectedHeaderAndChunkFields() throws IOException { + Map tags = new HashMap<>(); + tags.put(Tags.ENV, "prod"); + tags.put(Tags.VERSION, "1.2.3"); + tags.put(Tags.COMPONENT, "http-client"); + tags.put(Tags.SPAN_KIND, Tags.SPAN_KIND_CLIENT); + tags.put("attr.string", "value"); + tags.put("attr.bool", true); + tags.put("attr.number", 12.5d); + tags.put("_dd.p.dm", "-3"); + + TraceGenerator.PojoSpan span = + new TraceGenerator.PojoSpan( + "service-a", + "operation-a", + "resource-a", + DDTraceId.ONE, + 123L, + 0L, + 1000L, + 2000L, + 1, + Collections.emptyMap(), + tags, + "web", + false, + PrioritySampling.SAMPLER_KEEP, + 200, + "rum"); + + TraceMapperV1 mapper = new TraceMapperV1(); + byte[] encoded = + serializeMappedPayload(mapper, Collections.singletonList(Collections.singletonList(span))); + MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(encoded); + List stringTable = new ArrayList<>(); + stringTable.add(""); + + int payloadFieldCount = unpacker.unpackMapHeader(); + Set payloadFieldsSeen = new HashSet<>(); + int chunkCount = -1; + Map payloadAttributes = null; + + for (int i = 0; i < payloadFieldCount; i++) { + int fieldId = unpacker.unpackInt(); + payloadFieldsSeen.add(fieldId); + switch (fieldId) { + case 2: + case 3: + case 4: + case 5: + case 6: + case 7: + case 8: + case 9: + readStreamingString(unpacker, stringTable); + break; + case 10: + payloadAttributes = readAttributes(unpacker, stringTable); + break; + case 11: + chunkCount = unpacker.unpackArrayHeader(); + assertEquals(1, chunkCount); + verifyChunk(unpacker, Collections.singletonList(span), stringTable); + break; + default: + Assertions.fail("Unexpected payload field id: " + fieldId); + } + } + + assertEquals(10, payloadFieldCount); + Set expectedFields = new HashSet<>(); + for (int i = 2; i <= 11; i++) { + expectedFields.add(i); + } + assertEquals(expectedFields, payloadFieldsSeen); + assertEquals(1, chunkCount); + assertNotNull(payloadAttributes); + if (ProcessTags.getTagsForSerialization() == null) { + assertEquals(0, payloadAttributes.size()); + } else { + assertEquals(1, payloadAttributes.size()); + assertEquals( + ProcessTags.getTagsForSerialization().toString(), + payloadAttributes.get(DDTags.PROCESS_TAGS)); + } + } + + @TableTest({ + "scenario | decisionMakerTag | expectedSamplingMechanism", + "null tag | | SamplingMechanism.DEFAULT", + "simple negative | '-3' | 3 ", + "compound | '934086a686-7' | 7 ", + "invalid | 'invalid' | SamplingMechanism.DEFAULT" + }) + void testSamplingMechanismNormalizationFromDdPDm( + String decisionMakerTag, + @ConvertWith(SamplingMechanismConverter.class) int expectedSamplingMechanism) + throws IOException { + Map dmTags = + decisionMakerTag == null + ? Collections.emptyMap() + : Collections.singletonMap("_dd.p.dm", decisionMakerTag); + + TraceGenerator.PojoSpan span = + new TraceGenerator.PojoSpan( + "service-a", + "operation-a", + "resource-a", + DDTraceId.ONE, + 321L, + 0L, + 1000L, + 2000L, + 0, + Collections.emptyMap(), + dmTags, + "custom", + false, + PrioritySampling.SAMPLER_KEEP, + 200, + null); + + TraceMapperV1 mapper = new TraceMapperV1(); + byte[] encoded = + serializeMappedPayload(mapper, Collections.singletonList(Collections.singletonList(span))); + MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(encoded); + List stringTable = new ArrayList<>(); + stringTable.add(""); + + unpacker.unpackMapHeader(); + int samplingMechanism = -1; + + for (int i = 0; i < 10; i++) { + int payloadFieldId = unpacker.unpackInt(); + if (payloadFieldId == 11) { + int chunkCount = unpacker.unpackArrayHeader(); + assertEquals(1, chunkCount); + int chunkFieldCount = unpacker.unpackMapHeader(); + for (int j = 0; j < chunkFieldCount; j++) { + int chunkFieldId = unpacker.unpackInt(); + if (chunkFieldId == 7) { + samplingMechanism = unpacker.unpackInt(); + } else { + skipChunkField(unpacker, chunkFieldId, stringTable); + } + } + } else { + skipPayloadField(unpacker, payloadFieldId, stringTable); + } + } + + assertEquals(expectedSamplingMechanism, samplingMechanism); + } + + @Test + void testSpanIdsAreEncodedAsUnsignedValuesInV1Payloads() throws IOException { + long spanId = Long.MIN_VALUE + 123L; + long parentId = Long.MIN_VALUE + 456L; + TraceGenerator.PojoSpan span = + new TraceGenerator.PojoSpan( + "service-a", + "operation-a", + "resource-a", + DDTraceId.ONE, + spanId, + parentId, + 1000L, + 2000L, + 0, + Collections.emptyMap(), + Collections.emptyMap(), + "web", + false, + PrioritySampling.SAMPLER_KEEP, + 200, + null); + + TraceMapperV1 mapper = new TraceMapperV1(); + byte[] encoded = + serializeMappedPayload(mapper, Collections.singletonList(Collections.singletonList(span))); + MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(encoded); + List stringTable = new ArrayList<>(); + stringTable.add(""); + + unpacker.unpackMapHeader(); + Long actualSpanId = null; + Long actualParentId = null; + + for (int i = 0; i < 10; i++) { + int payloadFieldId = unpacker.unpackInt(); + if (payloadFieldId == 11) { + int chunkCount = unpacker.unpackArrayHeader(); + assertEquals(1, chunkCount); + int chunkFieldCount = unpacker.unpackMapHeader(); + for (int j = 0; j < chunkFieldCount; j++) { + int chunkFieldId = unpacker.unpackInt(); + if (chunkFieldId == 4) { + int spanCount = unpacker.unpackArrayHeader(); + assertEquals(1, spanCount); + int spanFieldCount = unpacker.unpackMapHeader(); + for (int k = 0; k < spanFieldCount; k++) { + int spanFieldId = unpacker.unpackInt(); + switch (spanFieldId) { + case 4: + assertEquals(MessageFormat.UINT64, unpacker.getNextFormat()); + actualSpanId = DDSpanId.from(unpacker.unpackBigInteger().toString()); + break; + case 5: + assertEquals(MessageFormat.UINT64, unpacker.getNextFormat()); + actualParentId = DDSpanId.from(unpacker.unpackBigInteger().toString()); + break; + default: + skipSpanField(unpacker, spanFieldId, stringTable); + } + } + } else { + skipChunkField(unpacker, chunkFieldId, stringTable); + } + } + } else { + skipPayloadField(unpacker, payloadFieldId, stringTable); + } + } + + assertEquals(spanId, actualSpanId); + assertEquals(parentId, actualParentId); + } + + @Test + void testSpanLinksAreEncodedFromStructuredSpanLinks() throws IOException { + Map linkAttrs = new HashMap<>(); + linkAttrs.put("link.kind", "follows_from"); + linkAttrs.put("context_headers", "tracecontext"); + + List spanLinks = + Arrays.asList( + new TestSpanLink( + DDTraceId.fromHex("11223344556677889900aabbccddeeff"), + DDSpanId.fromHex("000000000000002a"), + (byte) 1, + "dd=s:1", + SpanAttributes.fromMap(linkAttrs)), + new TestSpanLink( + DDTraceId.fromHex("00000000000000000000000000000001"), + DDSpanId.fromHex("0000000000000002"), + (byte) 0, + "", + SpanAttributes.EMPTY)); + + TraceGenerator.PojoSpan span = + new TraceGenerator.PojoSpan( + "service-a", + "operation-a", + "resource-a", + DDTraceId.ONE, + 123L, + 0L, + 1000L, + 2000L, + 0, + Collections.emptyMap(), + Collections.emptyMap(), + "web", + false, + PrioritySampling.SAMPLER_KEEP, + 200, + null, + spanLinks); + + TraceMapperV1 mapper = new TraceMapperV1(); + byte[] encoded = + serializeMappedPayload(mapper, Collections.singletonList(Collections.singletonList(span))); + MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(encoded); + List stringTable = new ArrayList<>(); + stringTable.add(""); + + List> links = readFirstSpanLinks(unpacker, stringTable); + + assertEquals(2, links.size()); + assertArrayEquals( + traceIdBytes(DDTraceId.fromHex("11223344556677889900aabbccddeeff")), + (byte[]) links.get(0).get("traceId")); + assertEquals(DDSpanId.fromHex("000000000000002a"), links.get(0).get("spanId")); + assertEquals("dd=s:1", links.get(0).get("tracestate")); + assertEquals(1L, links.get(0).get("flags")); + Map expectedLinkAttrs0 = new HashMap<>(); + expectedLinkAttrs0.put("link.kind", "follows_from"); + expectedLinkAttrs0.put("context_headers", "tracecontext"); + assertEquals(expectedLinkAttrs0, links.get(0).get("attributes")); + + assertArrayEquals( + traceIdBytes(DDTraceId.fromHex("00000000000000000000000000000001")), + (byte[]) links.get(1).get("traceId")); + assertEquals(DDSpanId.fromHex("0000000000000002"), links.get(1).get("spanId")); + assertEquals("", links.get(1).get("tracestate")); + assertEquals(0L, links.get(1).get("flags")); + assertEquals(Collections.emptyMap(), links.get(1).get("attributes")); + } + + @Test + void testFirstSpanTagsAreProcessedOnce() { + CountingPojoSpan firstSpan = + new CountingPojoSpan( + "service-a", + "operation-a", + "resource-a", + DDTraceId.ONE, + 123L, + 0L, + 1000L, + 2000L, + 0, + Collections.emptyMap(), + Collections.singletonMap(Tags.HTTP_URL, "http://localhost:7777/"), + "web", + false, + PrioritySampling.SAMPLER_KEEP, + 200, + null); + + CountingPojoSpan secondSpan = + new CountingPojoSpan( + "service-a", + "operation-b", + "resource-b", + DDTraceId.ONE, + 456L, + 123L, + 1000L, + 2000L, + 0, + Collections.emptyMap(), + Collections.singletonMap(Tags.HTTP_URL, "http://localhost:7777/"), + "web", + false, + PrioritySampling.SAMPLER_KEEP, + 200, + null); + + TraceMapperV1 mapper = new TraceMapperV1(); + + serializeMappedPayload(mapper, Collections.singletonList(Arrays.asList(firstSpan, secondSpan))); + + assertEquals(1, firstSpan.processTagsAndBaggageCount); + assertEquals(1, secondSpan.processTagsAndBaggageCount); + } + + @Test + void testMissingSpanLinksEncodeEmptyLinks() throws IOException { + TraceGenerator.PojoSpan span = + new TraceGenerator.PojoSpan( + "service-a", + "operation-a", + "resource-a", + DDTraceId.ONE, + 123L, + 0L, + 1000L, + 2000L, + 0, + Collections.emptyMap(), + Collections.emptyMap(), + "web", + false, + PrioritySampling.SAMPLER_KEEP, + 200, + null); + + TraceMapperV1 mapper = new TraceMapperV1(); + byte[] encoded = + serializeMappedPayload(mapper, Collections.singletonList(Collections.singletonList(span))); + MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(encoded); + List stringTable = new ArrayList<>(); + stringTable.add(""); + + List> links = readFirstSpanLinks(unpacker, stringTable); + + assertTrue(links.isEmpty()); + } + + @Test + void testSpanEventsAreEncodedFromEventsTag() throws IOException { + Map eventOneAttrs = new HashMap<>(); + eventOneAttrs.put("str", "v"); + eventOneAttrs.put("int", 42L); + eventOneAttrs.put("double", 12.5d); + eventOneAttrs.put("bool", true); + eventOneAttrs.put("arr", Arrays.asList("x", 7L, 2.5d, false)); + + Map eventOne = new HashMap<>(); + eventOne.put("time_unix_nano", 1234567890L); + eventOne.put("name", "event.one"); + eventOne.put("attributes", eventOneAttrs); + + Map eventTwo = new HashMap<>(); + eventTwo.put("time_unix_nano", 1234567891L); + eventTwo.put("name", "event.two"); + + Map tags = + Collections.singletonMap("events", Arrays.asList(eventOne, eventTwo)); + + TraceGenerator.PojoSpan span = + new TraceGenerator.PojoSpan( + "service-a", + "operation-a", + "resource-a", + DDTraceId.ONE, + 123L, + 0L, + 1000L, + 2000L, + 0, + Collections.emptyMap(), + tags, + "web", + false, + PrioritySampling.SAMPLER_KEEP, + 200, + null); + + TraceMapperV1 mapper = new TraceMapperV1(); + byte[] encoded = + serializeMappedPayload(mapper, Collections.singletonList(Collections.singletonList(span))); + MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(encoded); + List stringTable = new ArrayList<>(); + stringTable.add(""); + + List> events = readFirstSpanEvents(unpacker, stringTable); + + assertEquals(2, events.size()); + assertEquals(1234567890L, events.get(0).get("timeUnixNano")); + assertEquals("event.one", events.get(0).get("name")); + Map decodedAttrs0 = (Map) events.get(0).get("attributes"); + assertEquals("v", decodedAttrs0.get("str")); + assertEquals(42L, decodedAttrs0.get("int")); + assertEquals(12.5d, ((Number) decodedAttrs0.get("double")).doubleValue(), 0.000001d); + assertEquals(true, decodedAttrs0.get("bool")); + assertEquals(Arrays.asList("x", 7L, 2.5d, false), decodedAttrs0.get("arr")); + + assertEquals(1234567891L, events.get(1).get("timeUnixNano")); + assertEquals("event.two", events.get(1).get("name")); + assertEquals(Collections.emptyMap(), events.get(1).get("attributes")); + } + + @Test + void testMalformedSpanEventsFallBackToEmptyEvents() throws IOException { + Map malformedEvent = Collections.singletonMap("foo", "bar"); + Map tags = Collections.singletonMap("events", malformedEvent); + + TraceGenerator.PojoSpan span = + new TraceGenerator.PojoSpan( + "service-a", + "operation-a", + "resource-a", + DDTraceId.ONE, + 123L, + 0L, + 1000L, + 2000L, + 0, + Collections.emptyMap(), + tags, + "web", + false, + PrioritySampling.SAMPLER_KEEP, + 200, + null); + + TraceMapperV1 mapper = new TraceMapperV1(); + byte[] encoded = + serializeMappedPayload(mapper, Collections.singletonList(Collections.singletonList(span))); + MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(encoded); + List stringTable = new ArrayList<>(); + stringTable.add(""); + + List> events = readFirstSpanEvents(unpacker, stringTable); + + assertTrue(events.isEmpty()); + } + + @Test + void testMetaStructIsEncodedAsBytesAttribute() throws IOException { + TraceGenerator.PojoSpan span = + new TraceGenerator.PojoSpan( + "service-a", + "operation-a", + "resource-a", + DDTraceId.ONE, + 123L, + 0L, + 1000L, + 2000L, + 0, + Collections.emptyMap(), + Collections.emptyMap(), + "web", + false, + PrioritySampling.SAMPLER_KEEP, + 200, + null); + + Map metaStructValue = new HashMap<>(); + metaStructValue.put("foo", "bar"); + metaStructValue.put("answer", 42L); + span.setMetaStruct("meta_key", metaStructValue); + + TraceMapperV1 mapper = new TraceMapperV1(); + byte[] encoded = + serializeMappedPayload(mapper, Collections.singletonList(Collections.singletonList(span))); + MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(encoded); + List stringTable = new ArrayList<>(); + stringTable.add(""); + + Map attributes = readFirstSpanAttributes(unpacker, stringTable); + byte[] metaStructBytes = (byte[]) attributes.get("meta_key"); + MessageUnpacker metaStructUnpacker = MessagePack.newDefaultUnpacker(metaStructBytes); + int metaStructFieldCount = metaStructUnpacker.unpackMapHeader(); + Map decodedMetaStruct = new HashMap<>(); + for (int i = 0; i < metaStructFieldCount; i++) { + String key = metaStructUnpacker.unpackString(); + switch (metaStructUnpacker.getNextFormat().getValueType()) { + case INTEGER: + decodedMetaStruct.put(key, metaStructUnpacker.unpackLong()); + break; + case STRING: + decodedMetaStruct.put(key, metaStructUnpacker.unpackString()); + break; + default: + Assertions.fail("Unexpected meta_struct value type for key " + key); + } + } + + assertNotNull(metaStructBytes); + assertEquals("bar", decodedMetaStruct.get("foo")); + assertEquals(42L, decodedMetaStruct.get("answer")); + } + + @Test + void testMapValuedSpanTagsAreFlattenedInV1Attributes() throws IOException { + Map profile = new HashMap<>(); + profile.put("age", 30L); + + Map usr = new HashMap<>(); + usr.put("id", "123"); + usr.put("name", "alice"); + usr.put("authenticated", true); + usr.put("profile", profile); + + Map metadata0 = new HashMap<>(); + metadata0.put("event", "login"); + metadata0.put("attempts", 1L); + + Map metadata1 = new HashMap<>(); + metadata1.put("blocked", false); + + Map appsecEvents = new HashMap<>(); + appsecEvents.put("metadata0", metadata0); + appsecEvents.put("metadata1", metadata1); + + Map tags = new HashMap<>(); + tags.put("usr", usr); + tags.put("appsec.events.users.login.success", appsecEvents); + + TraceGenerator.PojoSpan span = + new TraceGenerator.PojoSpan( + "service-a", + "operation-a", + "resource-a", + DDTraceId.ONE, + 123L, + 0L, + 1000L, + 2000L, + 0, + Collections.emptyMap(), + tags, + "web", + false, + PrioritySampling.SAMPLER_KEEP, + 0, + null); + + TraceMapperV1 mapper = new TraceMapperV1(); + byte[] encoded = + serializeMappedPayload(mapper, Collections.singletonList(Collections.singletonList(span))); + MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(encoded); + List stringTable = new ArrayList<>(); + stringTable.add(""); + + Map attributes = readFirstSpanAttributes(unpacker, stringTable); + + assertTrue(attributes.containsKey("usr.id")); + assertTrue(attributes.containsKey("usr.name")); + assertTrue(attributes.containsKey("usr.authenticated")); + assertTrue(attributes.containsKey("usr.profile.age")); + assertTrue(attributes.containsKey("appsec.events.users.login.success.metadata0.event")); + assertTrue(attributes.containsKey("appsec.events.users.login.success.metadata0.attempts")); + assertTrue(attributes.containsKey("appsec.events.users.login.success.metadata1.blocked")); + + assertEquals("123", attributes.get("usr.id")); + assertEquals("alice", attributes.get("usr.name")); + assertEquals(true, attributes.get("usr.authenticated")); + assertEquals(30d, ((Number) attributes.get("usr.profile.age")).doubleValue(), 0.000001d); + assertEquals("login", attributes.get("appsec.events.users.login.success.metadata0.event")); + assertEquals( + 1d, + ((Number) attributes.get("appsec.events.users.login.success.metadata0.attempts")) + .doubleValue(), + 0.000001d); + assertEquals(false, attributes.get("appsec.events.users.login.success.metadata1.blocked")); + + assertFalse(attributes.containsKey("usr")); + assertFalse(attributes.containsKey("appsec.events.users.login.success")); + } + + @Test + void testPrimitiveSpanTagsAreEncodedInV1Attributes() throws IOException { + Map tags = new HashMap<>(); + tags.put("tag.bool", true); + tags.put("tag.int", 7); + tags.put("tag.long", 9L); + tags.put("tag.float", 3.5f); + tags.put("tag.double", 4.25d); + + TraceGenerator.PojoSpan span = + new TraceGenerator.PojoSpan( + "service-a", + "operation-a", + "resource-a", + DDTraceId.ONE, + 123L, + 0L, + 1000L, + 2000L, + 0, + Collections.emptyMap(), + tags, + "web", + false, + PrioritySampling.SAMPLER_KEEP, + 0, + null); + + TraceMapperV1 mapper = new TraceMapperV1(); + byte[] encoded = + serializeMappedPayload(mapper, Collections.singletonList(Collections.singletonList(span))); + MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(encoded); + List stringTable = new ArrayList<>(); + stringTable.add(""); + + Map attributes = readFirstSpanAttributes(unpacker, stringTable); + + assertEquals(true, attributes.get("tag.bool")); + assertEquals(7d, ((Number) attributes.get("tag.int")).doubleValue(), 0.000001d); + assertEquals(9d, ((Number) attributes.get("tag.long")).doubleValue(), 0.000001d); + assertEquals(3.5d, ((Number) attributes.get("tag.float")).doubleValue(), 0.000001d); + assertEquals(4.25d, ((Number) attributes.get("tag.double")).doubleValue(), 0.000001d); + } + + @Test + void testThreadMetadataIsEncodedInV1Attributes() throws IOException { + TraceGenerator.PojoSpan span = + new TraceGenerator.PojoSpan( + "service-a", + "operation-a", + "resource-a", + DDTraceId.ONE, + 123L, + 0L, + 1000L, + 2000L, + 0, + Collections.emptyMap(), + Collections.emptyMap(), + "web", + false, + PrioritySampling.SAMPLER_KEEP, + 0, + null); + + TraceMapperV1 mapper = new TraceMapperV1(); + byte[] encoded = + serializeMappedPayload(mapper, Collections.singletonList(Collections.singletonList(span))); + MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(encoded); + List stringTable = new ArrayList<>(); + stringTable.add(""); + + Map attributes = readFirstSpanAttributes(unpacker, stringTable); + + assertAttributeValueEquals( + span.getTag(DDTags.THREAD_ID), attributes.get(DDTags.THREAD_ID), DDTags.THREAD_ID); + assertEquals(span.getTag(DDTags.THREAD_NAME).toString(), attributes.get(DDTags.THREAD_NAME)); + } + + // --- Inner classes --- + + private static final class PayloadVerifier implements ByteBufferConsumer, WritableByteChannel { + + private final List> expectedTraces; + private final TraceMapperV1 mapper; + private ByteBuffer captured = ByteBuffer.allocate(200 << 10); + private int position = 0; + + private PayloadVerifier( + List> expectedTraces, TraceMapperV1 mapper) { + this.expectedTraces = expectedTraces; + this.mapper = mapper; + } + + void skipLargeTrace() { + ++position; + } + + @Override + public void accept(int messageCount, ByteBuffer buffer) { + if (expectedTraces.isEmpty() && messageCount == 0) { + return; + } + try { + Payload payload = mapper.newPayload().withBody(messageCount, buffer); + payload.writeTo(this); + captured.flip(); + + MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(captured); + if (messageCount == 0) { + assertEquals(0, unpacker.unpackMapHeader()); + return; + } + + List stringTable = new ArrayList<>(); + stringTable.add(""); + + int payloadFieldCount = unpacker.unpackMapHeader(); + assertEquals(10, payloadFieldCount); + + boolean seenChunks = false; + for (int i = 0; i < payloadFieldCount; i++) { + int fieldId = unpacker.unpackInt(); + if (fieldId == 11) { + int traceCount = unpacker.unpackArrayHeader(); + assertEquals(messageCount, traceCount); + seenChunks = true; + for (int traceIndex = 0; traceIndex < traceCount; traceIndex++) { + List expectedTrace = expectedTraces.get(position++); + verifyChunk(unpacker, expectedTrace, stringTable); + } + } else { + skipPayloadField(unpacker, fieldId, stringTable); + } + } + + assertTrue(seenChunks); + } catch (IOException e) { + Assertions.fail(e.getMessage()); + } finally { + mapper.reset(); + captured.position(0); + captured.limit(captured.capacity()); + } + } + + @Override + public int write(ByteBuffer src) { + if (captured.remaining() < src.remaining()) { + ByteBuffer newBuffer = ByteBuffer.allocate(captured.capacity() + src.remaining()); + captured.flip(); + newBuffer.put(captured); + captured = newBuffer; + return write(src); + } + captured.put(src); + return src.position(); + } + + void verifyTracesConsumed() { + assertEquals(expectedTraces.size(), position); + } + + @Override + public boolean isOpen() { + return true; + } + + @Override + public void close() {} + } + + private static class CountingPojoSpan extends TraceGenerator.PojoSpan { + int processTagsAndBaggageCount = 0; + + CountingPojoSpan( + String serviceName, + String operationName, + CharSequence resourceName, + DDTraceId traceId, + long spanId, + long parentId, + long start, + long duration, + int error, + Map baggage, + Map tags, + CharSequence type, + boolean measured, + int samplingPriority, + int statusCode, + CharSequence origin) { + super( + serviceName, + operationName, + resourceName, + traceId, + spanId, + parentId, + start, + duration, + error, + baggage, + tags, + type, + measured, + samplingPriority, + statusCode, + origin); + } + + @Override + public void processTagsAndBaggage(MetadataConsumer consumer) { + processTagsAndBaggageCount++; + super.processTagsAndBaggage(consumer); + } + + @Override + public void processTagsAndBaggage( + MetadataConsumer consumer, boolean injectLinksAsTags, boolean injectBaggageAsTags) { + processTagsAndBaggageCount++; + super.processTagsAndBaggage(consumer, injectLinksAsTags, injectBaggageAsTags); + } + } + + private static class ByteArrayChannel implements WritableByteChannel { + private byte[] data = new byte[0]; + + @Override + public int write(ByteBuffer src) { + int len = src.remaining(); + byte[] incoming = new byte[len]; + src.get(incoming); + byte[] combined = new byte[data.length + incoming.length]; + System.arraycopy(data, 0, combined, 0, data.length); + System.arraycopy(incoming, 0, combined, data.length, incoming.length); + data = combined; + return len; + } + + byte[] bytes() { + return data; + } + + @Override + public boolean isOpen() { + return true; + } + + @Override + public void close() {} + } + + private static class CapturedBody implements ByteBufferConsumer { + private final TraceMapperV1 mapper; + private byte[] payloadBytes; + + private CapturedBody(TraceMapperV1 mapper) { + this.mapper = mapper; + } + + @Override + public void accept(int messageCount, ByteBuffer buffer) { + Payload payload = mapper.newPayload().withBody(messageCount, buffer); + payloadBytes = serializePayload(payload); + mapper.reset(); + } + } + + /** Subclass to expose SpanLink's protected constructor for testing. */ + private static class TestSpanLink extends SpanLink { + TestSpanLink( + DDTraceId traceId, + long spanId, + byte traceFlags, + String traceState, + SpanAttributes attributes) { + super(traceId, spanId, traceFlags, traceState, attributes); + } + } + + // --- Helper methods --- + + private static void verifyChunk( + MessageUnpacker unpacker, + List expectedTrace, + List stringTable) + throws IOException { + int chunkFieldCount = unpacker.unpackMapHeader(); + assertEquals(6, chunkFieldCount); + + Integer priority = null; + String origin = null; + Map chunkAttributes = null; + byte[] traceId = null; + Integer samplingMechanism = null; + List decodedSpans = null; + + for (int i = 0; i < chunkFieldCount; i++) { + int fieldId = unpacker.unpackInt(); + switch (fieldId) { + case 1: + priority = unpacker.unpackInt(); + break; + case 2: + origin = readStreamingString(unpacker, stringTable); + break; + case 3: + chunkAttributes = readAttributes(unpacker, stringTable); + break; + case 4: + decodedSpans = verifySpans(unpacker, expectedTrace, stringTable); + break; + case 6: + int traceIdLen = unpacker.unpackBinaryHeader(); + traceId = new byte[traceIdLen]; + unpacker.readPayload(traceId); + break; + case 7: + samplingMechanism = unpacker.unpackInt(); + break; + default: + Assertions.fail("Unexpected chunk field id: " + fieldId); + } + } + + assertNotNull(priority); + assertNotNull(origin); + assertNotNull(chunkAttributes); + assertNotNull(decodedSpans); + assertNotNull(traceId); + assertNotNull(samplingMechanism); + + TraceGenerator.PojoSpan firstSpan = expectedTrace.get(0); + assertEquals(firstSpan.samplingPriority(), (int) priority); + assertEqualsWithNullAsEmpty(firstSpan.getOrigin(), origin); + assertEquals(1, chunkAttributes.size()); + assertEqualsWithNullAsEmpty( + firstSpan.getLocalRootSpan().getServiceName(), (String) chunkAttributes.get("service")); + assertArrayEquals(traceIdBytes(firstSpan.getTraceId()), traceId); + assertEquals(expectedSamplingMechanism(firstSpan.getTags()), (int) samplingMechanism); + } + + private static byte[] traceIdBytes(DDTraceId traceId) { + return ByteBuffer.allocate(16) + .putLong(traceId.toHighOrderLong()) + .putLong(traceId.toLong()) + .array(); + } + + private static List verifySpans( + MessageUnpacker unpacker, + List expectedTrace, + List stringTable) + throws IOException { + int spanCount = unpacker.unpackArrayHeader(); + assertEquals(expectedTrace.size(), spanCount); + + for (int i = 0; i < spanCount; i++) { + verifySpan(unpacker, expectedTrace.get(i), stringTable); + } + return expectedTrace; + } + + private static void verifySpan( + MessageUnpacker unpacker, TraceGenerator.PojoSpan expectedSpan, List stringTable) + throws IOException { + int spanFieldCount = unpacker.unpackMapHeader(); + assertEquals(16, spanFieldCount); + + String service = null; + String name = null; + String resource = null; + Long spanId = null; + Long parentId = null; + Long start = null; + Long duration = null; + Boolean error = null; + Map attributes = null; + String type = null; + int linksCount = -1; + int eventsCount = -1; + String env = null; + String version = null; + String component = null; + Integer spanKind = null; + + for (int i = 0; i < spanFieldCount; i++) { + int fieldId = unpacker.unpackInt(); + switch (fieldId) { + case 1: + service = readStreamingString(unpacker, stringTable); + break; + case 2: + name = readStreamingString(unpacker, stringTable); + break; + case 3: + resource = readStreamingString(unpacker, stringTable); + break; + case 4: + spanId = unpackUnsignedLong(unpacker); + break; + case 5: + parentId = unpackUnsignedLong(unpacker); + break; + case 6: + start = unpacker.unpackLong(); + break; + case 7: + duration = unpacker.unpackLong(); + break; + case 8: + error = unpacker.unpackBoolean(); + break; + case 9: + attributes = readAttributes(unpacker, stringTable); + break; + case 10: + type = readStreamingString(unpacker, stringTable); + break; + case 11: + linksCount = unpacker.unpackArrayHeader(); + break; + case 12: + eventsCount = unpacker.unpackArrayHeader(); + break; + case 13: + env = readStreamingString(unpacker, stringTable); + break; + case 14: + version = readStreamingString(unpacker, stringTable); + break; + case 15: + component = readStreamingString(unpacker, stringTable); + break; + case 16: + spanKind = unpacker.unpackInt(); + break; + default: + Assertions.fail("Unexpected span field id: " + fieldId); + } + } + + assertEqualsWithNullAsEmpty(expectedSpan.getServiceName(), service); + assertEqualsWithNullAsEmpty(expectedSpan.getOperationName(), name); + assertEqualsWithNullAsEmpty(expectedSpan.getResourceName(), resource); + assertEquals(expectedSpan.getSpanId(), (long) spanId); + assertEquals(expectedSpan.getParentId(), (long) parentId); + assertEquals(expectedSpan.getStartTime(), (long) start); + assertEquals(expectedSpan.getDurationNano(), (long) duration); + assertEquals(expectedSpan.getError() != 0, error); + assertEqualsWithNullAsEmpty(expectedSpan.getType(), type); + assertEquals(0, linksCount); + assertEquals(0, eventsCount); + assertEqualsWithNullAsEmpty(expectedSpan.getTag(Tags.ENV), env); + assertEqualsWithNullAsEmpty(expectedSpan.getTag(Tags.VERSION), version); + assertEqualsWithNullAsEmpty(expectedSpan.getTag(Tags.COMPONENT), component); + assertEquals( + TraceMapperV1.getSpanKindValue(expectedSpan.getTag(Tags.SPAN_KIND)), (int) spanKind); + + assertNotNull(attributes); + int expectedHttpStatusCode = expectedSpan.getHttpStatusCode(); + boolean shouldContainHttpStatus = + expectedHttpStatusCode != 0 && !expectedSpan.getTags().containsKey("http.status_code"); + Map expectedAttributes = new HashMap<>(expectedSpan.getBaggage()); + expectedAttributes.put(DDTags.THREAD_ID, expectedSpan.getTag(DDTags.THREAD_ID)); + expectedAttributes.put(DDTags.THREAD_NAME, expectedSpan.getTag(DDTags.THREAD_NAME)); + for (Map.Entry entry : expectedSpan.getTags().entrySet()) { + if (DDTags.SPAN_EVENTS.equals(entry.getKey())) { + continue; + } + addFlattenedExpectedAttribute(expectedAttributes, entry.getKey(), entry.getValue()); + } + if (shouldContainHttpStatus) { + expectedAttributes.put("http.status_code", Integer.toString(expectedHttpStatusCode)); + } + if (expectedSpan.isTopLevel()) { + expectedAttributes.put(InstrumentationTags.DD_TOP_LEVEL.toString(), 1d); + } + + assertEquals(expectedAttributes.size(), attributes.size()); + for (Map.Entry entry : expectedAttributes.entrySet()) { + String key = entry.getKey(); + Object expectedValue = entry.getValue(); + assertTrue(attributes.containsKey(key), "Missing attribute key: " + key); + assertAttributeValueEquals(expectedValue, attributes.get(key), key); + } + } + + private static Map readAttributes( + MessageUnpacker unpacker, List stringTable) throws IOException { + int attrArraySize = unpacker.unpackArrayHeader(); + assertEquals(0, attrArraySize % 3); + int attrCount = attrArraySize / 3; + + Map attributes = new HashMap<>(); + for (int i = 0; i < attrCount; i++) { + String key = readStreamingString(unpacker, stringTable); + int attrType = unpacker.unpackInt(); + Object value; + switch (attrType) { + case TraceMapperV1.VALUE_TYPE_STRING: + value = readStreamingString(unpacker, stringTable); + break; + case TraceMapperV1.VALUE_TYPE_BOOLEAN: + value = unpacker.unpackBoolean(); + break; + case TraceMapperV1.VALUE_TYPE_FLOAT: + value = unpacker.unpackDouble(); + break; + case TraceMapperV1.VALUE_TYPE_BYTES: + int len = unpacker.unpackBinaryHeader(); + byte[] data = new byte[len]; + unpacker.readPayload(data); + value = data; + break; + default: + value = Assertions.fail("Unknown attribute value type: " + attrType); + } + attributes.put(key, value); + } + return attributes; + } + + private static void assertAttributeValueEquals(Object expected, Object actual, String key) { + if (expected instanceof Number) { + assertInstanceOf(Number.class, actual, "Attribute " + key + " should be numeric"); + double expectedValue = ((Number) expected).doubleValue(); + double actualValue = ((Number) actual).doubleValue(); + double delta = Math.max(0.000001d, Math.abs(expectedValue) * 0.000000000001d); + assertEquals(expectedValue, actualValue, delta, "Numeric mismatch for " + key); + } else if (expected instanceof Boolean) { + assertEquals(expected, actual, "Boolean mismatch for " + key); + } else { + assertEquals(String.valueOf(expected), String.valueOf(actual), "String mismatch for " + key); + } + } + + private static long unpackUnsignedLong(MessageUnpacker unpacker) throws IOException { + MessageFormat format = unpacker.getNextFormat(); + if (format == MessageFormat.UINT64) { + return DDSpanId.from(unpacker.unpackBigInteger().toString()); + } + return unpacker.unpackLong(); + } + + private static void addFlattenedExpectedAttribute( + Map expectedAttributes, String key, Object value) { + if (!(value instanceof Map)) { + expectedAttributes.put(key, value); + return; + } + for (Map.Entry entry : ((Map) value).entrySet()) { + addFlattenedExpectedAttribute( + expectedAttributes, key + "." + entry.getKey(), entry.getValue()); + } + } + + private static int expectedSamplingMechanism(Map tags) { + Object decisionMakerRaw = tags.get("_dd.p.dm"); + if (decisionMakerRaw == null) { + return SamplingMechanism.DEFAULT; + } + + String decisionMaker = String.valueOf(decisionMakerRaw); + try { + int value = Integer.parseInt(decisionMaker); + return value < 0 ? -value : value; + } catch (NumberFormatException ignored) { + int separator = decisionMaker.lastIndexOf('-'); + if (separator >= 0 && separator + 1 < decisionMaker.length()) { + try { + int value = Integer.parseInt(decisionMaker.substring(separator + 1)); + return value < 0 ? -value : value; + } catch (NumberFormatException ignoredAgain) { + // fall through + } + } + return SamplingMechanism.DEFAULT; + } + } + + private static String readStreamingString(MessageUnpacker unpacker, List stringTable) + throws IOException { + MessageFormat format = unpacker.getNextFormat(); + if (format == FIXSTR || format == STR8 || format == STR16 || format == STR32) { + String value = unpacker.unpackString(); + if (!stringTable.contains(value)) { + stringTable.add(value); + } + return value; + } + + int index = unpacker.unpackInt(); + assertTrue(index >= 0 && index < stringTable.size(), "Invalid string-table index: " + index); + return stringTable.get(index); + } + + private static void skipPayloadField( + MessageUnpacker unpacker, int fieldId, List stringTable) throws IOException { + switch (fieldId) { + case 2: + case 3: + case 4: + case 5: + case 6: + case 7: + case 8: + case 9: + readStreamingString(unpacker, stringTable); + break; + case 10: + readAttributes(unpacker, stringTable); + break; + default: + Assertions.fail("Unexpected payload field id while skipping: " + fieldId); + } + } + + private static void skipChunkField( + MessageUnpacker unpacker, int fieldId, List stringTable) throws IOException { + switch (fieldId) { + case 1: + unpacker.unpackInt(); + break; + case 2: + readStreamingString(unpacker, stringTable); + break; + case 3: + readAttributes(unpacker, stringTable); + break; + case 4: + int spanCount = unpacker.unpackArrayHeader(); + for (int i = 0; i < spanCount; i++) { + skipSpan(unpacker, stringTable); + } + break; + case 5: + unpacker.unpackBoolean(); + break; + case 6: + int len = unpacker.unpackBinaryHeader(); + byte[] ignored = new byte[len]; + unpacker.readPayload(ignored); + break; + case 7: + unpacker.unpackInt(); + break; + default: + Assertions.fail("Unexpected chunk field id while skipping: " + fieldId); + } + } + + private static void skipSpan(MessageUnpacker unpacker, List stringTable) + throws IOException { + int fieldCount = unpacker.unpackMapHeader(); + for (int i = 0; i < fieldCount; i++) { + int fieldId = unpacker.unpackInt(); + switch (fieldId) { + case 1: + case 2: + case 3: + case 10: + case 13: + case 14: + case 15: + readStreamingString(unpacker, stringTable); + break; + case 4: + case 5: + unpacker.unpackValue().asNumberValue().toLong(); + break; + case 6: + case 7: + unpacker.unpackLong(); + break; + case 8: + unpacker.unpackBoolean(); + break; + case 9: + int attrArraySize = unpacker.unpackArrayHeader(); + int attrCount = attrArraySize / 3; + for (int j = 0; j < attrCount; j++) { + readStreamingString(unpacker, stringTable); + int type = unpacker.unpackInt(); + switch (type) { + case TraceMapperV1.VALUE_TYPE_STRING: + readStreamingString(unpacker, stringTable); + break; + case TraceMapperV1.VALUE_TYPE_BOOLEAN: + unpacker.unpackBoolean(); + break; + case TraceMapperV1.VALUE_TYPE_FLOAT: + unpacker.unpackDouble(); + break; + case TraceMapperV1.VALUE_TYPE_BYTES: + int blen = unpacker.unpackBinaryHeader(); + byte[] bignored = new byte[blen]; + unpacker.readPayload(bignored); + break; + default: + Assertions.fail("Unexpected attribute type while skipping: " + type); + } + } + break; + case 11: + case 12: + unpacker.unpackArrayHeader(); + break; + case 16: + unpacker.unpackInt(); + break; + default: + Assertions.fail("Unexpected span field id while skipping: " + fieldId); + } + } + } + + private static Map readFirstSpanAttributes( + MessageUnpacker unpacker, List stringTable) throws IOException { + int payloadFieldCount = unpacker.unpackMapHeader(); + for (int i = 0; i < payloadFieldCount; i++) { + int payloadFieldId = unpacker.unpackInt(); + if (payloadFieldId != 11) { + skipPayloadField(unpacker, payloadFieldId, stringTable); + continue; + } + + int chunkCount = unpacker.unpackArrayHeader(); + assertEquals(1, chunkCount); + + int chunkFieldCount = unpacker.unpackMapHeader(); + for (int chunkFieldIndex = 0; chunkFieldIndex < chunkFieldCount; chunkFieldIndex++) { + int chunkFieldId = unpacker.unpackInt(); + if (chunkFieldId != 4) { + skipChunkField(unpacker, chunkFieldId, stringTable); + continue; + } + + int spanCount = unpacker.unpackArrayHeader(); + assertEquals(1, spanCount); + + int spanFieldCount = unpacker.unpackMapHeader(); + for (int spanFieldIndex = 0; spanFieldIndex < spanFieldCount; spanFieldIndex++) { + int spanFieldId = unpacker.unpackInt(); + if (spanFieldId == 9) { + return readAttributes(unpacker, stringTable); + } + skipSpanField(unpacker, spanFieldId, stringTable); + } + } + } + return Assertions.fail("Could not find span attributes field in first span"); + } + + private static List> readFirstSpanLinks( + MessageUnpacker unpacker, List stringTable) throws IOException { + int payloadFieldCount = unpacker.unpackMapHeader(); + for (int i = 0; i < payloadFieldCount; i++) { + int payloadFieldId = unpacker.unpackInt(); + if (payloadFieldId != 11) { + skipPayloadField(unpacker, payloadFieldId, stringTable); + continue; + } + + int chunkCount = unpacker.unpackArrayHeader(); + assertEquals(1, chunkCount); + + int chunkFieldCount = unpacker.unpackMapHeader(); + for (int chunkFieldIndex = 0; chunkFieldIndex < chunkFieldCount; chunkFieldIndex++) { + int chunkFieldId = unpacker.unpackInt(); + if (chunkFieldId != 4) { + skipChunkField(unpacker, chunkFieldId, stringTable); + continue; + } + + int spanCount = unpacker.unpackArrayHeader(); + assertEquals(1, spanCount); + + int spanFieldCount = unpacker.unpackMapHeader(); + for (int spanFieldIndex = 0; spanFieldIndex < spanFieldCount; spanFieldIndex++) { + int spanFieldId = unpacker.unpackInt(); + if (spanFieldId == 11) { + return readSpanLinks(unpacker, stringTable); + } + skipSpanField(unpacker, spanFieldId, stringTable); + } + } + } + return Assertions.fail("Could not find span links field in first span"); + } + + private static void skipSpanField(MessageUnpacker unpacker, int fieldId, List stringTable) + throws IOException { + switch (fieldId) { + case 1: + case 2: + case 3: + case 10: + case 13: + case 14: + case 15: + readStreamingString(unpacker, stringTable); + break; + case 4: + case 5: + unpacker.unpackValue().asNumberValue().toLong(); + break; + case 6: + case 7: + unpacker.unpackLong(); + break; + case 8: + unpacker.unpackBoolean(); + break; + case 9: + readAttributes(unpacker, stringTable); + break; + case 12: + int eventsCount = unpacker.unpackArrayHeader(); + for (int j = 0; j < eventsCount; j++) { + skipSpanEvent(unpacker, stringTable); + } + break; + case 11: + int linksCount = unpacker.unpackArrayHeader(); + for (int j = 0; j < linksCount; j++) { + int linkFieldCount = unpacker.unpackMapHeader(); + for (int k = 0; k < linkFieldCount; k++) { + int linkFieldId = unpacker.unpackInt(); + switch (linkFieldId) { + case 1: + int traceIdLen = unpacker.unpackBinaryHeader(); + byte[] traceIdIgnored = new byte[traceIdLen]; + unpacker.readPayload(traceIdIgnored); + break; + case 2: + case 5: + unpacker.unpackValue().asNumberValue().toLong(); + break; + case 3: + readAttributes(unpacker, stringTable); + break; + case 4: + readStreamingString(unpacker, stringTable); + break; + default: + Assertions.fail("Unexpected span link field id while skipping: " + linkFieldId); + } + } + } + break; + case 16: + unpacker.unpackInt(); + break; + default: + Assertions.fail("Unexpected span field id while skipping: " + fieldId); + } + } + + private static List> readSpanLinks( + MessageUnpacker unpacker, List stringTable) throws IOException { + int linksCount = unpacker.unpackArrayHeader(); + List> links = new ArrayList<>(); + + for (int i = 0; i < linksCount; i++) { + int linkFieldCount = unpacker.unpackMapHeader(); + assertEquals(5, linkFieldCount); + + byte[] traceId = null; + Long spanId = null; + Map attributes = null; + String tracestate = null; + Long flags = null; + + for (int j = 0; j < linkFieldCount; j++) { + int linkFieldId = unpacker.unpackInt(); + switch (linkFieldId) { + case 1: + int traceIdLen = unpacker.unpackBinaryHeader(); + traceId = new byte[traceIdLen]; + unpacker.readPayload(traceId); + break; + case 2: + spanId = unpacker.unpackValue().asNumberValue().toLong(); + break; + case 3: + attributes = readAttributes(unpacker, stringTable); + break; + case 4: + tracestate = readStreamingString(unpacker, stringTable); + break; + case 5: + flags = unpacker.unpackValue().asNumberValue().toLong(); + break; + default: + Assertions.fail("Unexpected span link field id: " + linkFieldId); + } + } + + Map link = new HashMap<>(); + link.put("traceId", traceId); + link.put("spanId", spanId); + link.put("attributes", attributes); + link.put("tracestate", tracestate); + link.put("flags", flags); + links.add(link); + } + + return links; + } + + private static List> readFirstSpanEvents( + MessageUnpacker unpacker, List stringTable) throws IOException { + int payloadFieldCount = unpacker.unpackMapHeader(); + for (int i = 0; i < payloadFieldCount; i++) { + int payloadFieldId = unpacker.unpackInt(); + if (payloadFieldId != 11) { + skipPayloadField(unpacker, payloadFieldId, stringTable); + continue; + } + + int chunkCount = unpacker.unpackArrayHeader(); + assertEquals(1, chunkCount); + + int chunkFieldCount = unpacker.unpackMapHeader(); + for (int chunkFieldIndex = 0; chunkFieldIndex < chunkFieldCount; chunkFieldIndex++) { + int chunkFieldId = unpacker.unpackInt(); + if (chunkFieldId != 4) { + skipChunkField(unpacker, chunkFieldId, stringTable); + continue; + } + + int spanCount = unpacker.unpackArrayHeader(); + assertEquals(1, spanCount); + + int spanFieldCount = unpacker.unpackMapHeader(); + for (int spanFieldIndex = 0; spanFieldIndex < spanFieldCount; spanFieldIndex++) { + int spanFieldId = unpacker.unpackInt(); + if (spanFieldId == 12) { + return readSpanEvents(unpacker, stringTable); + } + skipSpanField(unpacker, spanFieldId, stringTable); + } + } + } + return Assertions.fail("Could not find span events field in first span"); + } + + private static List> readSpanEvents( + MessageUnpacker unpacker, List stringTable) throws IOException { + int eventsCount = unpacker.unpackArrayHeader(); + List> events = new ArrayList<>(); + + for (int i = 0; i < eventsCount; i++) { + int eventFieldCount = unpacker.unpackMapHeader(); + assertEquals(3, eventFieldCount); + + Long timeUnixNano = null; + String name = null; + Map attributes = null; + + for (int j = 0; j < eventFieldCount; j++) { + int eventFieldId = unpacker.unpackInt(); + switch (eventFieldId) { + case 1: + timeUnixNano = unpacker.unpackLong(); + break; + case 2: + name = readStreamingString(unpacker, stringTable); + break; + case 3: + attributes = readEventAttributes(unpacker, stringTable); + break; + default: + Assertions.fail("Unexpected span event field id: " + eventFieldId); + } + } + + Map event = new HashMap<>(); + event.put("timeUnixNano", timeUnixNano); + event.put("name", name); + event.put("attributes", attributes); + events.add(event); + } + return events; + } + + private static Map readEventAttributes( + MessageUnpacker unpacker, List stringTable) throws IOException { + int attrArraySize = unpacker.unpackArrayHeader(); + assertEquals(0, attrArraySize % 3); + int attrCount = attrArraySize / 3; + Map attributes = new HashMap<>(); + + for (int i = 0; i < attrCount; i++) { + String key = readStreamingString(unpacker, stringTable); + int attrType = unpacker.unpackInt(); + Object value; + switch (attrType) { + case TraceMapperV1.VALUE_TYPE_STRING: + value = readStreamingString(unpacker, stringTable); + break; + case TraceMapperV1.VALUE_TYPE_BOOLEAN: + value = unpacker.unpackBoolean(); + break; + case TraceMapperV1.VALUE_TYPE_FLOAT: + value = unpacker.unpackDouble(); + break; + case TraceMapperV1.VALUE_TYPE_INT: + value = unpacker.unpackLong(); + break; + case TraceMapperV1.VALUE_TYPE_ARRAY: + value = readEventArrayValue(unpacker, stringTable); + break; + default: + value = Assertions.fail("Unknown event attribute value type: " + attrType); + } + attributes.put(key, value); + } + return attributes; + } + + private static List readEventArrayValue( + MessageUnpacker unpacker, List stringTable) throws IOException { + int itemArraySize = unpacker.unpackArrayHeader(); + assertEquals(0, itemArraySize % 2); + int itemCount = itemArraySize / 2; + List values = new ArrayList<>(); + for (int i = 0; i < itemCount; i++) { + int itemType = unpacker.unpackInt(); + switch (itemType) { + case TraceMapperV1.VALUE_TYPE_STRING: + values.add(readStreamingString(unpacker, stringTable)); + break; + case TraceMapperV1.VALUE_TYPE_BOOLEAN: + values.add(unpacker.unpackBoolean()); + break; + case TraceMapperV1.VALUE_TYPE_FLOAT: + values.add(unpacker.unpackDouble()); + break; + case TraceMapperV1.VALUE_TYPE_INT: + values.add(unpacker.unpackLong()); + break; + default: + Assertions.fail("Unknown event array item type: " + itemType); + } + } + return values; + } + + private static void skipSpanEvent(MessageUnpacker unpacker, List stringTable) + throws IOException { + int fieldCount = unpacker.unpackMapHeader(); + for (int i = 0; i < fieldCount; i++) { + int fieldId = unpacker.unpackInt(); + switch (fieldId) { + case 1: + unpacker.unpackLong(); + break; + case 2: + readStreamingString(unpacker, stringTable); + break; + case 3: + readEventAttributes(unpacker, stringTable); + break; + default: + Assertions.fail("Unexpected event field id while skipping: " + fieldId); + } + } + } + + private static byte[] serializeMappedPayload( + TraceMapperV1 mapper, List> traces) { + CapturedBody capturedBody = new CapturedBody(mapper); + MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(2 << 20, capturedBody)); + + for (List trace : traces) { + assertTrue(packer.format(trace, mapper)); + } + packer.flush(); + + assertNotNull(capturedBody.payloadBytes); + return capturedBody.payloadBytes; + } + + private static byte[] serializePayload(Payload payload) { + ByteArrayChannel channel = new ByteArrayChannel(); + try { + payload.writeTo(channel); + } catch (IOException e) { + Assertions.fail(e.getMessage()); + } + return channel.bytes(); + } + + private static void assertEqualsWithNullAsEmpty(CharSequence expected, String actual) { + if (expected == null) { + assertEquals("", actual); + } else { + assertEquals(expected.toString(), actual); + } + } +} diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddintake/DDEvpProxyApiTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddintake/DDEvpProxyApiTest.java new file mode 100644 index 00000000000..c3464d47d36 --- /dev/null +++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddintake/DDEvpProxyApiTest.java @@ -0,0 +1,457 @@ +package datadog.trace.common.writer.ddintake; + +import static datadog.communication.ddagent.DDAgentFeaturesDiscovery.V2_EVP_PROXY_ENDPOINT; +import static datadog.communication.ddagent.DDAgentFeaturesDiscovery.V4_EVP_PROXY_ENDPOINT; +import static java.util.Collections.emptyList; +import static java.util.Collections.emptyMap; +import static java.util.Collections.singletonList; +import static java.util.Collections.singletonMap; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import datadog.communication.serialization.ByteBufferConsumer; +import datadog.communication.serialization.FlushingBuffer; +import datadog.communication.serialization.msgpack.MsgPackWriter; +import datadog.trace.agent.test.server.http.JavaTestHttpServer; +import datadog.trace.api.DDTags; +import datadog.trace.api.civisibility.CiVisibilityWellKnownTags; +import datadog.trace.api.intake.TrackType; +import datadog.trace.bootstrap.instrumentation.api.InternalSpanTypes; +import datadog.trace.bootstrap.instrumentation.api.ServiceNameSources; +import datadog.trace.bootstrap.instrumentation.api.Tags; +import datadog.trace.common.writer.Payload; +import datadog.trace.common.writer.RemoteApi; +import datadog.trace.common.writer.RemoteMapper; +import datadog.trace.core.DDCoreJavaSpecification; +import datadog.trace.core.DDSpan; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.lang.reflect.Field; +import java.nio.ByteBuffer; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; +import java.util.zip.GZIPInputStream; +import okhttp3.HttpUrl; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; +import org.msgpack.jackson.dataformat.MessagePackFactory; + +@Timeout(20) +class DDEvpProxyApiTest extends DDCoreJavaSpecification { + + static final CiVisibilityWellKnownTags WELL_KNOWN_TAGS = + new CiVisibilityWellKnownTags( + "my-runtime-id", + "my-env", + "my-language", + "my-runtime-name", + "my-runtime-version", + "my-runtime-vendor", + "my-os-arch", + "my-os-platform", + "my-os-version", + "false"); + + static final String INTAKE_SUBDOMAIN = "citestcycle-intake"; + static final ObjectMapper MSG_PACK_MAPPER = new ObjectMapper(new MessagePackFactory()); + static final String DD_EVP_SUBDOMAIN_HEADER = "X-Datadog-EVP-Subdomain"; + + @Test + void testSendingAnEmptyListOfTracesReturnsNoErrors() { + TrackType trackType = TrackType.CITESTCYCLE; + String apiVersion = "v2"; + String evpProxyEndpoint = V2_EVP_PROXY_ENDPOINT; + String path = buildAgentEvpProxyPath(evpProxyEndpoint, trackType, apiVersion); + JavaTestHttpServer agentEvpProxy = + JavaTestHttpServer.httpServer( + s -> + s.handlers( + h -> + h.post( + path, + api -> { + if (!"application/msgpack" + .equals(api.getRequest().getContentType())) { + api.getResponse() + .status(400) + .send("wrong type: " + api.getRequest().getContentType()); + } else { + api.getResponse().status(200).send(); + } + }))); + DDEvpProxyApi client = + createEvpProxyApi( + agentEvpProxy.getAddress().toString(), evpProxyEndpoint, trackType, false); + Payload payload = prepareTraces(trackType, false, Collections.emptyList()); + + try { + RemoteApi.Response clientResponse = client.sendSerializedTraces(payload); + assertTrue(clientResponse.success()); + assertTrue(clientResponse.status().isPresent()); + assertEquals(200, clientResponse.status().getAsInt()); + assertEquals(path, agentEvpProxy.getLastRequest().getPath()); + assertEquals( + INTAKE_SUBDOMAIN, agentEvpProxy.getLastRequest().getHeader(DD_EVP_SUBDOMAIN_HEADER)); + } finally { + agentEvpProxy.close(); + } + } + + @Test + void testRetriesWhenBackendReturns5xx() { + TrackType trackType = TrackType.CITESTCYCLE; + String apiVersion = "v2"; + String evpProxyEndpoint = V2_EVP_PROXY_ENDPOINT; + String path = buildAgentEvpProxyPath(evpProxyEndpoint, trackType, apiVersion); + int[] retry = {1}; + JavaTestHttpServer agentEvpProxy = + JavaTestHttpServer.httpServer( + s -> + s.handlers( + h -> + h.post( + path, + api -> { + if (retry[0] < 5) { + api.getResponse().status(503).send(); + retry[0]++; + } else { + api.getResponse().status(200).send(); + } + }))); + DDEvpProxyApi client = + createEvpProxyApi( + agentEvpProxy.getAddress().toString(), evpProxyEndpoint, trackType, false); + Payload payload = prepareTraces(trackType, false, Collections.emptyList()); + + try { + RemoteApi.Response clientResponse = client.sendSerializedTraces(payload); + assertTrue(clientResponse.success()); + assertTrue(clientResponse.status().isPresent()); + assertEquals(200, clientResponse.status().getAsInt()); + assertEquals(path, agentEvpProxy.getLastRequest().getPath()); + assertEquals( + INTAKE_SUBDOMAIN, agentEvpProxy.getLastRequest().getHeader(DD_EVP_SUBDOMAIN_HEADER)); + } finally { + agentEvpProxy.close(); + } + } + + @Test + void testContentIsSentAsMsgpackEmptyTraces() throws IOException { + runContentIsSentAsMsgpackTest( + TrackType.CITESTCYCLE, "v2", V2_EVP_PROXY_ENDPOINT, false, emptyList(), emptyMap()); + } + + @Test + void testContentIsSentAsMsgpackFakeTypeSpan() throws IOException { + DDSpan span = buildSpan(1L, "fakeType", Collections.singletonMap("service.name", "my-service")); + span.finish(); + setDurationNano(span, 10L); + List> traces = singletonList(singletonList(span)); + + Map metadata = buildMetadataMap(); + Map content = new TreeMap<>(); + content.put("service", "my-service"); + content.put("name", "fakeOperation"); + content.put("resource", "fakeResource"); + content.put("error", 0); + content.put("trace_id", 1L); + content.put("span_id", 1L); + content.put("parent_id", 0L); + content.put("start", 1000L); + content.put("duration", 10L); + content.put("meta", singletonMap(DDTags.DD_SVC_SRC, ServiceNameSources.MANUAL.toString())); + content.put("metrics", emptyMap()); + Map event = new TreeMap<>(); + event.put("type", "span"); + event.put("version", 1); + event.put("content", content); + Map expectedRequestBody = new TreeMap<>(); + expectedRequestBody.put("version", 1); + expectedRequestBody.put("metadata", metadata); + expectedRequestBody.put("events", singletonList(event)); + + runContentIsSentAsMsgpackTest( + TrackType.CITESTCYCLE, "v2", V2_EVP_PROXY_ENDPOINT, false, traces, expectedRequestBody); + } + + @Test + void testContentIsSentAsMsgpackTestSpan() throws IOException { + Map spanTags = new HashMap<>(); + spanTags.put("test_suite_id", 123L); + spanTags.put("test_module_id", 456L); + DDSpan span = buildSpan(1L, InternalSpanTypes.TEST, spanTags); + span.finish(); + setDurationNano(span, 10L); + List> traces = singletonList(singletonList(span)); + + Map metadata = buildMetadataMap(); + Map content = new TreeMap<>(); + content.put("test_suite_id", 123L); + content.put("test_module_id", 456L); + content.put("service", "fakeService"); + content.put("name", "fakeOperation"); + content.put("resource", "fakeResource"); + content.put("error", 0); + content.put("trace_id", 1L); + content.put("span_id", 1L); + content.put("parent_id", 0L); + content.put("start", 1000L); + content.put("duration", 10L); + content.put("meta", emptyMap()); + content.put("metrics", emptyMap()); + Map event = new TreeMap<>(); + event.put("type", "test"); + event.put("version", 2); + event.put("content", content); + Map expectedRequestBody = new TreeMap<>(); + expectedRequestBody.put("version", 1); + expectedRequestBody.put("metadata", metadata); + expectedRequestBody.put("events", singletonList(event)); + + runContentIsSentAsMsgpackTest( + TrackType.CITESTCYCLE, "v2", V2_EVP_PROXY_ENDPOINT, false, traces, expectedRequestBody); + } + + @Test + void testContentIsSentAsMsgpackTestSuiteEndSpan() throws IOException { + Map spanTags = new HashMap<>(); + spanTags.put("test_suite_id", 123L); + spanTags.put("test_module_id", 456L); + DDSpan span = buildSpan(1L, InternalSpanTypes.TEST_SUITE_END, spanTags); + span.finish(); + setDurationNano(span, 10L); + List> traces = singletonList(singletonList(span)); + + Map metadata = buildMetadataMap(); + Map content = new TreeMap<>(); + content.put("test_suite_id", 123L); + content.put("test_module_id", 456L); + content.put("service", "fakeService"); + content.put("name", "fakeOperation"); + content.put("resource", "fakeResource"); + content.put("error", 0); + content.put("start", 1000L); + content.put("duration", 10L); + content.put("meta", emptyMap()); + content.put("metrics", emptyMap()); + Map event = new TreeMap<>(); + event.put("type", "test_suite_end"); + event.put("version", 1); + event.put("content", content); + Map expectedRequestBody = new TreeMap<>(); + expectedRequestBody.put("version", 1); + expectedRequestBody.put("metadata", metadata); + expectedRequestBody.put("events", singletonList(event)); + + runContentIsSentAsMsgpackTest( + TrackType.CITESTCYCLE, "v2", V2_EVP_PROXY_ENDPOINT, false, traces, expectedRequestBody); + } + + @Test + void testContentIsSentAsMsgpackTestModuleEndSpanWithCompression() throws IOException { + Map spanTags = new HashMap<>(); + spanTags.put("test_module_id", 456L); + DDSpan span = buildSpan(1L, InternalSpanTypes.TEST_MODULE_END, spanTags); + span.finish(); + setDurationNano(span, 10L); + List> traces = singletonList(singletonList(span)); + + Map metadata = buildMetadataMap(); + Map content = new TreeMap<>(); + content.put("test_module_id", 456L); + content.put("service", "fakeService"); + content.put("name", "fakeOperation"); + content.put("resource", "fakeResource"); + content.put("error", 0); + content.put("start", 1000L); + content.put("duration", 10L); + content.put("meta", emptyMap()); + content.put("metrics", emptyMap()); + Map event = new TreeMap<>(); + event.put("type", "test_module_end"); + event.put("version", 1); + event.put("content", content); + Map expectedRequestBody = new TreeMap<>(); + expectedRequestBody.put("version", 1); + expectedRequestBody.put("metadata", metadata); + expectedRequestBody.put("events", singletonList(event)); + + runContentIsSentAsMsgpackTest( + TrackType.CITESTCYCLE, "v2", V4_EVP_PROXY_ENDPOINT, true, traces, expectedRequestBody); + } + + // --- Helper methods --- + + private void runContentIsSentAsMsgpackTest( + TrackType trackType, + String apiVersion, + String evpProxyEndpoint, + boolean compressionEnabled, + List> traces, + Map expectedRequestBody) + throws IOException { + String path = buildAgentEvpProxyPath(evpProxyEndpoint, trackType, apiVersion); + JavaTestHttpServer agentEvpProxy = + JavaTestHttpServer.httpServer( + s -> s.handlers(h -> h.post(path, api -> api.getResponse().send()))); + DDEvpProxyApi client = + createEvpProxyApi( + agentEvpProxy.getAddress().toString(), evpProxyEndpoint, trackType, compressionEnabled); + Payload payload = prepareTraces(trackType, compressionEnabled, traces); + + try { + client.sendSerializedTraces(payload).status(); + assertEquals("application/msgpack", agentEvpProxy.getLastRequest().getContentType()); + Map actualBody = + convertMap(agentEvpProxy.getLastRequest().getBody(), compressionEnabled); + assertDeepEquals(expectedRequestBody, actualBody); + } finally { + agentEvpProxy.close(); + } + } + + private static Map buildMetadataMap() { + Map star = new TreeMap<>(); + star.put("env", "my-env"); + star.put("runtime-id", "my-runtime-id"); + star.put("language", "my-language"); + star.put(Tags.RUNTIME_NAME, "my-runtime-name"); + star.put(Tags.RUNTIME_VERSION, "my-runtime-version"); + star.put(Tags.RUNTIME_VENDOR, "my-runtime-vendor"); + star.put(Tags.OS_ARCHITECTURE, "my-os-arch"); + star.put(Tags.OS_PLATFORM, "my-os-platform"); + star.put(Tags.OS_VERSION, "my-os-version"); + star.put(DDTags.TEST_IS_USER_PROVIDED_SERVICE, "false"); + Map metadata = new TreeMap<>(); + metadata.put("*", star); + return metadata; + } + + private static void setDurationNano(DDSpan span, long duration) { + try { + Field field = DDSpan.class.getDeclaredField("durationNano"); + field.setAccessible(true); + field.setLong(span, duration); + } catch (NoSuchFieldException | IllegalAccessException e) { + Assertions.fail("Could not set durationNano: " + e.getMessage()); + } + } + + static Map convertMap(byte[] bytes, boolean compressionEnabled) + throws IOException { + if (compressionEnabled) { + bytes = decompress(bytes); + } + return MSG_PACK_MAPPER.readValue(bytes, new TypeReference>() {}); + } + + static byte[] decompress(byte[] bytes) throws IOException { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + try (GZIPInputStream zip = new GZIPInputStream(new ByteArrayInputStream(bytes))) { + byte[] buf = new byte[4096]; + int len; + while ((len = zip.read(buf)) != -1) { + baos.write(buf, 0, len); + } + } + return baos.toByteArray(); + } + + private DDEvpProxyApi createEvpProxyApi( + String agentUrl, String evpProxyEndpoint, TrackType trackType, boolean compressionEnabled) { + return DDEvpProxyApi.builder() + .agentUrl(HttpUrl.get(agentUrl)) + .evpProxyEndpoint(evpProxyEndpoint) + .trackType(trackType) + .compressionEnabled(compressionEnabled) + .build(); + } + + private RemoteMapper discoverMapper(TrackType trackType, boolean compressionEnabled) { + DDIntakeMapperDiscovery mapperDiscovery = + new DDIntakeMapperDiscovery(trackType, WELL_KNOWN_TAGS, compressionEnabled); + mapperDiscovery.discover(); + return mapperDiscovery.getMapper(); + } + + private String buildAgentEvpProxyPath( + String evpProxyEndpoint, TrackType trackType, String apiVersion) { + return "/" + evpProxyEndpoint + "api/" + apiVersion + "/" + trackType.name().toLowerCase(); + } + + private Payload prepareTraces( + TrackType trackType, boolean compressionEnabled, List> traces) { + TracesCapture traceCapture = new TracesCapture(); + MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(1 << 20, traceCapture)); + RemoteMapper mapper = discoverMapper(trackType, compressionEnabled); + for (List trace : traces) { + packer.format(trace, mapper); + } + packer.flush(); + return mapper + .newPayload() + .withBody( + traceCapture.traceCount, + traces.isEmpty() ? ByteBuffer.allocate(0) : traceCapture.buffer); + } + + @SuppressWarnings("unchecked") + static void assertDeepEquals(Object expected, Object actual) { + if (expected == null && actual == null) { + return; + } + if (expected == null || actual == null) { + Assertions.fail("Expected " + expected + " but got " + actual); + } + if (expected instanceof Map) { + assertInstanceOf(Map.class, actual, "Expected Map but got " + actual.getClass()); + Map expectedMap = (Map) expected; + Map actualMap = (Map) actual; + assertEquals(expectedMap.size(), actualMap.size(), "Map size mismatch"); + for (Map.Entry entry : expectedMap.entrySet()) { + assertTrue(actualMap.containsKey(entry.getKey()), "Missing key: " + entry.getKey()); + assertDeepEquals(entry.getValue(), actualMap.get(entry.getKey())); + } + } else if (expected instanceof List) { + assertInstanceOf(List.class, actual, "Expected List but got " + actual.getClass()); + List expectedList = (List) expected; + List actualList = (List) actual; + assertEquals(expectedList.size(), actualList.size(), "List size mismatch"); + for (int i = 0; i < expectedList.size(); i++) { + assertDeepEquals(expectedList.get(i), actualList.get(i)); + } + } else if (expected instanceof Number && actual instanceof Number) { + if (expected instanceof Float + || expected instanceof Double + || actual instanceof Float + || actual instanceof Double) { + assertEquals(((Number) expected).doubleValue(), ((Number) actual).doubleValue(), 0.0001); + } else { + assertEquals(((Number) expected).longValue(), ((Number) actual).longValue()); + } + } else { + assertEquals(expected, actual); + } + } + + static class TracesCapture implements ByteBufferConsumer { + int traceCount; + ByteBuffer buffer; + + @Override + public void accept(int messageCount, ByteBuffer buffer) { + this.buffer = buffer; + this.traceCount = messageCount; + } + } +} diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddintake/DDIntakeApiTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddintake/DDIntakeApiTest.java new file mode 100644 index 00000000000..4609c585a65 --- /dev/null +++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddintake/DDIntakeApiTest.java @@ -0,0 +1,463 @@ +package datadog.trace.common.writer.ddintake; + +import static java.util.Collections.emptyList; +import static java.util.Collections.emptyMap; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import datadog.communication.serialization.ByteBufferConsumer; +import datadog.communication.serialization.FlushingBuffer; +import datadog.communication.serialization.msgpack.MsgPackWriter; +import datadog.trace.agent.test.server.http.JavaTestHttpServer; +import datadog.trace.api.DDTags; +import datadog.trace.api.civisibility.CiVisibilityWellKnownTags; +import datadog.trace.api.intake.TrackType; +import datadog.trace.bootstrap.instrumentation.api.InternalSpanTypes; +import datadog.trace.bootstrap.instrumentation.api.ServiceNameSources; +import datadog.trace.bootstrap.instrumentation.api.Tags; +import datadog.trace.common.writer.Payload; +import datadog.trace.common.writer.RemoteApi; +import datadog.trace.common.writer.RemoteMapper; +import datadog.trace.core.DDCoreJavaSpecification; +import datadog.trace.core.DDSpan; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.lang.reflect.Field; +import java.nio.ByteBuffer; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; +import java.util.zip.GZIPInputStream; +import okhttp3.HttpUrl; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; +import org.msgpack.jackson.dataformat.MessagePackFactory; + +@Timeout(20) +class DDIntakeApiTest extends DDCoreJavaSpecification { + + static final CiVisibilityWellKnownTags WELL_KNOWN_TAGS = + new CiVisibilityWellKnownTags( + "my-runtime-id", + "my-env", + "my-language", + "my-runtime-name", + "my-runtime-version", + "my-runtime-vendor", + "my-os-arch", + "my-os-platform", + "my-os-version", + "false"); + + static final String API_KEY = "my-secret-apikey"; + static final ObjectMapper MSG_PACK_MAPPER = new ObjectMapper(new MessagePackFactory()); + + @Test + void testSendingAnEmptyListOfTracesReturnsNoErrors() { + TrackType trackType = TrackType.CITESTCYCLE; + String apiVersion = "v2"; + String path = buildIntakePath(trackType, apiVersion); + JavaTestHttpServer intake = + JavaTestHttpServer.httpServer( + s -> + s.handlers( + h -> + h.post( + path, + api -> { + if (!"application/msgpack" + .equals(api.getRequest().getContentType())) { + api.getResponse() + .status(400) + .send("wrong type: " + api.getRequest().getContentType()); + } else { + api.getResponse().status(200).send(); + } + }))); + DDIntakeApi client = createIntakeApi(intake.getAddress().toString(), trackType); + Payload payload = prepareTraces(trackType, Collections.emptyList()); + + try { + RemoteApi.Response clientResponse = client.sendSerializedTraces(payload); + assertTrue(clientResponse.success()); + assertTrue(clientResponse.status().isPresent()); + assertEquals(200, clientResponse.status().getAsInt()); + assertEquals(path, intake.getLastRequest().getPath()); + } finally { + intake.close(); + } + } + + @Test + void testRetriesWhenBackendReturns5xx() { + TrackType trackType = TrackType.CITESTCYCLE; + String apiVersion = "v2"; + String path = buildIntakePath(trackType, apiVersion); + int[] retry = {1}; + JavaTestHttpServer intake = + JavaTestHttpServer.httpServer( + s -> + s.handlers( + h -> + h.post( + path, + api -> { + if (retry[0] < 5) { + api.getResponse().status(503).send(); + retry[0]++; + } else { + api.getResponse().status(200).send(); + } + }))); + DDIntakeApi client = createIntakeApi(intake.getAddress().toString(), trackType); + Payload payload = prepareTraces(trackType, Collections.emptyList()); + + try { + RemoteApi.Response clientResponse = client.sendSerializedTraces(payload); + assertTrue(clientResponse.success()); + assertTrue(clientResponse.status().isPresent()); + assertEquals(200, clientResponse.status().getAsInt()); + assertEquals(path, intake.getLastRequest().getPath()); + } finally { + intake.close(); + } + } + + @Test + void testRetriesWhenBackendReturns429TooManyRequests() { + TrackType trackType = TrackType.CITESTCYCLE; + String apiVersion = "v2"; + String path = buildIntakePath(trackType, apiVersion); + int[] retry = {0}; + JavaTestHttpServer intake = + JavaTestHttpServer.httpServer( + s -> + s.handlers( + h -> + h.post( + path, + api -> { + if (retry[0] < 1) { + api.getResponse() + .status(429) + .addHeader("x-ratelimit-reset", "0") + .send(); + retry[0]++; + } else { + api.getResponse().status(200).send(); + } + }))); + DDIntakeApi client = createIntakeApi(intake.getAddress().toString(), trackType); + Payload payload = prepareTraces(trackType, Collections.emptyList()); + + try { + RemoteApi.Response clientResponse = client.sendSerializedTraces(payload); + assertTrue(clientResponse.success()); + assertTrue(clientResponse.status().isPresent()); + assertEquals(200, clientResponse.status().getAsInt()); + assertEquals(path, intake.getLastRequest().getPath()); + } finally { + intake.close(); + } + } + + @Test + void testContentIsSentAsMsgpackEmptyTraces() throws IOException { + runContentIsSentAsMsgpackTest(TrackType.CITESTCYCLE, "v2", emptyList(), emptyMap()); + } + + @Test + void testContentIsSentAsMsgpackFakeTypeSpan() throws IOException { + DDSpan span = buildSpan(1L, "fakeType", Collections.singletonMap("service.name", "my-service")); + span.finish(); + setDurationNano(span, 10L); + List> traces = Collections.singletonList(Collections.singletonList(span)); + + Map metadata = buildMetadataMap(); + Map content = new TreeMap<>(); + content.put("service", "my-service"); + content.put("name", "fakeOperation"); + content.put("resource", "fakeResource"); + content.put("error", 0); + content.put("trace_id", 1L); + content.put("span_id", 1L); + content.put("parent_id", 0L); + content.put("start", 1000L); + content.put("duration", 10L); + content.put( + "meta", Collections.singletonMap(DDTags.DD_SVC_SRC, ServiceNameSources.MANUAL.toString())); + content.put("metrics", emptyMap()); + Map event = new TreeMap<>(); + event.put("type", "span"); + event.put("version", 1); + event.put("content", content); + Map expectedRequestBody = new TreeMap<>(); + expectedRequestBody.put("version", 1); + expectedRequestBody.put("metadata", metadata); + expectedRequestBody.put("events", Collections.singletonList(event)); + + runContentIsSentAsMsgpackTest(TrackType.CITESTCYCLE, "v2", traces, expectedRequestBody); + } + + @Test + void testContentIsSentAsMsgpackTestSpan() throws IOException { + Map spanTags = new HashMap<>(); + spanTags.put("test_suite_id", 123L); + spanTags.put("test_module_id", 456L); + DDSpan span = buildSpan(1L, InternalSpanTypes.TEST, spanTags); + span.finish(); + setDurationNano(span, 10L); + List> traces = Collections.singletonList(Collections.singletonList(span)); + + Map metadata = buildMetadataMap(); + Map content = new TreeMap<>(); + content.put("test_suite_id", 123L); + content.put("test_module_id", 456L); + content.put("service", "fakeService"); + content.put("name", "fakeOperation"); + content.put("resource", "fakeResource"); + content.put("error", 0); + content.put("trace_id", 1L); + content.put("span_id", 1L); + content.put("parent_id", 0L); + content.put("start", 1000L); + content.put("duration", 10L); + content.put("meta", emptyMap()); + content.put("metrics", emptyMap()); + Map event = new TreeMap<>(); + event.put("type", "test"); + event.put("version", 2); + event.put("content", content); + Map expectedRequestBody = new TreeMap<>(); + expectedRequestBody.put("version", 1); + expectedRequestBody.put("metadata", metadata); + expectedRequestBody.put("events", Collections.singletonList(event)); + + runContentIsSentAsMsgpackTest(TrackType.CITESTCYCLE, "v2", traces, expectedRequestBody); + } + + @Test + void testContentIsSentAsMsgpackTestSuiteEndSpan() throws IOException { + Map spanTags = new HashMap<>(); + spanTags.put("test_suite_id", 123L); + spanTags.put("test_module_id", 456L); + DDSpan span = buildSpan(1L, InternalSpanTypes.TEST_SUITE_END, spanTags); + span.finish(); + setDurationNano(span, 10L); + List> traces = Collections.singletonList(Collections.singletonList(span)); + + Map metadata = buildMetadataMap(); + Map content = new TreeMap<>(); + content.put("test_suite_id", 123L); + content.put("test_module_id", 456L); + content.put("service", "fakeService"); + content.put("name", "fakeOperation"); + content.put("resource", "fakeResource"); + content.put("error", 0); + content.put("start", 1000L); + content.put("duration", 10L); + content.put("meta", emptyMap()); + content.put("metrics", emptyMap()); + Map event = new TreeMap<>(); + event.put("type", "test_suite_end"); + event.put("version", 1); + event.put("content", content); + Map expectedRequestBody = new TreeMap<>(); + expectedRequestBody.put("version", 1); + expectedRequestBody.put("metadata", metadata); + expectedRequestBody.put("events", Collections.singletonList(event)); + + runContentIsSentAsMsgpackTest(TrackType.CITESTCYCLE, "v2", traces, expectedRequestBody); + } + + @Test + void testContentIsSentAsMsgpackTestModuleEndSpan() throws IOException { + DDSpan span = + buildSpan( + 1L, + InternalSpanTypes.TEST_MODULE_END, + Collections.singletonMap("test_module_id", 456L)); + span.finish(); + setDurationNano(span, 10L); + List> traces = Collections.singletonList(Collections.singletonList(span)); + + Map metadata = buildMetadataMap(); + Map content = new TreeMap<>(); + content.put("test_module_id", 456L); + content.put("service", "fakeService"); + content.put("name", "fakeOperation"); + content.put("resource", "fakeResource"); + content.put("error", 0); + content.put("start", 1000L); + content.put("duration", 10L); + content.put("meta", emptyMap()); + content.put("metrics", emptyMap()); + Map event = new TreeMap<>(); + event.put("type", "test_module_end"); + event.put("version", 1); + event.put("content", content); + Map expectedRequestBody = new TreeMap<>(); + expectedRequestBody.put("version", 1); + expectedRequestBody.put("metadata", metadata); + expectedRequestBody.put("events", Collections.singletonList(event)); + + runContentIsSentAsMsgpackTest(TrackType.CITESTCYCLE, "v2", traces, expectedRequestBody); + } + + // --- Helper methods --- + + private void runContentIsSentAsMsgpackTest( + TrackType trackType, + String apiVersion, + List> traces, + Map expectedRequestBody) + throws IOException { + String path = buildIntakePath(trackType, apiVersion); + JavaTestHttpServer intake = + JavaTestHttpServer.httpServer( + s -> s.handlers(h -> h.post(path, api -> api.getResponse().send()))); + DDIntakeApi client = createIntakeApi(intake.getAddress().toString(), trackType); + Payload payload = prepareTraces(trackType, traces); + + try { + client.sendSerializedTraces(payload).status(); + assertEquals("application/msgpack", intake.getLastRequest().getContentType()); + Map actualBody = convertMap(intake.getLastRequest().getBody()); + assertDeepEquals(expectedRequestBody, actualBody); + } finally { + intake.close(); + } + } + + private static Map buildMetadataMap() { + Map star = new TreeMap<>(); + star.put("env", "my-env"); + star.put("runtime-id", "my-runtime-id"); + star.put("language", "my-language"); + star.put(Tags.RUNTIME_NAME, "my-runtime-name"); + star.put(Tags.RUNTIME_VERSION, "my-runtime-version"); + star.put(Tags.RUNTIME_VENDOR, "my-runtime-vendor"); + star.put(Tags.OS_ARCHITECTURE, "my-os-arch"); + star.put(Tags.OS_PLATFORM, "my-os-platform"); + star.put(Tags.OS_VERSION, "my-os-version"); + star.put(DDTags.TEST_IS_USER_PROVIDED_SERVICE, "false"); + Map metadata = new TreeMap<>(); + metadata.put("*", star); + return metadata; + } + + private static void setDurationNano(DDSpan span, long duration) { + try { + Field field = DDSpan.class.getDeclaredField("durationNano"); + field.setAccessible(true); + field.setLong(span, duration); + } catch (NoSuchFieldException | IllegalAccessException e) { + Assertions.fail("Could not set durationNano: " + e.getMessage()); + } + } + + static Map convertMap(byte[] bytes) throws IOException { + return MSG_PACK_MAPPER.readValue( + decompress(bytes), new TypeReference>() {}); + } + + static byte[] decompress(byte[] bytes) throws IOException { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + try (GZIPInputStream zip = new GZIPInputStream(new ByteArrayInputStream(bytes))) { + byte[] buf = new byte[4096]; + int len; + while ((len = zip.read(buf)) != -1) { + baos.write(buf, 0, len); + } + } + return baos.toByteArray(); + } + + private DDIntakeApi createIntakeApi(String url, TrackType trackType) { + HttpUrl hostUrl = HttpUrl.get(url); + return DDIntakeApi.builder().hostUrl(hostUrl).trackType(trackType).apiKey(API_KEY).build(); + } + + private RemoteMapper discoverMapper(TrackType trackType) { + DDIntakeMapperDiscovery mapperDiscovery = + new DDIntakeMapperDiscovery(trackType, WELL_KNOWN_TAGS, true); + mapperDiscovery.discover(); + return mapperDiscovery.getMapper(); + } + + private String buildIntakePath(TrackType trackType, String apiVersion) { + return String.format("/api/%s/%s", apiVersion, trackType.name().toLowerCase()); + } + + private Payload prepareTraces(TrackType trackType, List> traces) { + TracesCapture traceCapture = new TracesCapture(); + MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(1 << 20, traceCapture)); + RemoteMapper mapper = discoverMapper(trackType); + for (List trace : traces) { + packer.format(trace, mapper); + } + packer.flush(); + return mapper + .newPayload() + .withBody( + traceCapture.traceCount, + traces.isEmpty() ? ByteBuffer.allocate(0) : traceCapture.buffer); + } + + @SuppressWarnings("unchecked") + static void assertDeepEquals(Object expected, Object actual) { + if (expected == null && actual == null) { + return; + } + if (expected == null || actual == null) { + Assertions.fail("Expected " + expected + " but got " + actual); + } + if (expected instanceof Map) { + assertInstanceOf(Map.class, actual, "Expected Map but got " + actual.getClass()); + Map expectedMap = (Map) expected; + Map actualMap = (Map) actual; + assertEquals(expectedMap.size(), actualMap.size(), "Map size mismatch"); + for (Map.Entry entry : expectedMap.entrySet()) { + assertTrue(actualMap.containsKey(entry.getKey()), "Missing key: " + entry.getKey()); + assertDeepEquals(entry.getValue(), actualMap.get(entry.getKey())); + } + } else if (expected instanceof List) { + assertInstanceOf(List.class, actual, "Expected List but got " + actual.getClass()); + List expectedList = (List) expected; + List actualList = (List) actual; + assertEquals(expectedList.size(), actualList.size(), "List size mismatch"); + for (int i = 0; i < expectedList.size(); i++) { + assertDeepEquals(expectedList.get(i), actualList.get(i)); + } + } else if (expected instanceof Number && actual instanceof Number) { + if (expected instanceof Float + || expected instanceof Double + || actual instanceof Float + || actual instanceof Double) { + assertEquals(((Number) expected).doubleValue(), ((Number) actual).doubleValue(), 0.0001); + } else { + assertEquals(((Number) expected).longValue(), ((Number) actual).longValue()); + } + } else { + assertEquals(expected, actual); + } + } + + static class TracesCapture implements ByteBufferConsumer { + int traceCount; + ByteBuffer buffer; + + @Override + public void accept(int messageCount, ByteBuffer buffer) { + this.buffer = buffer; + this.traceCount = messageCount; + } + } +} diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddintake/DDIntakeTraceInterceptorTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddintake/DDIntakeTraceInterceptorTest.java new file mode 100644 index 00000000000..d757344634e --- /dev/null +++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddintake/DDIntakeTraceInterceptorTest.java @@ -0,0 +1,101 @@ +package datadog.trace.common.writer.ddintake; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import datadog.trace.bootstrap.instrumentation.api.Tags; +import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString; +import datadog.trace.common.writer.ListWriter; +import datadog.trace.core.CoreTracer; +import datadog.trace.core.DDCoreJavaSpecification; +import datadog.trace.core.DDSpan; +import java.util.List; +import java.util.concurrent.TimeoutException; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; +import org.tabletest.junit.TableTest; + +@Timeout(100) +class DDIntakeTraceInterceptorTest extends DDCoreJavaSpecification { + + ListWriter writer; + CoreTracer tracer; + + @BeforeEach + void setup() { + writer = new ListWriter(); + tracer = tracerBuilder().writer(writer).build(); + tracer.addTraceInterceptor(DDIntakeTraceInterceptor.INSTANCE); + } + + @AfterEach + void cleanup() { + if (tracer != null) { + tracer.close(); + } + } + + @TableTest({ + "scenario | httpStatus | expectedHttpStatus", + "null | | ", + "empty string | '' | ", + "string 500 | '500' | 500 ", + "integer 500 | 500 | 500 ", + "integer 600 | 600 | " + }) + void testNormalizationForDdIntake(Object httpStatus, Integer expectedHttpStatus) + throws InterruptedException, TimeoutException { + tracer + .buildSpan("datadog", "my-operation-name") + .withResourceName("my-resource-name") + .withSpanType("my-span-type") + .withServiceName("my-service-name") + .withTag("some-tag-key", "some-tag-value") + .withTag("env", " My_____Env ") + .withTag(Tags.HTTP_STATUS, httpStatus) + .start() + .finish(); + writer.waitForTraces(1); + + List trace = writer.firstTrace(); + assertEquals(1, trace.size()); + DDSpan span = trace.get(0); + assertEquals("my-service-name", span.getServiceName()); + assertEquals("my_operation_name", span.getOperationName().toString()); + assertEquals("my-resource-name", span.getResourceName().toString()); + assertEquals("my-span-type", span.getSpanType()); + assertEquals("some-tag-value", span.getTag("some-tag-key")); + assertEquals("my_env", span.getTag("env")); + assertEquals(expectedHttpStatus, span.getTag(Tags.HTTP_STATUS)); + } + + @Test + void testNormalizationDoesNotImplicitlyConvertSpanType() + throws InterruptedException, TimeoutException { + UTF8BytesString originalSpanType = UTF8BytesString.create("a UTF8 span type"); + tracer + .buildSpan("datadog", "my-operation-name") + .withSpanType(originalSpanType) + .start() + .finish(); + + writer.waitForTraces(1); + + List trace = writer.firstTrace(); + assertEquals(1, trace.size()); + DDSpan span = trace.get(0); + assertEquals(originalSpanType, span.getType()); + } + + @Test + void testDefaultEnvSetting() throws InterruptedException, TimeoutException { + tracer.buildSpan("datadog", "my-operation-name").start().finish(); + writer.waitForTraces(1); + + List trace = writer.firstTrace(); + assertEquals(1, trace.size()); + DDSpan span = trace.get(0); + assertEquals("none", span.getTag("env")); + } +} diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddintake/DDIntakeTrackTypeResolverTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddintake/DDIntakeTrackTypeResolverTest.java new file mode 100644 index 00000000000..5166a371966 --- /dev/null +++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddintake/DDIntakeTrackTypeResolverTest.java @@ -0,0 +1,30 @@ +package datadog.trace.common.writer.ddintake; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import datadog.trace.api.Config; +import datadog.trace.api.intake.TrackType; +import datadog.trace.test.util.DDJavaSpecification; +import org.tabletest.junit.TableTest; + +class DDIntakeTrackTypeResolverTest extends DDJavaSpecification { + + @TableTest({ + "scenario | ciVisibilityEnabled | ciVisibilityAgentlessEnabled | expectedTrackType", + "ci-vis disabled agentless disabled | false | false | NOOP ", + "ci-vis enabled agentless disabled | true | false | CITESTCYCLE ", + "ci-vis enabled agentless enabled | true | true | CITESTCYCLE " + }) + void shouldReturnTheCorrectTrackType( + boolean ciVisibilityEnabled, + boolean ciVisibilityAgentlessEnabled, + TrackType expectedTrackType) { + Config config = mock(Config.class); + when(config.isCiVisibilityEnabled()).thenReturn(ciVisibilityEnabled); + when(config.isCiVisibilityAgentlessEnabled()).thenReturn(ciVisibilityAgentlessEnabled); + + assertEquals(expectedTrackType, DDIntakeTrackTypeResolver.resolve(config)); + } +} diff --git a/utils/junit-utils/src/main/java/datadog/trace/junit/utils/tabletest/TableTestTypeConverters.java b/utils/junit-utils/src/main/java/datadog/trace/junit/utils/tabletest/TableTestTypeConverters.java index 8f2b2986efd..1c828cda364 100644 --- a/utils/junit-utils/src/main/java/datadog/trace/junit/utils/tabletest/TableTestTypeConverters.java +++ b/utils/junit-utils/src/main/java/datadog/trace/junit/utils/tabletest/TableTestTypeConverters.java @@ -1,5 +1,7 @@ package datadog.trace.junit.utils.tabletest; +import datadog.trace.api.ProtocolVersion; +import datadog.trace.api.intake.TrackType; import org.tabletest.junit.TypeConverter; /** Shared converters for JUnit 5 TableTest tests that use unparsable constants. */ @@ -7,6 +9,30 @@ public final class TableTestTypeConverters { private TableTestTypeConverters() {} + @TypeConverter + public static TrackType toTrackType(String value) { + if (value == null) { + return null; + } + String token = value.trim(); + if (token.startsWith("TrackType.")) { + token = token.substring("TrackType.".length()); + } + return TrackType.valueOf(token); + } + + @TypeConverter + public static ProtocolVersion toProtocolVersion(String value) { + if (value == null) { + return null; + } + String token = value.trim(); + if (token.startsWith("ProtocolVersion.")) { + token = token.substring("ProtocolVersion.".length()); + } + return ProtocolVersion.valueOf(token); + } + @TypeConverter public static long toLong(String value) { if (value == null) { From 90c0a6d4f896feab2ecce409b4115524accd047b Mon Sep 17 00:00:00 2001 From: jean-philippe bempel Date: Thu, 11 Jun 2026 08:39:43 +0200 Subject: [PATCH 135/139] address comments --- .../common/writer/DDAgentWriterTest.java | 30 +++++--------- .../common/writer/SerializationTest.java | 5 --- .../ddagent/TraceMapperV04PayloadTest.java | 6 +-- .../ddagent/TraceMapperV05PayloadTest.java | 40 ++++++++++--------- 4 files changed, 34 insertions(+), 47 deletions(-) diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/DDAgentWriterTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/DDAgentWriterTest.java index 8aeea35d6f2..6a620d35596 100644 --- a/dd-trace-core/src/test/java/datadog/trace/common/writer/DDAgentWriterTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/DDAgentWriterTest.java @@ -2,6 +2,7 @@ import static datadog.trace.common.writer.ddagent.PrioritizationStrategy.PublishResult.ENQUEUED_FOR_SERIALIZATION; import static datadog.trace.common.writer.ddagent.PrioritizationStrategy.PublishResult.ENQUEUED_FOR_SINGLE_SPAN_SAMPLING; +import static java.util.concurrent.TimeUnit.SECONDS; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; @@ -23,11 +24,10 @@ import datadog.trace.core.DDSpan; import datadog.trace.core.monitor.HealthMetrics; import datadog.trace.core.propagation.PropagationTags; +import java.util.Arrays; import java.util.Collections; import java.util.List; -import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.tabletest.junit.TableTest; @@ -37,25 +37,18 @@ class DDAgentWriterTest extends DDCoreJavaSpecification { TraceProcessingWorker worker = mock(TraceProcessingWorker.class); DDAgentFeaturesDiscovery discovery = mock(DDAgentFeaturesDiscovery.class); DDAgentApi api = mock(DDAgentApi.class); - MonitoringImpl monitoring = new MonitoringImpl(StatsDClient.NO_OP, 1, TimeUnit.SECONDS); + MonitoringImpl monitoring = new MonitoringImpl(StatsDClient.NO_OP, 1, SECONDS); PayloadDispatcherImpl dispatcher = new PayloadDispatcherImpl(new DDAgentMapperDiscovery(discovery), api, monitor, monitoring); - DDAgentWriter writer = new DDAgentWriter(worker, dispatcher, monitor, 1, TimeUnit.SECONDS, false); + DDAgentWriter writer = new DDAgentWriter(worker, dispatcher, monitor, 1, SECONDS, false); // Only used to create spans - CoreTracer dummyTracer; - - @BeforeEach - void setup() { - dummyTracer = tracerBuilder().writer(new ListWriter()).build(); - } + CoreTracer dummyTracer = tracerBuilder().writer(new ListWriter()).build(); @AfterEach void cleanup() { writer.close(); - if (dummyTracer != null) { - dummyTracer.close(); - } + dummyTracer.close(); } @Test @@ -91,13 +84,13 @@ void testWriterStartClosed() { @Test void testWriterFlush() { - when(worker.flush(1, TimeUnit.SECONDS)).thenReturn(true, false); + when(worker.flush(1, SECONDS)).thenReturn(true, false); // first flush succeeds writer.flush(); // monitor is notified - verify(worker).flush(1, TimeUnit.SECONDS); + verify(worker).flush(1, SECONDS); verify(monitor).onFlush(false); verifyNoMoreInteractions(monitor, worker, discovery, api); @@ -107,7 +100,7 @@ void testWriterFlush() { writer.flush(); // no additional monitor notifications - verify(worker).flush(1, TimeUnit.SECONDS); + verify(worker).flush(1, SECONDS); verifyNoMoreInteractions(monitor, worker, discovery, api); } @@ -207,10 +200,9 @@ void testDroppedTraceIsCounted(PublishResult publishResult) { HealthMetrics localMonitor = mock(HealthMetrics.class); PayloadDispatcherImpl localDispatcher = mock(PayloadDispatcherImpl.class); DDAgentWriter localWriter = - new DDAgentWriter(localWorker, localDispatcher, localMonitor, 1, TimeUnit.SECONDS, false); + new DDAgentWriter(localWorker, localDispatcher, localMonitor, 1, SECONDS, false); - DDSpan p0 = newSpan(); - List trace = java.util.Arrays.asList(p0, newSpan()); + List trace = Arrays.asList(newSpan(), newSpan()); when(localWorker.publish(eq(trace.get(0)), anyInt(), eq(trace))).thenReturn(publishResult); localWriter.write(trace); diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/SerializationTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/SerializationTest.java index a0254db18d0..0924581f26b 100644 --- a/dd-trace-core/src/test/java/datadog/trace/common/writer/SerializationTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/SerializationTest.java @@ -19,17 +19,14 @@ class SerializationTest extends DDJavaSpecification { @Test void testJsonMapperSerialization() throws Exception { - // setup ObjectMapper mapper = new ObjectMapper(); Map map = singletonMap("key1", "val1"); byte[] serializedMap = mapper.writeValueAsBytes(map); byte[] serializedList = ("[" + new String(serializedMap) + "]").getBytes(); - // when List> result = mapper.readValue(serializedList, new TypeReference>>() {}); - // then assertEquals(Collections.singletonList(map), result); assertEquals("[{\"key1\":\"val1\"}]", new String(serializedList)); } @@ -55,11 +52,9 @@ void testMsgpackMapperSerialization() throws Exception { } byte[] serializedList = packer.toByteArray(); - // when List> result = mapper.readValue(serializedList, new TypeReference>>() {}); - // then assertEquals(input, result); } } diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV04PayloadTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV04PayloadTest.java index 87496e430df..8bab7bd1cc2 100644 --- a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV04PayloadTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV04PayloadTest.java @@ -442,10 +442,6 @@ public void close() {} } private static void assertEqualsWithNullAsEmpty(CharSequence expected, CharSequence actual) { - if (null == expected) { - assertEquals("", actual); - } else { - assertEquals(expected.toString(), actual.toString()); - } + assertEquals(expected == null ? "" : expected.toString(), actual.toString()); } } diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV05PayloadTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV05PayloadTest.java index 453a35f04bc..b35ea8fa8c3 100644 --- a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV05PayloadTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV05PayloadTest.java @@ -53,8 +53,7 @@ void resetProcessTags() { @Test void testBodyOverflowCausesFlush() { // disable process tags since they are only on the first span of the chunk otherwise the - // calculation woes - // 4x 36 ASCII characters and 2 bytes of msgpack string prefix + // calculation woes 4x 36 ASCII characters and 2 bytes of msgpack string prefix int dictionarySpacePerTrace = 4 * (36 + 2); // enough space for two traces with distinct string values, plus the header int dictionarySize = dictionarySpacePerTrace * 2 + 5; @@ -263,22 +262,27 @@ public void accept(int messageCount, ByteBuffer buffer) { meta.put(dictionary[unpacker.unpackInt()], dictionary[unpacker.unpackInt()]); } for (Map.Entry entry : meta.entrySet()) { - if (Tags.HTTP_STATUS.equals(entry.getKey())) { - assertEquals(String.valueOf(expectedSpan.getHttpStatusCode()), entry.getValue()); - } else if (DDTags.ORIGIN_KEY.equals(entry.getKey())) { - assertEquals(expectedSpan.getOrigin(), entry.getValue()); - } else if (DDTags.PROCESS_TAGS.equals(entry.getKey())) { - processTagsCount++; - assertTrue(Config.get().isExperimentalPropagateProcessTagsEnabled()); - assertEquals(0, k); - assertEquals(ProcessTags.getTagsForSerialization().toString(), entry.getValue()); - } else { - Object tag = expectedSpan.getTag(entry.getKey()); - if (null != tag) { - assertEquals(String.valueOf(tag), entry.getValue()); - } else { - assertEquals(expectedSpan.getBaggage().get(entry.getKey()), entry.getValue()); - } + switch (entry.getKey()) { + case Tags.HTTP_STATUS: + assertEquals(String.valueOf(expectedSpan.getHttpStatusCode()), entry.getValue()); + break; + case DDTags.ORIGIN_KEY: + assertEquals(expectedSpan.getOrigin(), entry.getValue()); + break; + case DDTags.PROCESS_TAGS: + processTagsCount++; + assertTrue(Config.get().isExperimentalPropagateProcessTagsEnabled()); + assertEquals(0, k); + assertEquals(ProcessTags.getTagsForSerialization().toString(), entry.getValue()); + break; + default: + Object tag = expectedSpan.getTag(entry.getKey()); + if (null != tag) { + assertEquals(String.valueOf(tag), entry.getValue()); + } else { + assertEquals(expectedSpan.getBaggage().get(entry.getKey()), entry.getValue()); + } + break; } } int metricsSize = unpacker.unpackMapHeader(); From 0230254c759f1a616552381dfca7865ce863196b Mon Sep 17 00:00:00 2001 From: jean-philippe bempel Date: Thu, 11 Jun 2026 16:44:43 +0200 Subject: [PATCH 136/139] fix asserts --- .../datadog/trace/common/writer/DDAgentApiTest.java | 4 +++- .../trace/common/writer/DDAgentWriterTest.java | 11 ++++++++--- .../trace/common/writer/ddintake/DDIntakeApiTest.java | 5 ++++- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/DDAgentApiTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/DDAgentApiTest.java index 1452c640509..b759ea525f2 100644 --- a/dd-trace-core/src/test/java/datadog/trace/common/writer/DDAgentApiTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/DDAgentApiTest.java @@ -2,7 +2,9 @@ import static datadog.trace.api.ProtocolVersion.V0_5; import static java.util.Collections.emptyList; +import static java.util.Collections.emptyMap; import static java.util.Collections.singletonList; +import static java.util.Collections.singletonMap; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertInstanceOf; @@ -382,7 +384,7 @@ void testApiResponseListenersSee200Responses(String agentVersion) { client.sendSerializedTraces(payload); Map> response = agentResponse.get(); - assertTrue(response != null && response.containsKey("hello")); + assertEquals(singletonMap("hello", emptyMap()), response); assertEquals("java", agent.getLastRequest().getHeaders().get("Datadog-Meta-Lang")); assertEquals( System.getProperty("java.version", "unknown"), diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/DDAgentWriterTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/DDAgentWriterTest.java index 6a620d35596..873f80f9a48 100644 --- a/dd-trace-core/src/test/java/datadog/trace/common/writer/DDAgentWriterTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/DDAgentWriterTest.java @@ -16,6 +16,7 @@ import datadog.communication.ddagent.DDAgentFeaturesDiscovery; import datadog.metrics.api.statsd.StatsDClient; import datadog.metrics.impl.MonitoringImpl; +import datadog.trace.api.sampling.PrioritySampling; import datadog.trace.common.writer.ddagent.DDAgentApi; import datadog.trace.common.writer.ddagent.DDAgentMapperDiscovery; import datadog.trace.common.writer.ddagent.PrioritizationStrategy.PublishResult; @@ -202,12 +203,16 @@ void testDroppedTraceIsCounted(PublishResult publishResult) { DDAgentWriter localWriter = new DDAgentWriter(localWorker, localDispatcher, localMonitor, 1, SECONDS, false); - List trace = Arrays.asList(newSpan(), newSpan()); + DDSpan p0 = newSpan(); + p0.setSamplingPriority(PrioritySampling.SAMPLER_DROP); + List trace = Arrays.asList(p0, newSpan()); - when(localWorker.publish(eq(trace.get(0)), anyInt(), eq(trace))).thenReturn(publishResult); + when(localWorker.publish(eq(trace.get(0)), eq((int) PrioritySampling.SAMPLER_DROP), eq(trace))) + .thenReturn(publishResult); localWriter.write(trace); - verify(localWorker).publish(eq(trace.get(0)), anyInt(), eq(trace)); + verify(localWorker) + .publish(eq(trace.get(0)), eq((int) PrioritySampling.SAMPLER_DROP), eq(trace)); verify(localDispatcher).onDroppedTrace(trace.size()); } diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddintake/DDIntakeApiTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddintake/DDIntakeApiTest.java index 4609c585a65..dfc0386a2ec 100644 --- a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddintake/DDIntakeApiTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddintake/DDIntakeApiTest.java @@ -32,6 +32,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.OptionalInt; import java.util.TreeMap; import java.util.zip.GZIPInputStream; import okhttp3.HttpUrl; @@ -327,7 +328,9 @@ private void runContentIsSentAsMsgpackTest( Payload payload = prepareTraces(trackType, traces); try { - client.sendSerializedTraces(payload).status(); + OptionalInt status = client.sendSerializedTraces(payload).status(); + assertTrue(status.isPresent()); + assertEquals(200, status.getAsInt()); assertEquals("application/msgpack", intake.getLastRequest().getContentType()); Map actualBody = convertMap(intake.getLastRequest().getBody()); assertDeepEquals(expectedRequestBody, actualBody); From 2f42144bf0168622887e631a764de3392635fa88 Mon Sep 17 00:00:00 2001 From: jean-philippe bempel Date: Fri, 12 Jun 2026 09:56:31 +0200 Subject: [PATCH 137/139] fix comments --- .../writer/DDIntakeWriterCombinedTest.java | 3 +- .../writer/TraceProcessingWorkerTest.java | 82 +++++++------------ 2 files changed, 30 insertions(+), 55 deletions(-) diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/DDIntakeWriterCombinedTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/DDIntakeWriterCombinedTest.java index 56883149858..c53286cb106 100644 --- a/dd-trace-core/src/test/java/datadog/trace/common/writer/DDIntakeWriterCombinedTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/DDIntakeWriterCombinedTest.java @@ -40,6 +40,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import okhttp3.HttpUrl; +import okhttp3.OkHttpClient; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -322,7 +323,7 @@ void monitorHappyPath() { server.handlers(h -> h.post(path, api -> api.getResponse().status(200).send()))); try { HttpUrl hostUrl = HttpUrl.get(intake.getAddress()); - okhttp3.OkHttpClient httpClient = OkHttpUtils.buildHttpClient(hostUrl, 1000); + OkHttpClient httpClient = OkHttpUtils.buildHttpClient(hostUrl, 1000); DDIntakeApi api = DDIntakeApi.builder() .hostUrl(hostUrl) diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/TraceProcessingWorkerTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/TraceProcessingWorkerTest.java index 6f57f5d455b..bc51e4effd9 100644 --- a/dd-trace-core/src/test/java/datadog/trace/common/writer/TraceProcessingWorkerTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/TraceProcessingWorkerTest.java @@ -92,7 +92,7 @@ void testHeartbeatsShouldBeTriggeredAutomaticallyWhenEnabled() throws Exception @Test void testHeartbeatsShouldOccurAtLeastOncePerSecondWhenNotThrottled() throws Exception { AtomicInteger flushCount = new AtomicInteger(); - TraceProcessingWorker worker = + try (TraceProcessingWorker worker = new TraceProcessingWorker( 10, mock(HealthMetrics.class), @@ -101,12 +101,11 @@ void testHeartbeatsShouldOccurAtLeastOncePerSecondWhenNotThrottled() throws Exce FAST_LANE, 1, TimeUnit.NANOSECONDS, // stop heartbeats from being throttled - null); + null)) { - // processor is started - worker.start(); + // processor is started + worker.start(); - try { // heartbeat occurs automatically approximately once per second // wait 1 second initial delay, then poll up to 1 second Thread.sleep(1000); @@ -116,9 +115,6 @@ void testHeartbeatsShouldOccurAtLeastOncePerSecondWhenNotThrottled() throws Exce Thread.sleep(50); } assertTrue(flushCount.get() > 1); - } finally { - // cleanup - worker.close(); } } @@ -129,7 +125,9 @@ void testHeartbeatsShouldOccurAtLeastOncePerSecondWhenNotThrottled() throws Exce @Test void testAFlushShouldClearThePrimaryQueue() { AtomicInteger flushCount = new AtomicInteger(); - TraceProcessingWorker worker = + // prevent heartbeats from helping the flush happen + + try (TraceProcessingWorker worker = new TraceProcessingWorker( 10, mock(HealthMetrics.class), @@ -138,9 +136,7 @@ void testAFlushShouldClearThePrimaryQueue() { FAST_LANE, 100, TimeUnit.SECONDS, // prevent heartbeats from helping the flush happen - null); - - try { + null)) { // there is pending work it is completed before a flush // processing this span will throw an exception, but it should be caught // and not disrupt the flush @@ -153,9 +149,6 @@ void testAFlushShouldClearThePrimaryQueue() { assertTrue(flushed); assertEquals(1, flushCount.get()); assertTrue(worker.getPrimaryQueue().isEmpty()); - } finally { - // cleanup - worker.close(); } } @@ -195,7 +188,9 @@ void testShouldReportFailureIfSerializationFails( .when(healthMetrics) .onFailedSerialize(any(), any()); - TraceProcessingWorker worker = + // prevent heartbeats from helping the flush happen + + try (TraceProcessingWorker worker = new TraceProcessingWorker( 10, healthMetrics, @@ -204,10 +199,8 @@ void testShouldReportFailureIfSerializationFails( FAST_LANE, 100, TimeUnit.SECONDS, // prevent heartbeats from helping the flush happen - null); - worker.start(); - - try { + null)) { + worker.start(); // a trace is processed but can't be passed on worker.publish(mock(DDSpan.class), priority, Collections.singletonList(mock(DDSpan.class))); @@ -218,9 +211,6 @@ void testShouldReportFailureIfSerializationFails( Thread.sleep(50); } assertEquals(1, errorReported.get()); - } finally { - // cleanup - worker.close(); } } @@ -276,7 +266,7 @@ void testTraceShouldBePostProcessed() throws Exception { SpanPostProcessor.Holder.INSTANCE = mockProcessor; - TraceProcessingWorker worker = + try (TraceProcessingWorker worker = new TraceProcessingWorker( 10, healthMetrics, @@ -285,10 +275,8 @@ void testTraceShouldBePostProcessed() throws Exception { FAST_LANE, 100, TimeUnit.SECONDS, - null); - worker.start(); - - try { + null)) { + worker.start(); // traces are submitted List trace = new ArrayList<>(); trace.add(span1); @@ -305,9 +293,7 @@ void testTraceShouldBePostProcessed() throws Exception { assertTrue(processedSpan1.get()); assertTrue(processedSpan2.get()); } finally { - // cleanup SpanPostProcessor.Holder.INSTANCE = SpanPostProcessor.Holder.NOOP; - worker.close(); } } @@ -350,7 +336,9 @@ void testTracesShouldBeProcessed( .when(countingDispatcher) .addTrace(any()); HealthMetrics healthMetrics = mock(HealthMetrics.class); - TraceProcessingWorker worker = + // prevent heartbeats from helping the flush happen + + try (TraceProcessingWorker worker = new TraceProcessingWorker( 10, healthMetrics, @@ -359,10 +347,8 @@ void testTracesShouldBeProcessed( FAST_LANE, 100, TimeUnit.SECONDS, // prevent heartbeats from helping the flush happen - null); - worker.start(); - - try { + null)) { + worker.start(); // traces are submitted int submitted = 0; for (int i = 0; i < traceCount; ++i) { @@ -380,10 +366,8 @@ void testTracesShouldBeProcessed( Thread.sleep(50); } assertEquals(expectedSubmitted, acceptedCount.get()); - } finally { - // cleanup - worker.close(); } + // cleanup } // ------------------------------------------------------------------------- @@ -490,7 +474,7 @@ public > boolean setSamplingPriority(T span) { } }; - TraceProcessingWorker worker = + try (TraceProcessingWorker worker = new TraceProcessingWorker( 10, healthMetrics, @@ -499,10 +483,8 @@ public > boolean setSamplingPriority(T span) { FAST_LANE, 100, TimeUnit.SECONDS, - singleSpanSampler); - worker.start(); - - try { + singleSpanSampler)) { + worker.start(); // traces are submitted for (int i = 0; i < traceCount; ++i) { List trace = new ArrayList<>(); @@ -523,9 +505,6 @@ public > boolean setSamplingPriority(T span) { assertEquals(acceptedTraces, acceptedCount.get()); assertEquals(acceptedSpans, acceptedSpanCount.get()); assertEquals(sampledSingleSpans, sampledSpansCount.get()); - } finally { - // cleanup - worker.close(); } } @@ -604,7 +583,7 @@ public > boolean setSamplingPriority(T span) { } }; - TraceProcessingWorker worker = + try (TraceProcessingWorker worker = new TraceProcessingWorker( 10, healthMetrics, @@ -613,10 +592,8 @@ public > boolean setSamplingPriority(T span) { FAST_LANE, 100, TimeUnit.SECONDS, - singleSpanSampler); - worker.start(); - - try { + singleSpanSampler)) { + worker.start(); // traces are submitted for (int i = 0; i < traceCount; ++i) { List trace = new ArrayList<>(); @@ -637,9 +614,6 @@ public > boolean setSamplingPriority(T span) { assertEquals(expectedChunks, chunksCount.get()); assertEquals(expectedSpans, spansCount.get()); assertEquals(sampledSingleSpans, sampledSpansCount.get()); - } finally { - // cleanup - worker.close(); } } } From be1d30b17bcfddf19587f18aa300f23b1daf6319 Mon Sep 17 00:00:00 2001 From: jean-philippe bempel Date: Wed, 17 Jun 2026 13:12:53 +0200 Subject: [PATCH 138/139] address comments --- .../ddagent/TraceMapperV04PayloadTest.java | 255 +++++++++--------- 1 file changed, 128 insertions(+), 127 deletions(-) diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV04PayloadTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV04PayloadTest.java index 8bab7bd1cc2..5887565208b 100644 --- a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV04PayloadTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV04PayloadTest.java @@ -265,140 +265,141 @@ public void accept(int messageCount, ByteBuffer buffer) { Payload payload = mapper.newPayload().withBody(messageCount, buffer); payload.writeTo(this); captured.flip(); - MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(captured); - int traceCount = unpacker.unpackArrayHeader(); - for (int i = 0; i < traceCount; ++i) { - List expectedTrace = expectedTraces.get(position++); - int spanCount = unpacker.unpackArrayHeader(); - assertEquals(expectedTrace.size(), spanCount); - for (int k = 0; k < spanCount; ++k) { - TraceGenerator.PojoSpan expectedSpan = expectedTrace.get(k); - int elementCount = unpacker.unpackMapHeader(); - boolean hasMetaStruct = !expectedSpan.getMetaStruct().isEmpty(); - assertEquals(hasMetaStruct ? 13 : 12, elementCount); - assertEquals("service", unpacker.unpackString()); - String serviceName = unpacker.unpackString(); - assertEqualsWithNullAsEmpty(expectedSpan.getServiceName(), serviceName); - assertEquals("name", unpacker.unpackString()); - String operationName = unpacker.unpackString(); - assertEqualsWithNullAsEmpty(expectedSpan.getOperationName(), operationName); - assertEquals("resource", unpacker.unpackString()); - String resourceName = unpacker.unpackString(); - assertEqualsWithNullAsEmpty(expectedSpan.getResourceName(), resourceName); - assertEquals("trace_id", unpacker.unpackString()); - long traceId = unpacker.unpackValue().asNumberValue().toLong(); - assertEquals(expectedSpan.getTraceId().toLong(), traceId); - assertEquals("span_id", unpacker.unpackString()); - long spanId = unpacker.unpackValue().asNumberValue().toLong(); - assertEquals(expectedSpan.getSpanId(), spanId); - assertEquals("parent_id", unpacker.unpackString()); - long parentId = unpacker.unpackValue().asNumberValue().toLong(); - assertEquals(expectedSpan.getParentId(), parentId); - assertEquals("start", unpacker.unpackString()); - long startTime = unpacker.unpackLong(); - assertEquals(expectedSpan.getStartTime(), startTime); - assertEquals("duration", unpacker.unpackString()); - long duration = unpacker.unpackLong(); - assertEquals(expectedSpan.getDurationNano(), duration); - assertEquals("type", unpacker.unpackString()); - String type = unpacker.unpackString(); - assertEquals(expectedSpan.getType(), type); - assertEquals("error", unpacker.unpackString()); - int error = unpacker.unpackInt(); - assertEquals(expectedSpan.getError(), error); - assertEquals("metrics", unpacker.unpackString()); - int metricsSize = unpacker.unpackMapHeader(); - HashMap metrics = new HashMap<>(); - for (int j = 0; j < metricsSize; ++j) { - String key = unpacker.unpackString(); - Number metricValue = null; - MessageFormat format = unpacker.getNextFormat(); - switch (format) { - case NEGFIXINT: - case POSFIXINT: - case INT8: - case UINT8: - case INT16: - case UINT16: - case INT32: - case UINT32: - metricValue = unpacker.unpackInt(); - break; - case INT64: - case UINT64: - metricValue = unpacker.unpackLong(); - break; - case FLOAT32: - metricValue = unpacker.unpackFloat(); - break; - case FLOAT64: - metricValue = unpacker.unpackDouble(); - break; - default: - Assertions.fail("Unexpected type in metrics values: " + format); - } - if (DD_MEASURED.toString().equals(key)) { - assertTrue(metricValue.intValue() == 1 || !expectedSpan.isMeasured()); - } else if (DDSpanContext.PRIORITY_SAMPLING_KEY.equals(key)) { - // check that priority sampling is only on first and last span - if (k == 0 || k == spanCount - 1) { - assertEquals(expectedSpan.samplingPriority(), metricValue.intValue()); + try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(captured)) { + int traceCount = unpacker.unpackArrayHeader(); + for (int i = 0; i < traceCount; ++i) { + List expectedTrace = expectedTraces.get(position++); + int spanCount = unpacker.unpackArrayHeader(); + assertEquals(expectedTrace.size(), spanCount); + for (int k = 0; k < spanCount; ++k) { + TraceGenerator.PojoSpan expectedSpan = expectedTrace.get(k); + int elementCount = unpacker.unpackMapHeader(); + boolean hasMetaStruct = !expectedSpan.getMetaStruct().isEmpty(); + assertEquals(hasMetaStruct ? 13 : 12, elementCount); + assertEquals("service", unpacker.unpackString()); + String serviceName = unpacker.unpackString(); + assertEqualsWithNullAsEmpty(expectedSpan.getServiceName(), serviceName); + assertEquals("name", unpacker.unpackString()); + String operationName = unpacker.unpackString(); + assertEqualsWithNullAsEmpty(expectedSpan.getOperationName(), operationName); + assertEquals("resource", unpacker.unpackString()); + String resourceName = unpacker.unpackString(); + assertEqualsWithNullAsEmpty(expectedSpan.getResourceName(), resourceName); + assertEquals("trace_id", unpacker.unpackString()); + long traceId = unpacker.unpackValue().asNumberValue().toLong(); + assertEquals(expectedSpan.getTraceId().toLong(), traceId); + assertEquals("span_id", unpacker.unpackString()); + long spanId = unpacker.unpackValue().asNumberValue().toLong(); + assertEquals(expectedSpan.getSpanId(), spanId); + assertEquals("parent_id", unpacker.unpackString()); + long parentId = unpacker.unpackValue().asNumberValue().toLong(); + assertEquals(expectedSpan.getParentId(), parentId); + assertEquals("start", unpacker.unpackString()); + long startTime = unpacker.unpackLong(); + assertEquals(expectedSpan.getStartTime(), startTime); + assertEquals("duration", unpacker.unpackString()); + long duration = unpacker.unpackLong(); + assertEquals(expectedSpan.getDurationNano(), duration); + assertEquals("type", unpacker.unpackString()); + String type = unpacker.unpackString(); + assertEquals(expectedSpan.getType(), type); + assertEquals("error", unpacker.unpackString()); + int error = unpacker.unpackInt(); + assertEquals(expectedSpan.getError(), error); + assertEquals("metrics", unpacker.unpackString()); + int metricsSize = unpacker.unpackMapHeader(); + HashMap metrics = new HashMap<>(); + for (int j = 0; j < metricsSize; ++j) { + String key = unpacker.unpackString(); + Number metricValue = null; + MessageFormat format = unpacker.getNextFormat(); + switch (format) { + case NEGFIXINT: + case POSFIXINT: + case INT8: + case UINT8: + case INT16: + case UINT16: + case INT32: + case UINT32: + metricValue = unpacker.unpackInt(); + break; + case INT64: + case UINT64: + metricValue = unpacker.unpackLong(); + break; + case FLOAT32: + metricValue = unpacker.unpackFloat(); + break; + case FLOAT64: + metricValue = unpacker.unpackDouble(); + break; + default: + Assertions.fail("Unexpected type in metrics values: " + format); + } + if (DD_MEASURED.toString().equals(key)) { + assertTrue(metricValue.intValue() == 1 || !expectedSpan.isMeasured()); + } else if (DDSpanContext.PRIORITY_SAMPLING_KEY.equals(key)) { + // check that priority sampling is only on first and last span + if (k == 0 || k == spanCount - 1) { + assertEquals(expectedSpan.samplingPriority(), metricValue.intValue()); + } else { + assertFalse(expectedSpan.hasSamplingPriority()); + } } else { - assertFalse(expectedSpan.hasSamplingPriority()); + metrics.put(key, metricValue); } - } else { - metrics.put(key, metricValue); } - } - for (Map.Entry metric : metrics.entrySet()) { - if (metric.getValue() instanceof Double || metric.getValue() instanceof Float) { - assertEquals( - ((Number) expectedSpan.getTag(metric.getKey())).doubleValue(), - metric.getValue().doubleValue(), - 0.001); - } else { - // Groovy compared numerically, Java requires explicit long comparison to avoid - // Long/Integer type mismatch from different msgpack integer encoding widths - assertEquals( - ((Number) expectedSpan.getTag(metric.getKey())).longValue(), - metric.getValue().longValue()); + metrics.forEach((key, value) -> { + if (value instanceof Double || value instanceof Float) { + assertEquals( + ((Number) expectedSpan.getTag(key)).doubleValue(), + value.doubleValue(), + 0.001); + } else { + // Groovy compared numerically, Java requires explicit long comparison to avoid + // Long/Integer type mismatch from different msgpack integer encoding widths + assertEquals( + ((Number) expectedSpan.getTag(key)).longValue(), + value.longValue()); + } + }); + assertEquals("meta", unpacker.unpackString()); + int metaSize = unpacker.unpackMapHeader(); + HashMap meta = new HashMap<>(); + for (int j = 0; j < metaSize; ++j) { + meta.put(unpacker.unpackString(), unpacker.unpackString()); } - } - assertEquals("meta", unpacker.unpackString()); - int metaSize = unpacker.unpackMapHeader(); - HashMap meta = new HashMap<>(); - for (int j = 0; j < metaSize; ++j) { - meta.put(unpacker.unpackString(), unpacker.unpackString()); - } - for (Map.Entry entry : meta.entrySet()) { - if (Tags.HTTP_STATUS.equals(entry.getKey())) { - assertEquals(String.valueOf(expectedSpan.getHttpStatusCode()), entry.getValue()); - } else if (DDTags.ORIGIN_KEY.equals(entry.getKey())) { - assertEquals(expectedSpan.getOrigin(), entry.getValue()); - } else if (DDTags.PROCESS_TAGS.equals(entry.getKey())) { - assertTrue(Config.get().isExperimentalPropagateProcessTagsEnabled()); - assertEquals(0, k); - assertEquals(ProcessTags.getTagsForSerialization().toString(), entry.getValue()); - processTagsCount++; - } else { - Object tag = expectedSpan.getTag(entry.getKey()); - if (null != tag) { - assertEquals(String.valueOf(tag), entry.getValue()); + for (Map.Entry entry : meta.entrySet()) { + if (Tags.HTTP_STATUS.equals(entry.getKey())) { + assertEquals(String.valueOf(expectedSpan.getHttpStatusCode()), entry.getValue()); + } else if (DDTags.ORIGIN_KEY.equals(entry.getKey())) { + assertEquals(expectedSpan.getOrigin(), entry.getValue()); + } else if (DDTags.PROCESS_TAGS.equals(entry.getKey())) { + assertTrue(Config.get().isExperimentalPropagateProcessTagsEnabled()); + assertEquals(0, k); + assertEquals(ProcessTags.getTagsForSerialization().toString(), entry.getValue()); + processTagsCount++; } else { - assertEquals(expectedSpan.getBaggage().get(entry.getKey()), entry.getValue()); + Object tag = expectedSpan.getTag(entry.getKey()); + if (null != tag) { + assertEquals(String.valueOf(tag), entry.getValue()); + } else { + assertEquals(expectedSpan.getBaggage().get(entry.getKey()), entry.getValue()); + } } } - } - if (hasMetaStruct) { - Map metaStruct = expectedSpan.getMetaStruct(); - assertEquals("meta_struct", unpacker.unpackString()); - int metaStructSize = unpacker.unpackMapHeader(); - for (int j = 0; j < metaStructSize; ++j) { - String field = unpacker.unpackString(); - if (metaStructVerifier != null) { - byte[] binary = new byte[unpacker.unpackBinaryHeader()]; - unpacker.readPayload(binary); - metaStructVerifier.verify(metaStruct.get(field), binary); + if (hasMetaStruct) { + Map metaStruct = expectedSpan.getMetaStruct(); + assertEquals("meta_struct", unpacker.unpackString()); + int metaStructSize = unpacker.unpackMapHeader(); + for (int j = 0; j < metaStructSize; ++j) { + String field = unpacker.unpackString(); + if (metaStructVerifier != null) { + byte[] binary = new byte[unpacker.unpackBinaryHeader()]; + unpacker.readPayload(binary); + metaStructVerifier.verify(metaStruct.get(field), binary); + } } } } From 8796f317b11f188c860dc4725ec26ba9936efc77 Mon Sep 17 00:00:00 2001 From: jean-philippe bempel Date: Mon, 6 Jul 2026 17:44:20 +0200 Subject: [PATCH 139/139] rebase + use new converters spotless --- .../common/writer/PrioritizationTest.java | 2 +- .../trace/common/writer/TraceMapperTest.java | 2 +- .../writer/TraceProcessingWorkerTest.java | 2 +- .../ddagent/TraceMapperV04PayloadTest.java | 29 ++++++++++--------- .../ddagent/TraceMapperV1PayloadTest.java | 19 ++++-------- .../AbstractClassConstantConvertor.java | 13 +++++++-- .../converter/SamplingMechanismConverter.java | 10 +++++++ 7 files changed, 44 insertions(+), 33 deletions(-) diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/PrioritizationTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/PrioritizationTest.java index 016f0da6198..4bf08ab36d6 100644 --- a/dd-trace-core/src/test/java/datadog/trace/common/writer/PrioritizationTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/PrioritizationTest.java @@ -17,7 +17,7 @@ import datadog.trace.common.writer.ddagent.PrioritizationStrategy; import datadog.trace.common.writer.ddagent.PrioritizationStrategy.PublishResult; import datadog.trace.core.DDSpan; -import datadog.trace.junit.utils.tabletest.PrioritySamplingConverter; +import datadog.trace.junit.utils.converter.PrioritySamplingConverter; import datadog.trace.test.util.DDJavaSpecification; import java.util.Collections; import java.util.List; diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/TraceMapperTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/TraceMapperTest.java index 2d28a395412..2cf4129b664 100644 --- a/dd-trace-core/src/test/java/datadog/trace/common/writer/TraceMapperTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/TraceMapperTest.java @@ -35,7 +35,7 @@ void testTraceMapperV05() throws Exception { .withTag("elasticsearch.version", "7.0") .start(); span.setBaggageItem("baggage", "item"); - span.context().setDataTop("mydata", "[1,2,3]"); + span.spanContext().setDataTop("mydata", "[1,2,3]"); List trace = Collections.singletonList(span); TraceMapperV0_5 traceMapper = new TraceMapperV0_5(); diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/TraceProcessingWorkerTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/TraceProcessingWorkerTest.java index bc51e4effd9..63fe347739c 100644 --- a/dd-trace-core/src/test/java/datadog/trace/common/writer/TraceProcessingWorkerTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/TraceProcessingWorkerTest.java @@ -19,7 +19,7 @@ import datadog.trace.core.DDSpanContext; import datadog.trace.core.PendingTrace; import datadog.trace.core.monitor.HealthMetrics; -import datadog.trace.junit.utils.tabletest.PrioritySamplingConverter; +import datadog.trace.junit.utils.converter.PrioritySamplingConverter; import datadog.trace.test.util.DDJavaSpecification; import java.lang.reflect.Method; import java.util.ArrayList; diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV04PayloadTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV04PayloadTest.java index 5887565208b..aa290d652ea 100644 --- a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV04PayloadTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV04PayloadTest.java @@ -350,20 +350,21 @@ public void accept(int messageCount, ByteBuffer buffer) { metrics.put(key, metricValue); } } - metrics.forEach((key, value) -> { - if (value instanceof Double || value instanceof Float) { - assertEquals( - ((Number) expectedSpan.getTag(key)).doubleValue(), - value.doubleValue(), - 0.001); - } else { - // Groovy compared numerically, Java requires explicit long comparison to avoid - // Long/Integer type mismatch from different msgpack integer encoding widths - assertEquals( - ((Number) expectedSpan.getTag(key)).longValue(), - value.longValue()); - } - }); + metrics.forEach( + (key, value) -> { + if (value instanceof Double || value instanceof Float) { + assertEquals( + ((Number) expectedSpan.getTag(key)).doubleValue(), + value.doubleValue(), + 0.001); + } else { + // Groovy compared numerically, Java requires explicit long comparison to + // avoid + // Long/Integer type mismatch from different msgpack integer encoding widths + assertEquals( + ((Number) expectedSpan.getTag(key)).longValue(), value.longValue()); + } + }); assertEquals("meta", unpacker.unpackString()); int metaSize = unpacker.unpackMapHeader(); HashMap meta = new HashMap<>(); diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV1PayloadTest.java b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV1PayloadTest.java index 2b5ea0bf7c7..2f4fd225124 100644 --- a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV1PayloadTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV1PayloadTest.java @@ -29,7 +29,7 @@ import datadog.trace.common.writer.Payload; import datadog.trace.common.writer.TraceGenerator; import datadog.trace.core.MetadataConsumer; -import datadog.trace.junit.utils.tabletest.SamplingMechanismConverter; +import datadog.trace.junit.utils.converter.SamplingMechanismConverter; import datadog.trace.test.util.DDJavaSpecification; import java.io.IOException; import java.nio.ByteBuffer; @@ -194,11 +194,11 @@ void testPayloadContainsExpectedHeaderAndChunkFields() throws IOException { } @TableTest({ - "scenario | decisionMakerTag | expectedSamplingMechanism", - "null tag | | SamplingMechanism.DEFAULT", - "simple negative | '-3' | 3 ", - "compound | '934086a686-7' | 7 ", - "invalid | 'invalid' | SamplingMechanism.DEFAULT" + "scenario | decisionMakerTag | expectedSamplingMechanism ", + "null tag | | SamplingMechanism.DEFAULT ", + "simple negative | '-3' | SamplingMechanism.LOCAL_USER_RULE", + "compound | '934086a686-7' | 7 ", + "invalid | 'invalid' | SamplingMechanism.DEFAULT " }) void testSamplingMechanismNormalizationFromDdPDm( String decisionMakerTag, @@ -937,13 +937,6 @@ public void processTagsAndBaggage(MetadataConsumer consumer) { processTagsAndBaggageCount++; super.processTagsAndBaggage(consumer); } - - @Override - public void processTagsAndBaggage( - MetadataConsumer consumer, boolean injectLinksAsTags, boolean injectBaggageAsTags) { - processTagsAndBaggageCount++; - super.processTagsAndBaggage(consumer, injectLinksAsTags, injectBaggageAsTags); - } } private static class ByteArrayChannel implements WritableByteChannel { diff --git a/utils/junit-utils/src/main/java/datadog/trace/junit/utils/converter/AbstractClassConstantConvertor.java b/utils/junit-utils/src/main/java/datadog/trace/junit/utils/converter/AbstractClassConstantConvertor.java index 99605ced5c8..503e9e0fa7e 100644 --- a/utils/junit-utils/src/main/java/datadog/trace/junit/utils/converter/AbstractClassConstantConvertor.java +++ b/utils/junit-utils/src/main/java/datadog/trace/junit/utils/converter/AbstractClassConstantConvertor.java @@ -32,9 +32,12 @@ public T convert(Object source, ParameterContext context) { s = s.substring(length + 1); } T mappedValue = mapping().get(s); - if (mappedValue == null && throwsOnUnsupportedValue()) { - throw new ArgumentConversionException( - "Unsupported constant " + source + " from " + className); + if (mappedValue == null) { + if (throwsOnUnsupportedValue()) { + throw new ArgumentConversionException( + "Unsupported constant " + source + " from " + className); + } + return convertWhenNoMapping(source); } return mappedValue; } @@ -43,6 +46,10 @@ protected boolean throwsOnUnsupportedValue() { return true; } + protected T convertWhenNoMapping(Object source) { + return null; + } + public abstract static class AbstractStringFallThruConverter extends AbstractClassConstantConvertor { @Override diff --git a/utils/junit-utils/src/main/java/datadog/trace/junit/utils/converter/SamplingMechanismConverter.java b/utils/junit-utils/src/main/java/datadog/trace/junit/utils/converter/SamplingMechanismConverter.java index 4a6166ec6f2..48b2a653016 100644 --- a/utils/junit-utils/src/main/java/datadog/trace/junit/utils/converter/SamplingMechanismConverter.java +++ b/utils/junit-utils/src/main/java/datadog/trace/junit/utils/converter/SamplingMechanismConverter.java @@ -48,4 +48,14 @@ protected String className() { protected Map mapping() { return MAPPING; } + + @Override + protected boolean throwsOnUnsupportedValue() { + return false; + } + + @Override + protected Byte convertWhenNoMapping(Object source) { + return Byte.parseByte((String) source); + } }